From bafba21f032163fe023946de89fd738f187a3aab Mon Sep 17 00:00:00 2001 From: Przemek Tredak Date: Fri, 24 Jul 2020 15:30:40 -0700 Subject: [PATCH] Update CUB and include it only for CUDA < 11 --- 3rdparty/nvidia_cub | 2 +- CMakeLists.txt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/3rdparty/nvidia_cub b/3rdparty/nvidia_cub index c3cceac115c0..0158fa19f286 160000 --- a/3rdparty/nvidia_cub +++ b/3rdparty/nvidia_cub @@ -1 +1 @@ -Subproject commit c3cceac115c072fb63df1836ff46d8c60d9eb304 +Subproject commit 0158fa19f28619886232defd412433974af89611 diff --git a/CMakeLists.txt b/CMakeLists.txt index d3e6c7440e16..162eeeade385 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -298,7 +298,6 @@ foreach(var ${C_CXX_INCLUDE_DIRECTORIES}) endforeach() include_directories("include") -include_directories("3rdparty/nvidia_cub") include_directories("3rdparty/tvm/nnvm/include") include_directories("3rdparty/tvm/include") include_directories("3rdparty/dmlc-core/include") @@ -606,6 +605,10 @@ if(USE_CUDA) link_directories(${CUDAToolkit_LIBRARY_DIR}) endif() +if(CUDAToolkit_VERSION_MAJOR LESS "11") + include_directories("3rdparty/nvidia_cub") +endif() + if(MSVC) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /EHsc") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /EHsc /Gy")