Backport 'Update CUB and include it only for CUDA < 11 apache#18799'

Signed-off-by: Serge Panev <[email protected]>
Kh4L · Aug 21, 2020 · aab977e · aab977e
1 parent 9445a2d
commit aab977e
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
@@ -327,12 +327,15 @@ 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")
 include_directories("3rdparty/dlpack/include")
 
+if(CUDAToolkit_VERSION_MAJOR LESS "11")
+  include_directories("3rdparty/nvidia_cub")
+endif()
+
 # commented out until PR goes through
 #if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/dlpack)
 #  add_subdirectory(3rdparty/dlpack)