From 553f11c043fbfaa56d8485b27d393da6fd57b0da Mon Sep 17 00:00:00 2001
From: Kellen Sunderland <kellens@amazon.com>
Date: Thu, 22 Nov 2018 14:28:43 -0800
Subject: [PATCH] Update references to cub

---
 .gitmodules    | 4 ++--
 CMakeLists.txt | 4 ++--
 LICENSE        | 2 +-
 Makefile       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 978ff4ba3241..a1002e8994f5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,7 +26,7 @@
 [submodule "3rdparty/onnx-tensorrt"]
 	path = 3rdparty/onnx-tensorrt
 	url = https://github.com/onnx/onnx-tensorrt.git
-[submodule "nvidia_cub"]
-	path = nvidia_cub
+[submodule "3rdparty/nvidia_cub"]
+	path = 3rdparty/nvidia_cub
 	url = https://github.com/NVlabs/cub.git
 	branch = 1.8.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42f6bffb9207..dce32c05fa41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -309,7 +309,7 @@ endforeach()
 
 include_directories("include")
 include_directories("3rdparty/mshadow")
-include_directories("3rdparty/cub")
+include_directories("3rdparty/nvidia_cub")
 include_directories("3rdparty/tvm/nnvm/include")
 include_directories("3rdparty/tvm/include")
 include_directories("3rdparty/dmlc-core/include")
@@ -491,7 +491,7 @@ list(APPEND CUDA ${MSHADOW_CUDASOURCE})
 FILE(GLOB_RECURSE GROUP_SOURCE "src/*.cc" "3rdparty/tvm/nnvm/*.cc" "plugin/*.cc")
 FILE(GLOB_RECURSE GROUP_Include "src/*.h" "3rdparty/tvm/nnvm/*.h" "3rdparty/mshadow/mshadow/*.h" "plugin/*.h")
 FILE(GLOB_RECURSE GROUP_CUDA "src/*.cu" "src/*.cuh" "3rdparty/mshadow/mshadow/*.cuh" "plugin/*.cu"
-  "plugin/*.cuh" "3rdparty/cub/cub/*.cuh")
+  "plugin/*.cuh" "3rdparty/nvidia_cub/cub/*.cuh")
 assign_source_group("Source" ${GROUP_SOURCE})
 assign_source_group("Include" ${GROUP_Include})
 assign_source_group("CUDA" ${GROUP_CUDA})
diff --git a/LICENSE b/LICENSE
index a8b57e583764..39fdc8e3894d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -274,7 +274,7 @@
     ******************************************************************************/
 
     2. CUB Library
-    For details, see, 3rdparty/cub/LICENSE.TXT
+    For details, see, 3rdparty/nvidia_cub/LICENSE.TXT
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
diff --git a/Makefile b/Makefile
index ad7f0ff3485f..ce107216a18b 100644
--- a/Makefile
+++ b/Makefile
@@ -417,7 +417,7 @@ LIB_DEP += $(DMLC_CORE)/libdmlc.a $(NNVM_PATH)/lib/libnnvm.a
 ALL_DEP = $(OBJ) $(EXTRA_OBJ) $(PLUGIN_OBJ) $(LIB_DEP)
 
 ifeq ($(USE_CUDA), 1)
-	CFLAGS += -I$(ROOTDIR)/3rdparty/cub
+	CFLAGS += -I$(ROOTDIR)/3rdparty/nvidia_cub
 	ALL_DEP += $(CUOBJ) $(EXTRA_CUOBJ) $(PLUGIN_CUOBJ)
 	LDFLAGS += -lcufft
 	ifeq ($(ENABLE_CUDA_RTC), 1)