mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-06-04 23:59:56 +00:00
5af6279440
### Description The new cpuinfo library doesn't use clog on Android. Newer XNNPack versions have removed the dependency on clog, but the one we use still has it. So I cherry-pick the XNNPack to our patch file.
66 lines
3.1 KiB
Diff
66 lines
3.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index d53c48aa1..77c3cf983 100755
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -105,22 +105,12 @@ 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|iOS)$")
|
|
MESSAGE(FATAL_ERROR "Unrecognized CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
|
|
ENDIF()
|
|
|
|
# ---[ Download deps
|
|
IF(NOT XNNPACK_USE_SYSTEM_LIBS)
|
|
- IF(NOT DEFINED CLOG_SOURCE_DIR)
|
|
- MESSAGE(STATUS "Downloading clog to ${CMAKE_BINARY_DIR}/clog-source (define CLOG_SOURCE_DIR to avoid it)")
|
|
- CONFIGURE_FILE(cmake/DownloadCLog.cmake "${CMAKE_BINARY_DIR}/clog-download/CMakeLists.txt")
|
|
- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
|
|
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/clog-download")
|
|
- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" --build .
|
|
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/clog-download")
|
|
- SET(CLOG_SOURCE_DIR "${CMAKE_BINARY_DIR}/clog-source" CACHE STRING "clog source directory")
|
|
- ENDIF()
|
|
-
|
|
IF(NOT DEFINED CPUINFO_SOURCE_DIR)
|
|
MESSAGE(STATUS "Downloading cpuinfo to ${CMAKE_BINARY_DIR}/cpuinfo-source (define CPUINFO_SOURCE_DIR to avoid it)")
|
|
CONFIGURE_FILE(cmake/DownloadCpuinfo.cmake "${CMAKE_BINARY_DIR}/cpuinfo-download/CMakeLists.txt")
|
|
@@ -7108,6 +7098,10 @@ IF(MSVC)
|
|
SET_PROPERTY(SOURCE ${ALL_MICROKERNEL_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS "$<$<NOT:$<CONFIG:Debug>>: /O2 >")
|
|
SET_PROPERTY(SOURCE ${HOT_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS "$<$<NOT:$<CONFIG:Debug>>: /O2 >")
|
|
SET_PROPERTY(SOURCE ${COLD_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS "$<$<NOT:$<CONFIG:Debug>>: /O1 >")
|
|
+ELSEIF(CMAKE_GENERATOR STREQUAL Xcode)
|
|
+ TARGET_COMPILE_OPTIONS(all_microkernels PRIVATE $<$<NOT:$<CONFIG:Debug>>: -O2 >)
|
|
+ TARGET_COMPILE_OPTIONS(XNNPACK PRIVATE $<$<NOT:$<CONFIG:Debug>>: -O2 >)
|
|
+ TARGET_COMPILE_OPTIONS(XNNPACK PRIVATE $<$<NOT:$<CONFIG:Debug>>: -Os >)
|
|
ELSE()
|
|
SET_PROPERTY(SOURCE ${ALL_MICROKERNEL_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS "$<$<NOT:$<CONFIG:Debug>>: -O2 >")
|
|
SET_PROPERTY(SOURCE ${HOT_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS "$<$<NOT:$<CONFIG:Debug>>: -O2 >")
|
|
@@ -7142,26 +7136,6 @@ IF(LIBM)
|
|
TARGET_LINK_LIBRARIES(indirection PRIVATE ${LIBM})
|
|
ENDIF()
|
|
|
|
-# ---[ Configure clog
|
|
-IF(NOT TARGET clog)
|
|
- IF(NOT XNNPACK_USE_SYSTEM_LIBS)
|
|
- SET(CLOG_BUILD_TESTS OFF CACHE BOOL "")
|
|
- SET(CLOG_RUNTIME_TYPE "${CPUINFO_RUNTIME_TYPE}" CACHE STRING "")
|
|
- ADD_SUBDIRECTORY(
|
|
- "${CLOG_SOURCE_DIR}/deps/clog"
|
|
- "${CMAKE_BINARY_DIR}/clog")
|
|
- # We build static version of clog but a dynamic library may indirectly depend on it
|
|
- SET_PROPERTY(TARGET clog PROPERTY POSITION_INDEPENDENT_CODE ON)
|
|
- ELSE()
|
|
- ADD_LIBRARY(clog STATIC IMPORTED)
|
|
- FIND_LIBRARY(CLOG_LIBRARY clog)
|
|
- IF(NOT CLOG_LIBRARY)
|
|
- MESSAGE(FATAL_ERROR "Cannot find clog")
|
|
- ENDIF()
|
|
- SET_PROPERTY(TARGET clog PROPERTY IMPORTED_LOCATION "${CLOG_LIBRARY}")
|
|
- ENDIF()
|
|
-ENDIF()
|
|
-
|
|
# ---[ Configure cpuinfo
|
|
IF(NOT TARGET cpuinfo)
|
|
IF(NOT XNNPACK_USE_SYSTEM_LIBS)
|