mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-06-04 23:59:56 +00:00
Add patching of xnnpack CMakeLists.txt to allow building with Emscripten. (#11829)
This commit is contained in:
Scott McKay
GitHub
parent
63c483a998
commit
6bf6bac1fd
3 changed files with 74 additions and 56 deletions
|
|
@ -1523,62 +1523,7 @@ if (onnxruntime_USE_XNNPACK)
|
|||
"but onnxruntime_DISABLE_CONTRIB_OPS is ON")
|
||||
endif()
|
||||
|
||||
set(XNNPACK_DIR external/XNNPACK)
|
||||
set(XNNPACK_INCLUDE_DIR ${XNNPACK_DIR}/include)
|
||||
set(XNNPACK_USE_SYSTEM_LIBS ON CACHE INTERNAL "")
|
||||
set(XNNPACK_BUILD_TESTS OFF CACHE INTERNAL "")
|
||||
set(XNNPACK_BUILD_BENCHMARKS OFF CACHE INTERNAL "")
|
||||
set(FP16_BUILD_TESTS OFF CACHE INTERNAL "")
|
||||
set(FP16_BUILD_BENCHMARKS OFF CACHE INTERNAL "")
|
||||
set(CLOG_SOURCE_DIR "${PYTORCH_CPUINFO_DIR}/deps/clog")
|
||||
set(CPUINFO_SOURCE_DIR ${PYTORCH_CPUINFO_DIR})
|
||||
|
||||
add_subdirectory(external/FP16)
|
||||
add_subdirectory(external/pthreadpool)
|
||||
add_subdirectory(external/XNNPACK)
|
||||
|
||||
set_target_properties(fp16 PROPERTIES FOLDER "External/Xnnpack")
|
||||
set_target_properties(pthreadpool PROPERTIES FOLDER "External/Xnnpack")
|
||||
set_target_properties(XNNPACK PROPERTIES FOLDER "External/Xnnpack")
|
||||
|
||||
set(onnxruntime_EXTERNAL_LIBRARIES_XNNPACK XNNPACK pthreadpool)
|
||||
list(APPEND onnxruntime_EXTERNAL_LIBRARIES ${onnxruntime_EXTERNAL_LIBRARIES_XNNPACK})
|
||||
|
||||
# the XNNPACK CMake setup doesn't include the WASM kernels so we have to manually set those up
|
||||
if (onnxruntime_BUILD_WEBASSEMBLY)
|
||||
if (onnxruntime_ENABLE_WEBASSEMBLY_THREADS)
|
||||
target_compile_options(XNNPACK PRIVATE "-pthread")
|
||||
endif()
|
||||
|
||||
message("Adding WebAssembly Source Files to XNNPACK")
|
||||
set(wasm_src_patterns "${XNNPACK_DIR}/src/wasm-*.c"
|
||||
"${XNNPACK_DIR}/src/*-wasm-*.c"
|
||||
"${XNNPACK_DIR}/src/*-wasm.c")
|
||||
set(wasm32_asm_src_patterns "${XNNPACK_DIR}/src/wasm_shr_*.S")
|
||||
|
||||
file(GLOB_RECURSE XNNPACK_WASM_MICROKERNEL_SRCS CONFIGURE_DEPENDS ${wasm_src_patterns})
|
||||
file(GLOB_RECURSE XNNPACK_WASM32_ASM_MICROKERNEL_SRCS CONFIGURE_DEPENDS ${wasm32_asm_src_patterns})
|
||||
|
||||
message(DEBUG "XNNPACK_WASM_MICROKERNEL_SRCS:${XNNPACK_WASM_MICROKERNEL_SRCS}")
|
||||
message(DEBUG "XNNPACK_WASM32_ASM_MICROKERNEL_SRCS:${XNNPACK_WASM32_ASM_MICROKERNEL_SRCS}")
|
||||
|
||||
target_sources(XNNPACK PRIVATE ${XNNPACK_WASM_MICROKERNEL_SRCS}
|
||||
${XNNPACK_WASM32_ASM_MICROKERNEL_SRCS})
|
||||
|
||||
if (onnxruntime_ENABLE_WEBASSEMBLY_SIMD)
|
||||
target_compile_options(XNNPACK PRIVATE "-msimd128")
|
||||
|
||||
set(wasmsimd_src_patterns "${XNNPACK_DIR}/src/wasmsimd-*.c"
|
||||
"${XNNPACK_DIR}/src/*-wasmsimd-*.c"
|
||||
"${XNNPACK_DIR}/src/*-wasmsimd.c"
|
||||
"${XNNPACK_DIR}/src/*/wasmsimd.c")
|
||||
|
||||
file(GLOB_RECURSE XNNPACK_WASMSIMD_MICROKERNEL_SRCS CONFIGURE_DEPENDS ${wasmsimd_src_patterns})
|
||||
message(DEBUG "XNNPACK_WASMSIMD_MICROKERNEL_SRCS:${XNNPACK_WASMSIMD_MICROKERNEL_SRCS}")
|
||||
|
||||
target_sources(XNNPACK PRIVATE ${XNNPACK_WASMSIMD_MICROKERNEL_SRCS})
|
||||
endif()
|
||||
endif()
|
||||
include(xnnpack)
|
||||
endif()
|
||||
|
||||
# onnxruntime-extensions
|
||||
|
|
|
|||
60
cmake/external/xnnpack.cmake
vendored
Normal file
60
cmake/external/xnnpack.cmake
vendored
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
set(XNNPACK_DIR external/XNNPACK)
|
||||
set(XNNPACK_INCLUDE_DIR ${XNNPACK_DIR}/include)
|
||||
set(XNNPACK_USE_SYSTEM_LIBS ON CACHE INTERNAL "")
|
||||
set(XNNPACK_BUILD_TESTS OFF CACHE INTERNAL "")
|
||||
set(XNNPACK_BUILD_BENCHMARKS OFF CACHE INTERNAL "")
|
||||
set(FP16_BUILD_TESTS OFF CACHE INTERNAL "")
|
||||
set(FP16_BUILD_BENCHMARKS OFF CACHE INTERNAL "")
|
||||
set(CLOG_SOURCE_DIR "${PYTORCH_CPUINFO_DIR}/deps/clog")
|
||||
set(CPUINFO_SOURCE_DIR ${PYTORCH_CPUINFO_DIR})
|
||||
|
||||
if (onnxruntime_BUILD_WEBASSEMBLY)
|
||||
execute_process(COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/xnnpack/AddEmscriptenSupport.patch WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/${XNNPACK_DIR})
|
||||
endif()
|
||||
|
||||
add_subdirectory(external/FP16)
|
||||
add_subdirectory(external/pthreadpool)
|
||||
add_subdirectory(external/XNNPACK)
|
||||
|
||||
set_target_properties(fp16 PROPERTIES FOLDER "External/Xnnpack")
|
||||
set_target_properties(pthreadpool PROPERTIES FOLDER "External/Xnnpack")
|
||||
set_target_properties(XNNPACK PROPERTIES FOLDER "External/Xnnpack")
|
||||
|
||||
set(onnxruntime_EXTERNAL_LIBRARIES_XNNPACK XNNPACK pthreadpool)
|
||||
list(APPEND onnxruntime_EXTERNAL_LIBRARIES ${onnxruntime_EXTERNAL_LIBRARIES_XNNPACK})
|
||||
|
||||
# the XNNPACK CMake setup doesn't include the WASM kernels so we have to manually set those up
|
||||
if (onnxruntime_BUILD_WEBASSEMBLY)
|
||||
if (onnxruntime_ENABLE_WEBASSEMBLY_THREADS)
|
||||
target_compile_options(XNNPACK PRIVATE "-pthread")
|
||||
endif()
|
||||
|
||||
message("Adding WebAssembly Source Files to XNNPACK")
|
||||
set(wasm_src_patterns "${XNNPACK_DIR}/src/wasm-*.c"
|
||||
"${XNNPACK_DIR}/src/*-wasm-*.c"
|
||||
"${XNNPACK_DIR}/src/*-wasm.c")
|
||||
set(wasm32_asm_src_patterns "${XNNPACK_DIR}/src/wasm_shr_*.S")
|
||||
|
||||
file(GLOB_RECURSE XNNPACK_WASM_MICROKERNEL_SRCS CONFIGURE_DEPENDS ${wasm_src_patterns})
|
||||
file(GLOB_RECURSE XNNPACK_WASM32_ASM_MICROKERNEL_SRCS CONFIGURE_DEPENDS ${wasm32_asm_src_patterns})
|
||||
|
||||
message(DEBUG "XNNPACK_WASM_MICROKERNEL_SRCS:${XNNPACK_WASM_MICROKERNEL_SRCS}")
|
||||
message(DEBUG "XNNPACK_WASM32_ASM_MICROKERNEL_SRCS:${XNNPACK_WASM32_ASM_MICROKERNEL_SRCS}")
|
||||
|
||||
target_sources(XNNPACK PRIVATE ${XNNPACK_WASM_MICROKERNEL_SRCS}
|
||||
${XNNPACK_WASM32_ASM_MICROKERNEL_SRCS})
|
||||
|
||||
if (onnxruntime_ENABLE_WEBASSEMBLY_SIMD)
|
||||
target_compile_options(XNNPACK PRIVATE "-msimd128")
|
||||
|
||||
set(wasmsimd_src_patterns "${XNNPACK_DIR}/src/wasmsimd-*.c"
|
||||
"${XNNPACK_DIR}/src/*-wasmsimd-*.c"
|
||||
"${XNNPACK_DIR}/src/*-wasmsimd.c"
|
||||
"${XNNPACK_DIR}/src/*/wasmsimd.c")
|
||||
|
||||
file(GLOB_RECURSE XNNPACK_WASMSIMD_MICROKERNEL_SRCS CONFIGURE_DEPENDS ${wasmsimd_src_patterns})
|
||||
message(DEBUG "XNNPACK_WASMSIMD_MICROKERNEL_SRCS:${XNNPACK_WASMSIMD_MICROKERNEL_SRCS}")
|
||||
|
||||
target_sources(XNNPACK PRIVATE ${XNNPACK_WASMSIMD_MICROKERNEL_SRCS})
|
||||
endif()
|
||||
endif()
|
||||
13
cmake/patches/xnnpack/AddEmscriptenSupport.patch
Normal file
13
cmake/patches/xnnpack/AddEmscriptenSupport.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 937b17f51..af0d2300f 100755
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -82,7 +82,7 @@ ENDIF()
|
||||
|
||||
IF(NOT CMAKE_SYSTEM_NAME)
|
||||
MESSAGE(FATAL_ERROR "CMAKE_SYSTEM_NAME not defined")
|
||||
-ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Darwin|Linux|Android|Windows|CYGWIN|MSYS)$")
|
||||
+ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Darwin|Linux|Android|Windows|CYGWIN|MSYS|Emscripten)$")
|
||||
MESSAGE(FATAL_ERROR "Unrecognized CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
|
||||
ENDIF()
|
||||
|
||||
Loading…
Reference in a new issue