Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .github/workflows/android-release-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
type: choice
options:
- "xnnpack"
- "xnnpack-no-sme2"
- "vulkan"
- "qnn"
- "all"
Expand Down Expand Up @@ -102,6 +103,10 @@ jobs:
export EXECUTORCH_BUILD_VULKAN=ON
fi

if [[ "$FLAVOR" == "xnnpack-no-sme2" ]]; then
export XNNPACK_ENABLE_ARM_SME2=OFF
fi

if [[ "$FLAVOR" == "qnn" || "$FLAVOR" == "all" ]]; then
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
Expand Down
2 changes: 2 additions & 0 deletions backends/xnnpack/cmake/Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ set(XNNPACK_ENABLE_AVX512VNNIGFNI
OFF
CACHE BOOL ""
)
# Enable ARM SME2 by default. Can be disabled with -DXNNPACK_ENABLE_ARM_SME2=OFF
# for Android emulator compatibility, which may crash with SME2 kernels.
set(XNNPACK_ENABLE_ARM_SME2
ON
CACHE BOOL ""
Expand Down
2 changes: 2 additions & 0 deletions scripts/build_android_library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ build_android_native_library() {
fi

EXECUTORCH_BUILD_VULKAN="${EXECUTORCH_BUILD_VULKAN:-OFF}"
XNNPACK_ENABLE_ARM_SME2="${XNNPACK_ENABLE_ARM_SME2:-ON}"

cmake . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \
-DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}/build/cmake/android.toolchain.cmake" \
Expand All @@ -48,6 +49,7 @@ build_android_native_library() {
-DEXECUTORCH_BUILD_QNN="${EXECUTORCH_BUILD_QNN}" \
-DQNN_SDK_ROOT="${QNN_SDK_ROOT}" \
-DEXECUTORCH_BUILD_VULKAN="${EXECUTORCH_BUILD_VULKAN}" \
-DXNNPACK_ENABLE_ARM_SME2="${XNNPACK_ENABLE_ARM_SME2}" \
-DSUPPORT_REGEX_LOOKAHEAD=ON \
-DCMAKE_BUILD_TYPE="${EXECUTORCH_CMAKE_BUILD_TYPE}" \
-B"${CMAKE_OUT}"
Expand Down
Loading