again

Author: kirklandsign

.github/workflows/_android.yml

@@ -63,9 +63,9 @@ jobs:
 
   # Running Android emulator directly on the runner and not using Docker
   run-emulator:
+    needs: build-llm-demo
     # NB: Use metal install for KVM support to run the emulator faster
     runs-on: linux.24xl.spr-metal
-    # needs: build-llm-demo
     env:
       ANDROID_NDK_VERSION: r27b
       API_LEVEL: 34
@@ -103,10 +103,10 @@ jobs:
         shell: bash
         run: |
           set -eux
-          curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/14523127093/artifacts/llm_demo/app-debug.apk
-          curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/14523127093/artifacts/llm_demo/app-debug-androidTest.apk
-          curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/14523127093/artifacts/fp32-xnnpack-custom/model.zip
-          curl -o android-test-debug-androidTest.apk https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/14523127093/artifacts/library_test_dir/executorch_android-debug-androidTest.apk
+          curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/llm_demo/app-debug.apk
+          curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/llm_demo/app-debug-androidTest.apk
+          curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/fp32-xnnpack-custom/model.zip
+          curl -o android-test-debug-androidTest.apk https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/library_test_dir/executorch_android-debug-androidTest.apk
           unzip model.zip
           mv *.pte model.pte
 

scripts/run_android_emulator.sh

@@ -25,7 +25,7 @@ done &
 
 adb logcat -c
 adb shell am instrument -w -r -e \
-  class org.pytorch.executorch.ModuleInstrumentationTest,org.pytorch.executorch.ModuleE2ETest \
+  class org.pytorch.executorch.LlmModuleInstrumentationTest,org.pytorch.executorch.ModuleE2ETest \
   org.pytorch.executorch.test/androidx.test.runner.AndroidJUnitRunner >result.txt 2>&1
 adb logcat -d > logcat.txt
 adb shell dumpsys meminfo