logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://anongit.hacktivis.me/git/overlay.git/

onnxruntime-1.9.1-system_libs.patch (3196B)

    

  1. diff --git a/CMakeLists.txt.old b/CMakeLists.txt
  2. index 2534b99..d144047 100644
  3. --- a/CMakeLists.txt.old
  4. +++ b/CMakeLists.txt
  5. @@ -540,7 +540,7 @@ if (MSVC)
  6.        set(CMAKE_ASM_MASM_FLAGS "${CMAKE_ASM_MASM_FLAGS} /safeseh")
  7.      endif()
  8.    endif()
  9. -  
  10. +
  11.  
  12.    #Always enable exception handling, even for Windows ARM
  13.    if(NOT onnxruntime_DISABLE_EXCEPTIONS)
  14. @@ -833,7 +833,13 @@ get_filename_component(ORTTRAINING_ROOT "${ORTTRAINING_ROOT}" ABSOLUTE)
  15.  get_filename_component(REPO_ROOT "${REPO_ROOT}" ABSOLUTE)
  16.  set(ONNXRUNTIME_INCLUDE_DIR ${REPO_ROOT}/include/onnxruntime)
  17.  
  18. -add_subdirectory(external/date EXCLUDE_FROM_ALL)
  19. +if(onnxruntime_PREFER_SYSTEM_LIB)
  20. +  find_package(date REQUIRED)
  21. +  add_library(date_interface ALIAS date::date)
  22. +endif()
  23. +if(NOT TARGET date::date)
  24. +  add_subdirectory(external/date EXCLUDE_FROM_ALL)
  25. +endif()
  26.  
  27.  set(SAFEINT_INCLUDE_DIR ${REPO_ROOT}/cmake/external/SafeInt)
  28.  add_library(safeint_interface INTERFACE)
  29. @@ -844,16 +850,33 @@ if(onnxruntime_DISABLE_EXCEPTIONS)
  30.    add_compile_definitions(optional_CONFIG_NO_EXCEPTIONS=1)
  31.  endif()
  32.  
  33. -add_subdirectory(external/mp11 EXCLUDE_FROM_ALL)
  34. +if(onnxruntime_PREFER_SYSTEM_LIB)
  35. +  find_package(boost_mp11)
  36. +endif()
  37. +if(NOT TARGET Boost::mp11)
  38. +  add_subdirectory(external/mp11 EXCLUDE_FROM_ALL)
  39. +endif()
  40.  
  41. -set(JSON_BuildTests OFF CACHE INTERNAL "")
  42. -set(JSON_Install OFF CACHE INTERNAL "")
  43. -add_subdirectory(external/json EXCLUDE_FROM_ALL)
  44. +if(onnxruntime_PREFER_SYSTEM_LIB)
  45. +  find_package(nlohmann_json REQUIRED)
  46. +endif()
  47. +if(NOT TARGET nlohmann_json::nlohmann_json)
  48. +  set(JSON_BuildTests OFF CACHE INTERNAL "")
  49. +  set(JSON_Install OFF CACHE INTERNAL "")
  50. +  add_subdirectory(external/json EXCLUDE_FROM_ALL)
  51. +endif()
  52.  
  53. +find_package(PkgConfig)
  54.  if(onnxruntime_PREFER_SYSTEM_LIB)
  55. -  find_package(re2)
  56. +  pkg_check_modules(RE2 re2)
  57.  endif()
  58. -if(NOT TARGET re2::re2)
  59. +if(RE2_FOUND)
  60. +  add_library(re2::re2 INTERFACE IMPORTED)
  61. +  set_target_properties(re2::re2 PROPERTIES
  62. +    INTERFACE_COMPILE_OPTIONS "${RE2_CFLAGS}"
  63. +    INTERFACE_LINK_LIBRARIES "${RE2_LDFLAGS}"
  64. +  )
  65. +else()
  66.    add_subdirectory(external/re2 EXCLUDE_FROM_ALL)
  67.    set_target_properties(re2 PROPERTIES FOLDER "External/re2")
  68.    set(RE2_INCLUDE_DIR ${REPO_ROOT}/cmake/external/re2)
  69. @@ -885,12 +908,12 @@ else()
  70.          elseif(WINDOWS_STORE OR (WIN32 AND NOT CMAKE_CXX_STANDARD_LIBRARIES MATCHES kernel32.lib))
  71.              message(WARNING "Cpuinfo not included in Windows Store or WCOS builds")
  72.              set(CPUINFO_SUPPORTED FALSE)
  73. -        endif()     
  74. +        endif()
  75.      elseif(NOT ${onnxruntime_target_platform} MATCHES "^(i[3-6]86|AMD64|x86(_64)?|armv[5-8].*|aarch64|arm64)$")
  76.          message(WARNING
  77.          "Target processor architecture \"${onnxruntime_target_platform}\" is not supported in cpuinfo. "
  78.          "cpuinfo not included.")
  79. -        set(CPUINFO_SUPPORTED FALSE)    
  80. +        set(CPUINFO_SUPPORTED FALSE)
  81.      endif()
  82.  endif()
  83.  
  84. @@ -907,7 +930,7 @@ if(CPUINFO_SUPPORTED)
  85.        set(IOS ON CACHE INTERNAL "")
  86.        set(IOS_ARCH "${CMAKE_OSX_ARCHITECTURES}" CACHE INTERNAL "")
  87.    endif()
  88. -  
  89. +
  90.    string(APPEND CMAKE_CXX_FLAGS " -DCPUINFO_SUPPORTED")
  91.    add_subdirectory(external/pytorch_cpuinfo EXCLUDE_FROM_ALL)
  92.    if(MSVC)