Update minibench to allow qnn

pytorch · Sep 12, 2024 · e81c616 · e81c616
1 parent 4b3f1c5
commit e81c616
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/build/build_android_llm_demo.sh b/build/build_android_llm_demo.sh
@@ -97,7 +97,7 @@ build_aar() {
   find jni -type f -name "libexecutorch_jni.so" -exec bash -c 'mv "$1" "${1/_jni/}"' bash {} \;
   # Zip all necessary files into the AAR file
   zip -r executorch.aar libs jni/*/libexecutorch.so jni/*/libqnn*.so jni/*/libQnn*.so AndroidManifest.xml
-  zip -r executorch-llama.aar libs jni/*/libexecutorch.so jni/*/libqnn*.so jni/*/libQnn*.so AndroidManifest.xml
+  cp executorch.aar executorch-llama.aar
   popd
 }
 

diff --git a/extension/android/benchmark/app/src/main/AndroidManifest.xml b/extension/android/benchmark/app/src/main/AndroidManifest.xml
@@ -8,6 +8,10 @@
         android:theme="@style/Theme.MiniBench"
         tools:targetApi="31">
 
+        <uses-native-library
+            android:name="libcdsprpc.so"
+            android:required="false" />
+
         <activity
             android:name=".BenchmarkActivity"
             android:exported="true">

diff --git a/extension/android/benchmark/app/src/main/java/org/pytorch/minibench/BenchmarkActivity.java b/extension/android/benchmark/app/src/main/java/org/pytorch/minibench/BenchmarkActivity.java
@@ -11,6 +11,8 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.system.ErrnoException;
+import android.system.Os;
 import com.google.gson.Gson;
 import java.io.File;
 import java.io.FileWriter;
@@ -35,6 +37,12 @@ protected void onCreate(Bundle savedInstanceState) {
 
     int numIter = intent.getIntExtra("num_iter", 10);
 
+    try {
+      Os.setenv("ADSP_LIBRARY_PATH", getApplicationInfo().nativeLibraryDir, true);
+    } catch (ErrnoException e) {
+      finish();
+    }
+
     // TODO: Format the string with a parsable format
     Stats stats = new Stats();
 

diff --git a/...nsion/android/benchmark/app/src/main/java/org/pytorch/minibench/LlmBenchmarkActivity.java b/...nsion/android/benchmark/app/src/main/java/org/pytorch/minibench/LlmBenchmarkActivity.java
@@ -11,6 +11,8 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.system.ErrnoException;
+import android.system.Os;
 import android.util.Log;
 import com.google.gson.Gson;
 import java.io.File;
@@ -44,6 +46,12 @@ protected void onCreate(Bundle savedInstanceState) {
       mPrompt = "The ultimate answer";
     }
 
+    try {
+      Os.setenv("ADSP_LIBRARY_PATH", getApplicationInfo().nativeLibraryDir, true);
+    } catch (ErrnoException e) {
+      finish();
+    }
+
     mStatsInfo = new StatsInfo();
     mModelRunner = new ModelRunner(model.getPath(), tokenizerPath, temperature, this);
     mStatsInfo.loadStart = System.currentTimeMillis();