From da90367c72678043a6240480413bdcf02e8e641d Mon Sep 17 00:00:00 2001 From: Hansong <107070759+kirklandsign@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:03:50 -0700 Subject: [PATCH 1/3] Fix env in android perf so aar build --- .github/workflows/android-perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-perf.yml b/.github/workflows/android-perf.yml index f6065f41661..d2e5723e04a 100644 --- a/.github/workflows/android-perf.yml +++ b/.github/workflows/android-perf.yml @@ -232,7 +232,7 @@ jobs: export EXECUTORCH_BUILD_QNN=ON export ANDROID_ABIS="arm64-v8a" - bash build/build_android_llm_demo.sh ${ARTIFACTS_DIR_NAME} + PYTHON_EXECUTABLE=python bash build/build_android_llm_demo.sh ${ARTIFACTS_DIR_NAME} # Upload artifacts to S3. The artifacts are needed not only by the device farm but also TorchChat upload-android-apps: From 3495e0c78f505bbea2b24ee82d9451cdb16d5f81 Mon Sep 17 00:00:00 2001 From: Hansong <107070759+kirklandsign@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:31:24 -0700 Subject: [PATCH 2/3] Update android-perf.yml --- .github/workflows/android-perf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-perf.yml b/.github/workflows/android-perf.yml index d2e5723e04a..7186403c775 100644 --- a/.github/workflows/android-perf.yml +++ b/.github/workflows/android-perf.yml @@ -229,10 +229,10 @@ jobs: PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh - export EXECUTORCH_BUILD_QNN=ON + export export ANDROID_ABIS="arm64-v8a" - PYTHON_EXECUTABLE=python bash build/build_android_llm_demo.sh ${ARTIFACTS_DIR_NAME} + PYTHON_EXECUTABLE=python EXECUTORCH_BUILD_QNN=ON QNN_SDK_ROOT=/tmp/qnn/2.25.0.240728 bash build/build_android_llm_demo.sh ${ARTIFACTS_DIR_NAME} # Upload artifacts to S3. The artifacts are needed not only by the device farm but also TorchChat upload-android-apps: From 49a5442f754a71f96d4fda9aa98eacd44f1497da Mon Sep 17 00:00:00 2001 From: Hansong <107070759+kirklandsign@users.noreply.github.com> Date: Thu, 12 Sep 2024 17:03:36 -0700 Subject: [PATCH 3/3] Update android-perf.yml --- .github/workflows/android-perf.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/android-perf.yml b/.github/workflows/android-perf.yml index 7186403c775..7fa0cf8ce03 100644 --- a/.github/workflows/android-perf.yml +++ b/.github/workflows/android-perf.yml @@ -229,7 +229,6 @@ jobs: PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh - export export ANDROID_ABIS="arm64-v8a" PYTHON_EXECUTABLE=python EXECUTORCH_BUILD_QNN=ON QNN_SDK_ROOT=/tmp/qnn/2.25.0.240728 bash build/build_android_llm_demo.sh ${ARTIFACTS_DIR_NAME}