From a423ccb262b9ab6816847d1a62f9ddc45fdec06d Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Fri, 14 Mar 2025 17:34:23 -0700 Subject: [PATCH 1/4] Test --- build/build_android_library.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/build_android_library.sh b/build/build_android_library.sh index 8f3b28d12e1..a6dc7186dbc 100644 --- a/build/build_android_library.sh +++ b/build/build_android_library.sh @@ -57,7 +57,7 @@ build_android_native_library() { -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \ -DEXECUTORCH_BUILD_KERNELS_OPTIMIZED=ON \ -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON \ - -DEXECUTORCH_BUILD_KERNELS_CUSTOM=ON \ + -DEXECUTORCH_BUILD_KERNELS_CUSTOM=OFF \ -DEXECUTORCH_BUILD_NEURON="${EXECUTORCH_BUILD_NEURON}" \ -DNEURON_BUFFER_ALLOCATOR_LIB="${NEURON_BUFFER_ALLOCATOR_LIB}" \ -DEXECUTORCH_BUILD_QNN="${EXECUTORCH_BUILD_QNN}" \ @@ -89,7 +89,7 @@ build_android_native_library() { -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH \ -DNEURON_BUFFER_ALLOCATOR_LIB="$NEURON_BUFFER_ALLOCATOR_LIB" \ -DEXECUTORCH_BUILD_KERNELS_CUSTOM=ON \ - -DEXECUTORCH_BUILD_LLAMA_JNI=ON \ + -DEXECUTORCH_BUILD_LLAMA_JNI=OFF \ -DCMAKE_BUILD_TYPE="${EXECUTORCH_CMAKE_BUILD_TYPE}" \ -B"${CMAKE_OUT}"/extension/android From fc0cbd856c7109d4bed1a2ca9534f5fe288c435b Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Fri, 14 Mar 2025 17:47:02 -0700 Subject: [PATCH 2/4] Use a flag --- build/build_android_library.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build_android_library.sh b/build/build_android_library.sh index a6dc7186dbc..e5e1b0eeb7b 100644 --- a/build/build_android_library.sh +++ b/build/build_android_library.sh @@ -57,7 +57,7 @@ build_android_native_library() { -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \ -DEXECUTORCH_BUILD_KERNELS_OPTIMIZED=ON \ -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON \ - -DEXECUTORCH_BUILD_KERNELS_CUSTOM=OFF \ + -DEXECUTORCH_BUILD_KERNELS_CUSTOM="${EXECUTORCH_BUILD_EXTENSION_LLM:-ON}" \ -DEXECUTORCH_BUILD_NEURON="${EXECUTORCH_BUILD_NEURON}" \ -DNEURON_BUFFER_ALLOCATOR_LIB="${NEURON_BUFFER_ALLOCATOR_LIB}" \ -DEXECUTORCH_BUILD_QNN="${EXECUTORCH_BUILD_QNN}" \ @@ -88,8 +88,8 @@ build_android_native_library() { -DEXECUTORCH_LOG_LEVEL=Info \ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH \ -DNEURON_BUFFER_ALLOCATOR_LIB="$NEURON_BUFFER_ALLOCATOR_LIB" \ - -DEXECUTORCH_BUILD_KERNELS_CUSTOM=ON \ - -DEXECUTORCH_BUILD_LLAMA_JNI=OFF \ + -DEXECUTORCH_BUILD_KERNELS_CUSTOM="${EXECUTORCH_BUILD_EXTENSION_LLM:-ON}" \ + -DEXECUTORCH_BUILD_LLAMA_JNI="${EXECUTORCH_BUILD_EXTENSION_LLM:-ON}" \ -DCMAKE_BUILD_TYPE="${EXECUTORCH_CMAKE_BUILD_TYPE}" \ -B"${CMAKE_OUT}"/extension/android From 08df24e7a999263bc2c7472e0058441e8414d815 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Fri, 14 Mar 2025 17:47:11 -0700 Subject: [PATCH 3/4] temp off flag --- build/build_android_library.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/build_android_library.sh b/build/build_android_library.sh index e5e1b0eeb7b..d997c6a0247 100644 --- a/build/build_android_library.sh +++ b/build/build_android_library.sh @@ -42,6 +42,8 @@ build_android_native_library() { EXECUTORCH_BUILD_VULKAN="${EXECUTORCH_BUILD_VULKAN:-OFF}" + export EXECUTORCH_BUILD_EXTENSION_LLM=OFF + cmake . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \ -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}/build/cmake/android.toolchain.cmake" \ -DANDROID_ABI="${ANDROID_ABI}" \ From 971a564ab4ef5ba47d4be31574433606956e6581 Mon Sep 17 00:00:00 2001 From: Hansong <107070759+kirklandsign@users.noreply.github.com> Date: Fri, 14 Mar 2025 21:35:55 -0700 Subject: [PATCH 4/4] Update build_android_library.sh --- build/build_android_library.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/build_android_library.sh b/build/build_android_library.sh index d997c6a0247..e5e1b0eeb7b 100644 --- a/build/build_android_library.sh +++ b/build/build_android_library.sh @@ -42,8 +42,6 @@ build_android_native_library() { EXECUTORCH_BUILD_VULKAN="${EXECUTORCH_BUILD_VULKAN:-OFF}" - export EXECUTORCH_BUILD_EXTENSION_LLM=OFF - cmake . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \ -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}/build/cmake/android.toolchain.cmake" \ -DANDROID_ABI="${ANDROID_ABI}" \