diff --git a/examples/llama.android/app/src/main/java/com/example/llama/MainActivity.kt b/examples/llama.android/app/src/main/java/com/example/llama/MainActivity.kt index 9da04f7d3..09c4e360a 100644 --- a/examples/llama.android/app/src/main/java/com/example/llama/MainActivity.kt +++ b/examples/llama.android/app/src/main/java/com/example/llama/MainActivity.kt @@ -86,6 +86,11 @@ class MainActivity( Uri.parse("https://huggingface.co/TheBloke/phi-2-dpo-GGUF/resolve/main/phi-2-dpo.Q3_K_M.gguf?download=true"), File(extFilesDir, "phi-2-dpo.Q3_K_M.gguf") ), + Downloadable( + "octopus", + Uri.parse("https://storage.nexa4ai.com/NexaAI/Octopus-v2/gguf-q4_K_M/q4_K_M.gguf?Expires=1731051192&Signature=Poxm8V5tsx3RfeQPf-bI3umao~KcBU-GeeHtOFmkiIox0wQpd4ylZ6sOrdLL75HIwzsnu6LaTe26U4HkEh1L2nVJ0IHV~czRA6~v-b2HLXf-gekr6LyL~dPP2hVhaFNk4qtxcXvK7kMF1PzvU1yn34i5AUhmiQVASzGSW-Vl3EEUxabJpgnM7APcRk8xF6zCk6AP77HPw70omoSjvFdGroOHGCLVwrbX8QS6IH2ojc~b-1MPRo4RFt9DRadQ8-Z9v1PisrFUc6fsyOfYLawAJyzlKVB97kgfWfLVPQkzUaxQlEdtOl4EZfUpzD5r7BoakFonoLMkiTCZChaFSwVq0w__&Key-Pair-Id=APKAU6GDWEP267O3XXG3"), + File(extFilesDir, "octopus.q4_K_M.gguf") + ), ) setContent { diff --git a/examples/llama.android/llama/src/main/cpp/CMakeLists.txt b/examples/llama.android/llama/src/main/cpp/CMakeLists.txt index 2de496574..9b1a436c8 100644 --- a/examples/llama.android/llama/src/main/cpp/CMakeLists.txt +++ b/examples/llama.android/llama/src/main/cpp/CMakeLists.txt @@ -33,6 +33,7 @@ project("llama-android") #load local llama.cpp add_subdirectory(../../../../../../ build-llama) +add_subdirectory(../../../../../../examples/llava build-llava) # In order to load a library into your app from Java/Kotlin, you must call # System.loadLibrary() and pass the name of the library defined here; @@ -50,4 +51,5 @@ target_link_libraries(${CMAKE_PROJECT_NAME} llama common android - log) + log + llava) diff --git a/examples/llama.android/llama/src/main/cpp/llama-android.cpp b/examples/llama.android/llama/src/main/cpp/llama-android.cpp index 2aafe2316..297583c13 100644 --- a/examples/llama.android/llama/src/main/cpp/llama-android.cpp +++ b/examples/llama.android/llama/src/main/cpp/llama-android.cpp @@ -6,6 +6,7 @@ #include #include "llama.h" #include "common.h" +#include "llava.h" // Write C++ code here. //