Skip to content

Commit

Permalink
Update NDK version to r26d in docs (#5612)
Browse files Browse the repository at this point in the history
Summary: Pull Request resolved: #5612

Reviewed By: cmodi-meta, cccclai

Differential Revision: D63353031

Pulled By: kirklandsign

fbshipit-source-id: 0baef63226c8606e2e263a73adde6ac01f2db808
  • Loading branch information
kirklandsign authored and facebook-github-bot committed Sep 25, 2024
1 parent 5c56f96 commit 85e7458
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions backends/vulkan/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,12 @@ compile the Vulkan Compute Library's GLSL compute shaders.
The Vulkan Delegate libraries can be built by setting `-DEXECUTORCH_BUILD_VULKAN=ON`
when building with CMake.

First, make sure that you have the Android NDK installed - Android NDK r25c is
First, make sure that you have the Android NDK installed - Android NDK 26.3.11579264 is
recommended. The Android SDK should also be installed so that you have access
to `adb`.

```shell
# Recommended version is Android NDK r25c.
# Recommended version is Android NDK 26.3.11579264.
export ANDROID_NDK=<path_to_ndk>
# Select an appropriate Android ABI
export ANDROID_ABI=arm64-v8a
Expand Down
2 changes: 1 addition & 1 deletion backends/vulkan/docs/android_demo.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Tutorial in order to install the specified versions of the Android NDK and the
Android SDK.

```shell
# Recommended version is Android NDK r25c.
# Recommended version is Android NDK 26.3.11579264.
export ANDROID_NDK=<path_to_ndk>
# Select an appropriate Android ABI
export ANDROID_ABI=arm64-v8a
Expand Down
4 changes: 2 additions & 2 deletions examples/demo-apps/android/LlamaDemo/SDK-quick-setup-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ export ANDROID_HOME="$(realpath $DEV_HOME/sdk)"
# Install SDK 34
./cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_HOME}" --install "platforms;android-34"
# Install NDK
./cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_HOME}" --install "ndk;25.0.8775105"
./cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_HOME}" --install "ndk;26.3.11579264"
# The NDK root is then under `ndk/<version>`.
export ANDROID_NDK="$ANDROID_HOME/ndk/25.0.8775105"
export ANDROID_NDK="$ANDROID_HOME/ndk/26.3.11579264"
```

### (Optional) Android Studio Setup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ More specifically, it covers:
2. Building and linking libraries that are required to inference on-device for Android platform using MediaTek AI accelerators.
3. Loading the needed files on the device and running inference.

Verified on MacOS, Linux CentOS (model export), Python 3.10, Android NDK 25.0.8775105
Verified on MacOS, Linux CentOS (model export), Python 3.10, Android NDK 26.3.11579264
Phone verified: MediaTek Dimensity 9300 (D9300) chip.

## Prerequisites
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ Phone verified: OnePlus 12. Samsung S23 (Llama only), Samsung S24+ (Llama only),

## Prerequisites
* Install [Java 17 JDK](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html).
* Install the [Android SDK API Level 34](https://developer.android.com/about/versions/14/setup-sdk) and [Android NDK 25.0.8775105](https://developer.android.com/studio/projects/install-ndk).
* Install the [Android SDK API Level 34](https://developer.android.com/about/versions/15/setup-sdk) and [Android NDK 26.3.11579264](https://developer.android.com/studio/projects/install-ndk).
* If you have Android Studio set up, you can install them with
* Android Studio Settings -> Language & Frameworks -> Android SDK -> SDK Platforms -> Check the row with API Level 34.
* Android Studio Settings -> Language & Frameworks -> Android SDK -> SDK Tools -> Check NDK (Side by side) row.
* Alternatively, you can follow [this guide](https://github.com/pytorch/executorch/blob/856e085b9344c8b0bf220a97976140a5b76356aa/examples/demo-apps/android/LlamaDemo/SDK.md) to set up Java/SDK/NDK with CLI.
Supported Host OS: CentOS, macOS Sonoma on Apple Silicon.


Note: This demo app and tutorial has only been validated with arm64-v8a [ABI](https://developer.android.com/ndk/guides/abis), with NDK 25.0.8775105.
Note: This demo app and tutorial has only been validated with arm64-v8a [ABI](https://developer.android.com/ndk/guides/abis), with NDK 26.3.11579264.



Expand Down

0 comments on commit 85e7458

Please sign in to comment.