From 5a58f5ca18f290ac99379087389dbfbd7a6f1d9e Mon Sep 17 00:00:00 2001
From: nihuini <nihuini@tencent.com>
Date: Thu, 11 Apr 2024 19:00:48 +0800
Subject: [PATCH] update

---
 app/src/main/jni/squeezencnn_jni.cpp | 35 +++++++++++++++-------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/src/main/jni/squeezencnn_jni.cpp b/app/src/main/jni/squeezencnn_jni.cpp
index 7631cb8..3b5de88 100644
--- a/app/src/main/jni/squeezencnn_jni.cpp
+++ b/app/src/main/jni/squeezencnn_jni.cpp
@@ -72,10 +72,6 @@ JNIEXPORT jboolean JNICALL Java_com_tencent_squeezencnn_SqueezeNcnn_Init(JNIEnv*
 {
     AAssetManager* mgr = AAssetManager_fromJava(env, assetManager);
 
-    // use vulkan compute
-    if (ncnn::get_gpu_count() != 0)
-        squeezenet_gpu.opt.use_vulkan_compute = true;
-
     // init param
     {
         int ret = squeezenet.load_param_bin(mgr, "squeezenet_v1.1.param.bin");
@@ -85,14 +81,6 @@ JNIEXPORT jboolean JNICALL Java_com_tencent_squeezencnn_SqueezeNcnn_Init(JNIEnv*
             return JNI_FALSE;
         }
     }
-    {
-        int ret = squeezenet_gpu.load_param_bin(mgr, "squeezenet_v1.1.param.bin");
-        if (ret != 0)
-        {
-            __android_log_print(ANDROID_LOG_DEBUG, "SqueezeNcnn", "load_param_bin failed");
-            return JNI_FALSE;
-        }
-    }
 
     // init bin
     {
@@ -103,12 +91,27 @@ JNIEXPORT jboolean JNICALL Java_com_tencent_squeezencnn_SqueezeNcnn_Init(JNIEnv*
             return JNI_FALSE;
         }
     }
+
+    // use vulkan compute
+    if (ncnn::get_gpu_count() != 0)
     {
-        int ret = squeezenet_gpu.load_model(mgr, "squeezenet_v1.1.bin");
-        if (ret != 0)
+        squeezenet_gpu.opt.use_vulkan_compute = true;
+
         {
-            __android_log_print(ANDROID_LOG_DEBUG, "SqueezeNcnn", "load_model failed");
-            return JNI_FALSE;
+            int ret = squeezenet_gpu.load_param_bin(mgr, "squeezenet_v1.1.param.bin");
+            if (ret != 0)
+            {
+                __android_log_print(ANDROID_LOG_DEBUG, "SqueezeNcnn", "load_param_bin failed");
+                return JNI_FALSE;
+            }
+        }
+        {
+            int ret = squeezenet_gpu.load_model(mgr, "squeezenet_v1.1.bin");
+            if (ret != 0)
+            {
+                __android_log_print(ANDROID_LOG_DEBUG, "SqueezeNcnn", "load_model failed");
+                return JNI_FALSE;
+            }
         }
     }