ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/qnnpack/use-packages.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index a5ddc49..05e1279 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -13,8 +13,6 @@ PROJECT(QNNPACK C CXX ASM)
   6
   7  # ---[ Options.
   8  OPTION(QNNPACK_CUSTOM_THREADPOOL "Build QNNPACK for custom thread pool" OFF)
   9 -SET(QNNPACK_LIBRARY_TYPE "default" CACHE STRING "Type of library (shared, static, or default) to build")
  10 -SET_PROPERTY(CACHE QNNPACK_LIBRARY_TYPE PROPERTY STRINGS default static shared)
  11  OPTION(QNNPACK_BUILD_TESTS "Build QNNPACK unit tests" ON)
  12  OPTION(QNNPACK_BUILD_BENCHMARKS "Build QNNPACK benchmarks" ON)
  13
  14 @@ -53,11 +51,11 @@ SET(CONFU_DEPENDENCIES_SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps"
  15  SET(CONFU_DEPENDENCIES_BINARY_DIR "${CMAKE_BINARY_DIR}/deps"
  16    CACHE PATH "Confu-style dependencies binary directory")
  17
  18 -IF(NOT DEFINED CLOG_SOURCE_DIR)
  19 +IF(FALSE)
  20    SET(CLOG_SOURCE_DIR "${PROJECT_SOURCE_DIR}/deps/clog")
  21  ENDIF()
  22
  23 -IF(NOT DEFINED CPUINFO_SOURCE_DIR)
  24 +IF(FALSE)
  25    MESSAGE(STATUS "Downloading cpuinfo to ${CONFU_DEPENDENCIES_SOURCE_DIR}/cpuinfo (define CPUINFO_SOURCE_DIR to avoid it)")
  26    CONFIGURE_FILE(cmake/DownloadCpuinfo.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/cpuinfo-download/CMakeLists.txt")
  27    EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
  28 @@ -67,7 +65,7 @@ IF(NOT DEFINED CPUINFO_SOURCE_DIR)
  29    SET(CPUINFO_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/cpuinfo" CACHE STRING "cpuinfo source directory")
  30  ENDIF()
  31
  32 -IF(NOT DEFINED FP16_SOURCE_DIR)
  33 +IF(FALSE)
  34    MESSAGE(STATUS "Downloading FP16 to ${CONFU_DEPENDENCIES_SOURCE_DIR}/fp16 (define FP16_SOURCE_DIR to avoid it)")
  35    CONFIGURE_FILE(cmake/DownloadFP16.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/fp16-download/CMakeLists.txt")
  36    EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
  37 @@ -77,7 +75,7 @@ IF(NOT DEFINED FP16_SOURCE_DIR)
  38    SET(FP16_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/fp16" CACHE STRING "FP16 source directory")
  39  ENDIF()
  40
  41 -IF(NOT DEFINED FXDIV_SOURCE_DIR)
  42 +IF(FALSE)
  43    MESSAGE(STATUS "Downloading FXdiv to ${CONFU_DEPENDENCIES_SOURCE_DIR}/fxdiv (define FXDIV_SOURCE_DIR to avoid it)")
  44    CONFIGURE_FILE(cmake/DownloadFXdiv.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/fxdiv-download/CMakeLists.txt")
  45    EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
  46 @@ -87,7 +85,7 @@ IF(NOT DEFINED FXDIV_SOURCE_DIR)
  47    SET(FXDIV_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/fxdiv" CACHE STRING "FXdiv source directory")
  48  ENDIF()
  49
  50 -IF(NOT DEFINED PSIMD_SOURCE_DIR)
  51 +IF(FALSE)
  52    MESSAGE(STATUS "Downloading PSimd to ${CONFU_DEPENDENCIES_SOURCE_DIR}/psimd (define PSIMD_SOURCE_DIR to avoid it)")
  53    CONFIGURE_FILE(cmake/DownloadPSimd.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd-download/CMakeLists.txt")
  54    EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
  55 @@ -97,7 +95,7 @@ IF(NOT DEFINED PSIMD_SOURCE_DIR)
  56    SET(PSIMD_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/psimd" CACHE STRING "PSimd source directory")
  57  ENDIF()
  58
  59 -IF(NOT DEFINED PTHREADPOOL_SOURCE_DIR)
  60 +IF(FALSE)
  61    MESSAGE(STATUS "Downloading pthreadpool to ${CONFU_DEPENDENCIES_SOURCE_DIR}/pthreadpool (define PTHREADPOOL_SOURCE_DIR to avoid it)")
  62    CONFIGURE_FILE(cmake/DownloadPThreadPool.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/pthreadpool-download/CMakeLists.txt")
  63    EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
  64 @@ -107,7 +105,7 @@ IF(NOT DEFINED PTHREADPOOL_SOURCE_DIR)
  65    SET(PTHREADPOOL_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/pthreadpool" CACHE STRING "pthreadpool source directory")
  66  ENDIF()
  67
  68 -IF(QNNPACK_BUILD_TESTS AND NOT DEFINED GOOGLETEST_SOURCE_DIR)
  69 +IF(FALSE)
  70    MESSAGE(STATUS "Downloading Google Test to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest (define GOOGLETEST_SOURCE_DIR to avoid it)")
  71    CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download/CMakeLists.txt")
  72    EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
  73 @@ -117,7 +115,7 @@ IF(QNNPACK_BUILD_TESTS AND NOT DEFINED GOOGLETEST_SOURCE_DIR)
  74    SET(GOOGLETEST_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest" CACHE STRING "Google Test source directory")
  75  ENDIF()
  76
  77 -IF(QNNPACK_BUILD_BENCHMARKS AND NOT DEFINED GOOGLEBENCHMARK_SOURCE_DIR)
  78 +IF(FALSE)
  79    MESSAGE(STATUS "Downloading Google Benchmark to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googlebenchmark (define GOOGLEBENCHMARK_SOURCE_DIR to avoid it)")
  80    CONFIGURE_FILE(cmake/DownloadGoogleBenchmark.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googlebenchmark-download/CMakeLists.txt")
  81    EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
  82 @@ -229,15 +227,7 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[3-6]86|x86_64)$" OR IOS_ARCH MATCHES "^(i
  83    LIST(APPEND QNNPACK_UKERNELS ${QNNPACK_X86_SSE2_UKERNELS})
  84  ENDIF()
  85
  86 -IF(QNNPACK_LIBRARY_TYPE STREQUAL "default")
  87 -  ADD_LIBRARY(qnnpack ${QNNPACK_INIT_SRCS} ${QNNPACK_EXEC_SRCS} ${QNNPACK_UKERNELS})
  88 -ELSEIF(QNNPACK_LIBRARY_TYPE STREQUAL "shared")
  89 -  ADD_LIBRARY(qnnpack SHARED ${QNNPACK_INIT_SRCS} ${QNNPACK_EXEC_SRCS} ${QNNPACK_UKERNELS})
  90 -ELSEIF(QNNPACK_LIBRARY_TYPE STREQUAL "static")
  91 -  ADD_LIBRARY(qnnpack STATIC ${QNNPACK_INIT_SRCS} ${QNNPACK_EXEC_SRCS} ${QNNPACK_UKERNELS})
  92 -ELSE()
  93 -  MESSAGE(FATAL_ERROR "Unsupported QNNPACK library type \"${QNNPACK_LIBRARY_TYPE}\". Must be \"static\", \"shared\", or \"default\"")
  94 -ENDIF()
  95 +ADD_LIBRARY(qnnpack ${QNNPACK_INIT_SRCS} ${QNNPACK_EXEC_SRCS} ${QNNPACK_UKERNELS})
  96  SET_TARGET_PROPERTIES(qnnpack PROPERTIES
  97    C_STANDARD 99
  98    C_EXTENSIONS YES)
  99 @@ -272,7 +262,7 @@ TARGET_INCLUDE_DIRECTORIES(qnnpack PRIVATE src)
 100  SET_TARGET_PROPERTIES(qnnpack PROPERTIES PUBLIC_HEADER include/qnnpack.h)
 101
 102  # ---[ Configure clog
 103 -IF(NOT TARGET clog)
 104 +IF(FALSE)
 105    SET(CLOG_BUILD_TESTS OFF CACHE BOOL "")
 106    SET(CLOG_RUNTIME_TYPE "${CPUINFO_RUNTIME_TYPE}" CACHE STRING "")
 107    ADD_SUBDIRECTORY(
 108 @@ -281,10 +271,9 @@ IF(NOT TARGET clog)
 109    # We build static version of clog but a dynamic library may indirectly depend on it
 110    SET_PROPERTY(TARGET clog PROPERTY POSITION_INDEPENDENT_CODE ON)
 111  ENDIF()
 112 -TARGET_LINK_LIBRARIES(qnnpack PRIVATE clog)
 113
 114  # ---[ Configure cpuinfo
 115 -IF(NOT TARGET cpuinfo)
 116 +IF(FALSE)
 117    SET(CPUINFO_BUILD_TOOLS OFF CACHE BOOL "")
 118    SET(CPUINFO_BUILD_UNIT_TESTS OFF CACHE BOOL "")
 119    SET(CPUINFO_BUILD_MOCK_TESTS OFF CACHE BOOL "")
 120 @@ -293,17 +282,19 @@ IF(NOT TARGET cpuinfo)
 121      "${CPUINFO_SOURCE_DIR}"
 122      "${CONFU_DEPENDENCIES_BINARY_DIR}/cpuinfo")
 123  ENDIF()
 124 -TARGET_LINK_LIBRARIES(qnnpack PRIVATE cpuinfo)
 125 +
 126 +find_package(unofficial-cpuinfo CONFIG REQUIRED)
 127 +target_link_libraries(qnnpack PUBLIC unofficial::cpuinfo::clog unofficial::cpuinfo::cpuinfo)
 128
 129  # ---[ Configure pthreadpool
 130 -IF(NOT TARGET pthreadpool)
 131 +IF(FALSE)
 132    SET(PTHREADPOOL_BUILD_TESTS OFF CACHE BOOL "")
 133    SET(PTHREADPOOL_BUILD_BENCHMARKS OFF CACHE BOOL "")
 134    ADD_SUBDIRECTORY(
 135      "${PTHREADPOOL_SOURCE_DIR}"
 136      "${CONFU_DEPENDENCIES_BINARY_DIR}/pthreadpool")
 137  ENDIF()
 138 -IF(QNNPACK_CUSTOM_THREADPOOL)
 139 +IF(FALSE)
 140    # Depend on pthreadpool interface, but not on implementation.
 141    # This is used when QNNPACK user (e.g. Caffe2) provides its own threadpool implementation.
 142    TARGET_LINK_LIBRARIES(qnnpack PUBLIC pthreadpool_interface)
 143 @@ -312,34 +303,38 @@ ELSE()
 144  ENDIF()
 145
 146  # ---[ Configure FXdiv
 147 -IF(NOT TARGET fxdiv)
 148 +IF(FALSE)
 149    SET(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
 150    SET(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
 151    ADD_SUBDIRECTORY(
 152      "${FXDIV_SOURCE_DIR}"
 153      "${CONFU_DEPENDENCIES_BINARY_DIR}/fxdiv")
 154  ENDIF()
 155 -TARGET_LINK_LIBRARIES(qnnpack PRIVATE fxdiv)
 156 +find_path(FXDIV_INCLUDE_DIRS "fxdiv.h")
 157 +target_include_directories(qnnpack PRIVATE ${FXDIV_INCLUDE_DIRS})
 158
 159  # ---[ Configure psimd
 160 -IF(NOT TARGET psimd)
 161 +IF(FALSE)
 162    ADD_SUBDIRECTORY(
 163      "${PSIMD_SOURCE_DIR}"
 164      "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd")
 165  ENDIF()
 166 -TARGET_LINK_LIBRARIES(qnnpack PRIVATE psimd)
 167 +find_path(PSIMD_INCLUDE_DIRS "psimd.h")
 168 +target_include_directories(qnnpack PRIVATE ${PSIMD_INCLUDE_DIRS})
 169
 170  # ---[ Configure FP16
 171 -IF(NOT TARGET fp16)
 172 +IF(FALSE)
 173    SET(FP16_BUILD_TESTS OFF CACHE BOOL "")
 174    SET(FP16_BUILD_BENCHMARKS OFF CACHE BOOL "")
 175    ADD_SUBDIRECTORY(
 176      "${FP16_SOURCE_DIR}"
 177      "${CONFU_DEPENDENCIES_BINARY_DIR}/fp16")
 178  ENDIF()
 179 -TARGET_LINK_LIBRARIES(qnnpack PRIVATE fp16)
 180 +find_path(FP16_INCLUDE_DIRS "fp16.h")
 181 +target_include_directories(qnnpack PRIVATE ${FP16_INCLUDE_DIRS})
 182
 183  INSTALL(TARGETS qnnpack
 184 +    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 185      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 186      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 187      PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})