From fd2ae97d605a5a31ab19e83a7faf4a49e1d01c1e Mon Sep 17 00:00:00 2001 From: Przemyslaw Tredak Date: Mon, 27 Jul 2020 14:27:52 -0700 Subject: [PATCH] Update CUB and include it only for CUDA < 11 (#18799) --- 3rdparty/nvidia_cub | 2 +- CMakeLists.txt | 9 ++------- 2 files changed, 3 insertions(+), 8 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 7bb2b531449e..86f90a1a95f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -299,7 +299,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") @@ -640,14 +639,10 @@ if(USE_CUDA) link_directories(${CUDAToolkit_LIBRARY_DIR}) endif() -# unsupported: if caffe is a subdirectory of mxnet, load its CMakeLists.txt as well -if(USE_PLUGIN_CAFFE) - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/caffe) - add_subdirectory(caffe) - 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")