From 6bfc472bec0bc2f8557aea312c960c2fcaf986b7 Mon Sep 17 00:00:00 2001 From: Rory Mitchell Date: Fri, 7 Jul 2017 12:36:26 +1200 Subject: [PATCH] Update nccl (#2494) --- CMakeLists.txt | 3 +-- nccl | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f5a2d225..38db6d773 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,6 @@ set(LINK_LIBRARIES dmlccore rabit) if(PLUGIN_UPDATER_GPU) find_package(CUDA 7.5 REQUIRED) cmake_minimum_required(VERSION 3.5) - add_subdirectory(nccl) include_directories( nccl/src @@ -76,6 +75,7 @@ if(PLUGIN_UPDATER_GPU) set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-Xcompiler -fPIC; -std=c++11") endif() + add_subdirectory(nccl) cuda_add_library(gpuxgboost ${CUDA_SOURCES} STATIC) target_link_libraries(gpuxgboost nccl) list(APPEND LINK_LIBRARIES gpuxgboost) @@ -128,7 +128,6 @@ if(GOOGLE_TEST) if(PLUGIN_UPDATER_GPU) 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}) else() set(CUDA_TEST_OBJS "") diff --git a/nccl b/nccl index 8ec6c27a3..018ff75f7 160000 --- a/nccl +++ b/nccl @@ -1 +1 @@ -Subproject commit 8ec6c27a33a900fb92f7e39acc73cc0f43e8539b +Subproject commit 018ff75f78e4d3616051fdcd3da7cf64249b6d59