Skip to content

Commit 11eeec7

Browse files
kirklandsignfacebook-github-bot
authored andcommitted
Android NDK use r27b (pytorch#6092)
Summary: Replace all r25, r26, r26c with r27b Pull Request resolved: pytorch#6092 Reviewed By: cccclai Differential Revision: D64429391 Pulled By: kirklandsign fbshipit-source-id: 5334e126c24590e56c7dab57f3cc104aefa9d940
1 parent 59070e5 commit 11eeec7

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.ci/docker/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ case "${IMAGE_NAME}" in
4141
LINTRUNNER=""
4242
CLANG_VERSION=12
4343
# From https://developer.android.com/ndk/downloads
44-
ANDROID_NDK_VERSION=r26c
44+
ANDROID_NDK_VERSION=r27b
4545
;;
4646
*)
4747
echo "Invalid image name ${IMAGE_NAME}"

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
# NB: Use metal install for KVM support to run the emulator faster
5454
runs-on: linux.24xl.spr-metal
5555
env:
56-
ANDROID_NDK_VERSION: r26c
56+
ANDROID_NDK_VERSION: r27b
5757
API_LEVEL: 34
5858
steps:
5959
- name: Setup SSH (Click me for login details)

backends/vulkan/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ when building with CMake.
150150

151151
First, make sure that you have the Android NDK installed; any NDK version past
152152
NDK r19c should work. Note that the examples in this doc have been validated with
153-
NDK r25. The Android SDK should also be installed so that you have access to `adb`.
153+
NDK r27b. The Android SDK should also be installed so that you have access to `adb`.
154154

155155
The instructions in this page assumes that the following environment variables
156156
are set.

examples/demo-apps/android/LlamaDemo/docs/delegates/qualcomm_README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ More specifically, it covers:
66
2. Building and linking libraries that are required to inference on-device for Android platform using Qualcomm AI accelerators.
77
3. Building the Android demo app itself.
88

9-
Verified on Linux CentOS, QNN SDK [v2.26](https://softwarecenter.qualcomm.com/api/download/software/qualcomm_neural_processing_sdk/v2.26.0.240828.zip), python 3.10, Android SDK r26c.
9+
Verified on Linux CentOS, QNN SDK [v2.26](https://softwarecenter.qualcomm.com/api/download/software/qualcomm_neural_processing_sdk/v2.26.0.240828.zip), python 3.10, Android SDK r27b.
1010

1111
Phone verified: OnePlus 12, Samsung 24+, Samsung 23
1212

1313
## Prerequisites
1414
* Download and unzip QNN SDK [v2.26](https://softwarecenter.qualcomm.com/api/download/software/qualcomm_neural_processing_sdk/v2.26.0.240828.zip)
15-
* Download and unzip Android SDK [r26](https://developer.android.com/ndk/downloads)
15+
* Download and unzip Android SDK [r27b](https://developer.android.com/ndk/downloads)
1616
* Android phone with Snapdragon8 Gen3 (SM8650) or Gen2 (SM8550). Gen 1 and lower SoC might be supported but not fully validated.
1717
* Desired Llama model weights in .PTH format. You can download them on HuggingFace ([Example](https://huggingface.co/meta-llama/Meta-Llama-3-8B-Instruct)).
1818

@@ -40,7 +40,7 @@ Install dependencies
4040
## Setup QNN
4141
```
4242
# Set these variables correctly for your environment
43-
export ANDROID_NDK_ROOT=$HOME/android-ndk-r26 # Download android SDK and unzip to home directory
43+
export ANDROID_NDK_ROOT=$HOME/android-ndk-r27b # Download android SDK and unzip to home directory
4444
export QNN_SDK_ROOT=$HOME/Your-SDK-Root #Folder contains lib
4545
export EXECUTORCH_ROOT=$HOME/repos/executorch
4646
export LD_LIBRARY_PATH=$QNN_SDK_ROOT/lib/x86_64-linux-clang/:$LD_LIBRARY_PATH

examples/models/llama2/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ To build for CoreML backend and validate on Mac, replace `-DEXECUTORCH_BUILD_XNN
356356
357357
**1. Build llama runner binary for Android**
358358
359-
*Pre-requisite*: Android NDK (tested with r26c) which can be downloaded from [here](https://developer.android.com/ndk/downloads). Note that the mac binary can be unpackaged and you can locate NDK folder from it.
359+
*Pre-requisite*: Android NDK (tested with r27b) which can be downloaded from [here](https://developer.android.com/ndk/downloads). Note that the mac binary can be unpackaged and you can locate NDK folder from it.
360360
361361
**1.1 Set Android NDK**
362362
```

0 commit comments

Comments
 (0)