mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-05-18 21:21:17 +00:00
b94ba09e4f
### Description
Update XNNPack to latest version (Sep 4)
- Some op outputs are changed, channel or stride paras are moved into
reshape func.
e.g.
96962a602d
- input params of xnnpack's resize related function are changed a lot
- KleidiAI is added as a dependency in ARM64
- The latest XNNPACK includes 2 static libs microkernels-prod and
xnnpack.
Without microkernels-prod, it throws the exception of Undefined symbols.
- Add ORT_TARGET_PROCESSOR to get the real processor target in CMake
37 lines
2.7 KiB
Diff
37 lines
2.7 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 1ff85b538..c3ef2183f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -253,7 +253,7 @@ ENDIF()
|
|
# ---[ Build flags
|
|
IF(NOT CMAKE_SYSTEM_NAME)
|
|
MESSAGE(FATAL_ERROR "CMAKE_SYSTEM_NAME not defined")
|
|
-ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Android|Darwin|iOS|Linux|Windows|CYGWIN|MSYS|QURT)$")
|
|
+ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Android|Darwin|iOS|Linux|Windows|CYGWIN|MSYS|QURT|Emscripten|iOS)$")
|
|
MESSAGE(FATAL_ERROR "Unrecognized CMAKE_SYSTEM_NAME value \"${CMAKE_SYSTEM_NAME}\"")
|
|
ENDIF()
|
|
IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
|
|
@@ -763,7 +763,12 @@ IF(XNNPACK_BUILD_LIBRARY)
|
|
TARGET_LINK_LIBRARIES(operator-run PRIVATE xnnpack-base logging)
|
|
TARGET_LINK_LIBRARIES(operator-utils PRIVATE xnnpack-base logging)
|
|
TARGET_LINK_LIBRARIES(subgraph PRIVATE xnnpack-base allocator logging memory mutex operators operator-run)
|
|
- TARGET_LINK_LIBRARIES(XNNPACK PRIVATE allocator cache hardware-config indirection logging memory microkernel-utils microparams-init mutex normalization operators operator-run operator-utils packing microkernels-prod subgraph)
|
|
+ IF(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
|
|
+ # omit microkernels-prod as the list is manually created by ORT in cmake/external/xnnpack.cmake
|
|
+ TARGET_LINK_LIBRARIES(XNNPACK PRIVATE allocator cache hardware-config indirection logging memory microkernel-utils microparams-init mutex normalization operators operator-run operator-utils packing subgraph)
|
|
+ ELSE()
|
|
+ TARGET_LINK_LIBRARIES(XNNPACK PRIVATE allocator cache hardware-config indirection logging memory microkernel-utils microparams-init mutex normalization operators operator-run operator-utils packing microkernels-prod subgraph)
|
|
+ ENDIF()
|
|
TARGET_LINK_LIBRARIES(XNNPACK PUBLIC xnnpack-base)
|
|
SET_TARGET_PROPERTIES(XNNPACK PROPERTIES C_EXTENSIONS YES)
|
|
ENDIF()
|
|
@@ -772,7 +777,8 @@ IF(NOT MSVC)
|
|
ENDIF()
|
|
IF(XNNPACK_TARGET_PROCESSOR STREQUAL "arm")
|
|
SET_PROPERTY(SOURCE ${ALL_MICROKERNEL_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS " -marm ")
|
|
- SET_PROPERTY(SOURCE ${ALL_ARMSIMD32_MICROKERNEL_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS " -march=armv6 -mfpu=vfp -munaligned-access ")
|
|
+ # set this to armv7-a to workaround build issue. we don't target armv6 so it shouldn't matter
|
|
+ SET_PROPERTY(SOURCE ${ALL_ARMSIMD32_MICROKERNEL_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS " -march=armv7-a -mfpu=vfp -munaligned-access ")
|
|
SET_PROPERTY(SOURCE ${ALL_NEON_MICROKERNEL_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS " -march=armv7-a -mfpu=neon ")
|
|
SET_PROPERTY(SOURCE ${ALL_NEONFP16_MICROKERNEL_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS " -march=armv7-a -mfpu=neon-fp16 ")
|
|
# GCC requires -mfp16-format=ieee to define __fp16 type, but Clang doesn't support this option at all.
|