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

Update nccl (#2494)

Browse Source
This commit is contained in:
Rory Mitchell 2017-07-07 12:36:26 +12:00 committed by GitHub
parent e7530bdffc
commit 6bfc472bec
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -62,7 +62,6 @@ set(LINK_LIBRARIES dmlccore rabit)
if(PLUGIN_UPDATER_GPU) if(PLUGIN_UPDATER_GPU)
find_package(CUDA 7.5 REQUIRED) find_package(CUDA 7.5 REQUIRED)
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
add_subdirectory(nccl)
include_directories( include_directories(
nccl/src nccl/src
@ -76,6 +75,7 @@ if(PLUGIN_UPDATER_GPU)
set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-Xcompiler -fPIC; -std=c++11") set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-Xcompiler -fPIC; -std=c++11")
endif() endif()
add_subdirectory(nccl)
cuda_add_library(gpuxgboost ${CUDA_SOURCES} STATIC) cuda_add_library(gpuxgboost ${CUDA_SOURCES} STATIC)
target_link_libraries(gpuxgboost nccl) target_link_libraries(gpuxgboost nccl)
list(APPEND LINK_LIBRARIES gpuxgboost) list(APPEND LINK_LIBRARIES gpuxgboost)
@ -128,7 +128,6 @@ if(GOOGLE_TEST)
if(PLUGIN_UPDATER_GPU) if(PLUGIN_UPDATER_GPU)
file(GLOB_RECURSE CUDA_TEST_SOURCES "plugin/updater_gpu/test/cpp/*.cu") file(GLOB_RECURSE CUDA_TEST_SOURCES "plugin/updater_gpu/test/cpp/*.cu")
set(CUDA_VERBOSE_BUILD ON)
cuda_compile(CUDA_TEST_OBJS ${CUDA_TEST_SOURCES}) cuda_compile(CUDA_TEST_OBJS ${CUDA_TEST_SOURCES})
else() else()
set(CUDA_TEST_OBJS "") set(CUDA_TEST_OBJS "")

2
nccl

@ -1 +1 @@
Subproject commit 8ec6c27a33a900fb92f7e39acc73cc0f43e8539b Subproject commit 018ff75f78e4d3616051fdcd3da7cf64249b6d59