Skip to content

Commit ce8916f

Browse files
authored
Remove Android LlamaDemo
Differential Revision: D82868456 Pull Request resolved: #14450
1 parent cf1c4bc commit ce8916f

File tree

104 files changed

+8
-5812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+8
-5812
lines changed

.github/workflows/_android.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,6 @@ jobs:
4848
bash examples/models/llama/install_requirements.sh
4949
bash ".ci/scripts/test_llama.sh" -model stories110M -build_tool cmake -dtype fp16 -mode portable -upload ${ARTIFACTS_DIR_NAME}/fp32-xnnpack-custom
5050
51-
mkdir -p examples/demo-apps/android/LlamaDemo/app/libs
52-
cp aar-out/executorch.aar examples/demo-apps/android/LlamaDemo/app/libs
53-
pushd examples/demo-apps/android/LlamaDemo
54-
ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew build assembleAndroidTest
55-
popd
56-
57-
DEMO_APP_DIR="${ARTIFACTS_DIR_NAME}/llm_demo"
58-
# The app directory is named using its build flavor as a suffix.
59-
mkdir -p "${DEMO_APP_DIR}"
60-
# Collect the app and its test suite
61-
cp examples/demo-apps/android/LlamaDemo/app/build/outputs/apk/debug/*.apk "${DEMO_APP_DIR}"
62-
cp examples/demo-apps/android/LlamaDemo/app/build/outputs/apk/androidTest/debug/*.apk "${DEMO_APP_DIR}"
63-
6451
# Running Android emulator directly on the runner and not using Docker
6552
run-emulator:
6653
needs: build-llm-demo
@@ -103,8 +90,6 @@ jobs:
10390
shell: bash
10491
run: |
10592
set -eux
106-
curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/llm_demo/app-debug.apk
107-
curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/llm_demo/app-debug-androidTest.apk
10893
curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/fp32-xnnpack-custom/model.zip
10994
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
11095
unzip model.zip

.github/workflows/lint.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,6 @@ jobs:
148148
extension/android/executorch_android/src/main/java/org/pytorch/executorch/extension/llm/*.java \
149149
extension/android/executorch_android/src/main/java/org/pytorch/executorch/annotations/*.java \
150150
extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/*.java \
151-
examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/*.java \
152-
examples/demo-apps/android/LlamaDemo/app/src/androidTest/java/com/example/executorchllamademo/*.java \
153151
extension/benchmark/android/benchmark/app/src/main/java/org/pytorch/minibench/*.java \
154152
extension/benchmark/android/benchmark/app/src/androidTest/java/org/pytorch/minibench/*.java)
155153
if [ -n "$FILES_NEEDS_FORMAT" ]; then

README-wheel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ tutorials and documentation. Here are some starting points:
2525
* [Exporting to ExecuTorch](https://pytorch.org/executorch/main/tutorials/export-to-executorch-tutorial)
2626
* Learn the fundamentals of exporting a PyTorch `nn.Module` to ExecuTorch, and
2727
optimizing its performance using quantization and hardware delegation.
28-
* Running etLLM on [iOS](https://github.com/meta-pytorch/executorch-examples/tree/main/llm/apple) and [Android](docs/source/llm/llama-demo-android.md) devices.
28+
* Running etLLM on [iOS](https://github.com/meta-pytorch/executorch-examples/tree/main/llm/apple) and [Android](https://github.com/meta-pytorch/executorch-examples/tree/main/llm/android) devices.
2929
* Build and run LLaMA in a demo mobile app, and learn how to integrate models
3030
with your own apps.

docs/source/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ ExecuTorch provides support for:
9393
- [Exporting LLMs](llm/export-llm.md)
9494
- [Exporting custom LLMs](llm/export-custom-llm.md)
9595
- [Running with C++](llm/run-with-c-plus-plus.md)
96-
- [Running on Android (XNNPack)](llm/llama-demo-android.md)
96+
- [Running on Android (XNNPack)](https://github.com/meta-pytorch/executorch-examples/tree/main/llm/android)
9797
- [Running on Android (QNN)](llm/build-run-llama3-qualcomm-ai-engine-direct-backend.md)
9898
- [Running on iOS](llm/run-on-ios.md)
9999
#### Backend Development
@@ -251,7 +251,7 @@ Getting Started <llm/getting-started>
251251
Exporting LLMs with export_llm <llm/export-llm>
252252
Exporting custom LLMs <llm/export-custom-llm>
253253
Running with C++ <llm/run-with-c-plus-plus>
254-
Running on Android <XNNPack> <llm/llama-demo-android>
254+
Running on Android <XNNPack> <https://github.com/meta-pytorch/executorch-examples/tree/main/llm/android>
255255
Running on Android <QNN> <llm/build-run-llama3-qualcomm-ai-engine-direct-backend>
256256
Running on iOS <llm/run-on-ios>
257257
```

docs/source/llm/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ Deploying LLMs to ExecuTorch can be boiled down to a two-step process: (1) expor
2121
- [Exporting LLMs](export-llm.md)
2222
- [Exporting custom LLMs](export-custom-llm.md)
2323
- [Running with C++](run-with-c-plus-plus.md)
24-
- [Running on Android (XNNPack)](llama-demo-android.md)
24+
- [Running on Android (XNNPack)](https://github.com/meta-pytorch/executorch-examples/tree/main/llm/android)
2525
- [Running on Android (Qualcomm)](build-run-llama3-qualcomm-ai-engine-direct-backend.md)
2626
- [Running on iOS](https://github.com/meta-pytorch/executorch-examples/tree/main/llm/apple)

docs/source/llm/llama-demo-android.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

docs/source/using-executorch-android.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ implementation("com.facebook.fbjni:fbjni:0.7.0")
8888

8989
### Example usage
9090

91-
In your app working directory, such as executorch/examples/demo-apps/android/LlamaDemo,
91+
In your app working directory, such as executorch-examples/llm/android/LlamaDemo,
9292
```
9393
mkdir -p app/libs
9494
curl https://ossci-android.s3.amazonaws.com/executorch/release/${executorch_version}/executorch.aar -o app/libs/executorch.aar
@@ -202,7 +202,7 @@ adb push extension/module/test/resources/add.pte /data/local/tmp/
202202
This example loads an ExecuTorch module, prepares input data, runs inference, and processes the output data.
203203

204204
Please use [DeepLabV3AndroidDemo](https://github.com/meta-pytorch/executorch-examples/tree/main/dl3/android/DeepLabV3Demo)
205-
and [LlamaDemo](https://github.com/pytorch/executorch/tree/main/examples/demo-apps/android/LlamaDemo) for the code examples
205+
and [LlamaDemo](https://github.com/meta-pytorch/executorch-examples/tree/main/llm/android/LlamaDemo) for the code examples
206206
using ExecuTorch AAR package.
207207

208208
## Java API reference

examples/demo-apps/android/LlamaDemo/.gitignore

Lines changed: 0 additions & 12 deletions
This file was deleted.

examples/demo-apps/android/LlamaDemo/README.md

Lines changed: 0 additions & 174 deletions
This file was deleted.

examples/demo-apps/android/LlamaDemo/SDK-quick-setup-guide.md

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)