saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-29 20:14:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change how we apply patches to absl (#10799)

Browse source
This commit is contained in:
Changming Sun 2022-03-08 02:03:06 -08:00 committed by GitHub
parent 1e4a4bfe58
commit ce07dc30fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/CMakeLists.txt
View file

@ -510,6 +510,10 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin|iOS")
endif()
find_package(Threads)
find_package(Patch)
if(Patch_FOUND)
message("Patch found: ${Patch_EXECUTABLE}")
endif()
macro(check_nvcc_compiler_flag _FLAG _RESULT)
execute_process(COMMAND ${onnxruntime_CUDA_HOME}/bin/nvcc "${_FLAG}" RESULT_VARIABLE NVCC_OUT ERROR_VARIABLE NVCC_ERROR)

8
cmake/external/abseil-cpp.cmake vendored
View file

@ -7,12 +7,18 @@ include(FetchContent)
set(ABSL_PROPAGATE_CXX_STD 1)
set(BUILD_TESTING 0)
if(Patch_FOUND)
set(ABSL_PATCH_COMMAND ${Patch_EXECUTABLE} --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/abseil/Fix_Nvidia_Build_Break.patch)
else()
set(ABSL_PATCH_COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/abseil/Fix_Nvidia_Build_Break.patch)
endif()
FetchContent_Declare(
abseil_cpp
PREFIX "${CMAKE_CURRENT_BINARY_DIR}/abseil-cpp"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/external/abseil-cpp"
URL https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.zip
PATCH_COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/abseil/Fix_Nvidia_Build_Break.patch
PATCH_COMMAND ${ABSL_PATCH_COMMAND}
)
FetchContent_MakeAvailable(abseil_cpp)