Skip to content

Commit d1b9d1b

Browse files
committed
build: avoid ggml-qnn backend breaking other backend's builds
1 parent c687f26 commit d1b9d1b

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

ggml/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ option(GGML_OPENCL "ggml: use OpenCL"
188188
option(GGML_OPENCL_PROFILING "ggml: use OpenCL profiling (increases overhead)" OFF)
189189
option(GGML_OPENCL_EMBED_KERNELS "ggml: embed kernels" ON)
190190
option(GGML_OPENCL_USE_ADRENO_KERNELS "ggml: use optimized kernels for Adreno" ON)
191-
option(GGML_QNN "ggml: use QNN" ON)
191+
option(GGML_QNN "ggml: use QNN" OFF)
192192

193193
# toolchain for vulkan-shaders-gen
194194
set (GGML_VULKAN_SHADERS_GEN_TOOLCHAIN "" CACHE FILEPATH "ggml: toolchain file for vulkan-shaders-gen")

ggml/src/ggml-qnn/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
44
find_library(LOG_LIB log)
55
set(QNN_LINK_LIBRARIES ${LOG_LIB})
66
set(QNN_DEFAULT_LIB_SEARCH_PATH "/data/local/tmp/" CACHE STRING "customized library search path for QNN backend")
7-
else()
8-
message(FATAL_ERROR "QNN now only available on Android")
9-
endif()
107

118
if(NOT DEFINED GGML_QNN_SDK_PATH)
129
# try read from environment variable
@@ -31,3 +28,7 @@ target_link_libraries(ggml-qnn PRIVATE ${QNN_LINK_LIBRARIES})
3128

3229
string(REGEX REPLACE "/$" "" GGML_QNN_DEFAULT_LIB_SEARCH_PATH "${QNN_DEFAULT_LIB_SEARCH_PATH}")
3330
target_compile_definitions(ggml-qnn PRIVATE GGML_QNN_DEFAULT_LIB_SEARCH_PATH="${QNN_DEFAULT_LIB_SEARCH_PATH}/")
31+
32+
else()
33+
message(FATAL_ERROR "QNN now only available on Android")
34+
endif()

0 commit comments

Comments
 (0)