From bff182a6c4241e64f46b5d8310cacf81f2518b87 Mon Sep 17 00:00:00 2001 From: Rory Mitchell Date: Thu, 27 Aug 2020 10:01:08 +1200 Subject: [PATCH 1/2] Update GPUTreeShap --- CMakeLists.txt | 1 + gputreeshap | 2 +- src/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24b9ac3adcaf..d384ba19b3f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,6 +113,7 @@ if (USE_CUDA) set(GEN_CODE "") format_gencode_flags("${GPU_COMPUTE_VER}" GEN_CODE) message(STATUS "CUDA GEN_CODE: ${GEN_CODE}") + add_subdirectory(${PROJECT_SOURCE_DIR}/gputreeshap) endif (USE_CUDA) if (FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND diff --git a/gputreeshap b/gputreeshap index a3d4c44cc6a0..04410099299e 160000 --- a/gputreeshap +++ b/gputreeshap @@ -1 +1 @@ -Subproject commit a3d4c44cc6a0a6c3870e7cebcd1ef1d09d7bc0cb +Subproject commit 04410099299ec918c75d00e385da35cf2e5aa87c diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7b5a221bb4e9..8e62d9ced0bf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,7 +9,6 @@ if (USE_CUDA) file(GLOB_RECURSE CUDA_SOURCES *.cu *.cuh) target_sources(objxgboost PRIVATE ${CUDA_SOURCES}) target_compile_definitions(objxgboost PRIVATE -DXGBOOST_USE_CUDA=1) - target_include_directories(objxgboost PRIVATE ${xgboost_SOURCE_DIR}/gputreeshap) if (CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11.0) target_include_directories(objxgboost PRIVATE ${xgboost_SOURCE_DIR}/cub/) endif (CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11.0) @@ -50,6 +49,7 @@ if (USE_CUDA) CUDA_STANDARD 14 CUDA_STANDARD_REQUIRED ON CUDA_SEPARABLE_COMPILATION OFF) + target_link_libraries(objxgboost PRIVATE GPUTreeShap) endif (USE_CUDA) target_include_directories(objxgboost From d931966789cf0008ebefa1d138f3a4fad87a13c0 Mon Sep 17 00:00:00 2001 From: Rory Mitchell Date: Thu, 27 Aug 2020 14:46:08 +1200 Subject: [PATCH 2/2] Update src/CMakeLists.txt Co-authored-by: Philip Hyunsu Cho --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8e62d9ced0bf..83cf2ed75bc9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -49,7 +49,7 @@ if (USE_CUDA) CUDA_STANDARD 14 CUDA_STANDARD_REQUIRED ON CUDA_SEPARABLE_COMPILATION OFF) - target_link_libraries(objxgboost PRIVATE GPUTreeShap) + target_link_libraries(objxgboost PRIVATE GPUTreeShap::GPUTreeShap) endif (USE_CUDA) target_include_directories(objxgboost