Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow building with CCCL that's newer than CTK (#10633)

Browse Source
This commit is contained in:
Philip Hyunsu Cho 2024-07-25 00:41:56 -07:00 committed by GitHub
parent d5834b68c3
commit ec82c75ee7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/Utils.cmake
View File

@ -104,7 +104,20 @@ function(xgboost_set_cuda_flags target)
target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1)
endif() endif()
target_link_libraries(${target} PRIVATE CCCL::CCCL) # Use CCCL we find before CUDA Toolkit to make sure we get newer headers as intended
# The CUDA Toolkit includes its own copy of CCCL that often lags the latest releases
# (and would be picked up otherwise)
if(BUILD_STATIC_LIB)
# If the downstream user is statically linking with libxgboost, it needs to
# explicitly link with CCCL and CUDA runtime.
target_link_libraries(${target}
PUBLIC CCCL::CCCL CUDA::cudart_static)
else()
# If the downstream user is dynamically linking with libxgboost, it does not
# need to link with CCCL and CUDA runtime.
target_link_libraries(${target}
PRIVATE CCCL::CCCL CUDA::cudart_static)
endif()
target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1)
target_include_directories( target_include_directories(
${target} PRIVATE ${target} PRIVATE
@ -235,7 +248,6 @@ macro(xgboost_target_link_libraries target)
if(USE_CUDA) if(USE_CUDA)
xgboost_set_cuda_flags(${target}) xgboost_set_cuda_flags(${target})
target_link_libraries(${target} PUBLIC CUDA::cudart_static)
endif() endif()
if(PLUGIN_RMM) if(PLUGIN_RMM)