Skip to content

Update script to build and upload MiniBench artifacts #5017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 5, 2024
Merged

Update script to build and upload MiniBench artifacts #5017

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
50492e7
Add a new MiniBench apk for benchmarking
kirklandsign Aug 30, 2024
e0dc99c
Android library update for MiniBench
kirklandsign Aug 30, 2024
152c5c5
Update script to build and upload MiniBench artifacts as well
kirklandsign Aug 30, 2024
07db262
Remove unused stuff
kirklandsign Aug 30, 2024
758d979
Move to extension/android/benchmark
kirklandsign Aug 30, 2024
1897166
Merge branch 'minibench' into aar-for-bench-2
kirklandsign Aug 30, 2024
746bf6f
Linter
kirklandsign Aug 30, 2024
fd88afa
Merge remote-tracking branch 'origin/main' into aar-for-bench-2
kirklandsign Aug 31, 2024
f4add28
Merge branch 'aar-for-bench-2' into update-script-minibench
kirklandsign Aug 31, 2024
d9b2bd7
Merge remote-tracking branch 'origin/main' into update-script-minibench
kirklandsign Aug 31, 2024
570968f
update path
kirklandsign Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions build/build_android_llm_demo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,18 @@ build_aar() {
popd
}

build_android_llm_demo_app() {
build_android_demo_apps() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we rename the script and steps in android-perf as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes! Let's do that later. It's really used in different places

mkdir -p examples/demo-apps/android/LlamaDemo/app/libs
cp ${BUILD_AAR_DIR}/executorch-llama.aar examples/demo-apps/android/LlamaDemo/app/libs
pushd examples/demo-apps/android/LlamaDemo
ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew build assembleAndroidTest
popd

mkdir -p extension/android/benchmark/app/libs
cp ${BUILD_AAR_DIR}/executorch.aar extension/android/benchmark/app/libs
pushd extension/android/benchmark
ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew build
popd
}

collect_artifacts_to_be_uploaded() {
Expand All @@ -116,6 +122,10 @@ collect_artifacts_to_be_uploaded() {
# Collect JAR and AAR
cp extension/android/build/libs/executorch.jar "${DEMO_APP_DIR}"
find "${BUILD_AAR_DIR}/" -name 'executorch*.aar' -exec cp {} "${DEMO_APP_DIR}" \;
# Collect MiniBench APK
MINIBENCH_APP_DIR="${ARTIFACTS_DIR_NAME}/minibench"
mkdir -p "${MINIBENCH_APP_DIR}"
cp extension/android/benchmark/app/build/outputs/apk/debug/*.apk "${MINIBENCH_APP_DIR}"
}

BUILD_AAR_DIR="$(mktemp -d)"
Expand All @@ -130,5 +140,5 @@ for ANDROID_ABI in "${ANDROID_ABIS[@]}"; do
build_android_native_library ${ANDROID_ABI}
done
build_aar
build_android_llm_demo_app
build_android_demo_apps
collect_artifacts_to_be_uploaded ${ARTIFACTS_DIR_NAME}
Loading