From aab977e7d43fb872ab796fb73a5085197dcc0aba Mon Sep 17 00:00:00 2001
From: Serge Panev <spanev@nvidia.com>
Date: Thu, 20 Aug 2020 18:56:06 -0700
Subject: [PATCH] Backport 'Update CUB and include it only for CUDA < 11
 #18799'

Signed-off-by: Serge Panev <spanev@nvidia.com>
---
 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 7e1ef2a00a76..85d2566dc913 100644
--- 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)