Update CUB and include it only for CUDA < 11 (apache#18799)

zheyuye · Jul 27, 2020 · 9e77e81 · 9e77e81
1 parent 98b3f73
commit 9e77e81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/3rdparty/nvidia_cub b/3rdparty/nvidia_cub
diff --git 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")