Merge branch 'nexa-sdk-upgrade' into teliu/Android-Audio

NexaAI · Dec 5, 2024 · 17bacb2 · 17bacb2
2 parents 8f17535 + f8a8a6d
commit 17bacb2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/android/app-java/src/main/java/ai/nexa/app_java/VlmModelManager.java b/android/app-java/src/main/java/ai/nexa/app_java/VlmModelManager.java
@@ -14,7 +14,7 @@ public class VlmModelManager {
     // For nanollava
 //    private static final String MODEL_TEXT_FILENAME = "nanollava-model-q8_0.gguf";
 //    private static final String MODEL_MMPROJ_FILENAME = "nanollava-projector-fp16.gguf";
-//
+
     // For  Omnivision
     private static final String MODEL_TEXT_FILENAME = "model-q8_0.gguf";
     private static final String MODEL_MMPROJ_FILENAME = "projector-fp16.gguf";

diff --git a/android/llama/src/main/cpp/CMakeLists.txt b/android/llama/src/main/cpp/CMakeLists.txt
@@ -37,7 +37,6 @@ FetchContent_Declare(
        GIT_REPOSITORY https://github.com/NexaAI/llama.cpp.git
        GIT_TAG master
 )
-
 FetchContent_Declare(
        llava
        GIT_REPOSITORY https://github.com/NexaAI/llama.cpp.git

diff --git a/android/llama/src/main/java/com/nexa/NexaOmniVlmInference.kt b/android/llama/src/main/java/com/nexa/NexaOmniVlmInference.kt
@@ -23,7 +23,7 @@ class NexaOmniVlmInference(
     private var generatedTokenNum: Int = 0
     private var generatedText: String = ""
     private var isModelLoaded: Boolean = false
-    private var type:String = "vlm-81-ocr"
+    private var type:String = "vlm-81-instruct"
 
     private external fun init(model: String, proj: String, type: String)
     private external fun sampler_free(sampler:Long)