Revert "Change CUB submodule to track Nvidia CUB project. (apache#13322…

…)"

This reverts commit b6eac1d.

.gitmodules

@@ -20,12 +20,12 @@
 	path = 3rdparty/mkldnn
 	url = https://github.com/intel/mkl-dnn.git
 	branch = master
+[submodule "3rdparty/cub"]
+	path = 3rdparty/cub
+	url = https://github.com/dmlc/cub
 [submodule "3rdparty/tvm"]
 	path = 3rdparty/tvm
 	url = https://github.com/dmlc/tvm
 [submodule "3rdparty/onnx-tensorrt"]
 	path = 3rdparty/onnx-tensorrt
 	url = https://github.com/onnx/onnx-tensorrt.git
-[submodule "3rdparty/nvidia_cub"]
-	path = 3rdparty/nvidia_cub
-	url = https://github.com/NVlabs/cub.git

CMakeLists.txt

@@ -353,7 +353,7 @@ endforeach()
 
 include_directories("include")
 include_directories("3rdparty/mshadow")
-include_directories("3rdparty/nvidia_cub")
+include_directories("3rdparty/cub")
 include_directories("3rdparty/tvm/nnvm/include")
 include_directories("3rdparty/tvm/include")
 include_directories("3rdparty/dmlc-core/include")
@@ -537,7 +537,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/nvidia_cub/cub/*.cuh")
+  "plugin/*.cuh" "3rdparty/cub/cub/*.cuh")
 assign_source_group("Source" ${GROUP_SOURCE})
 assign_source_group("Include" ${GROUP_Include})
 assign_source_group("CUDA" ${GROUP_CUDA})

LICENSE

@@ -315,10 +315,10 @@
          Copyright 2005-2008, Google Inc.
     3. Moderngpu - For details, see, 3rdparty/ctc_include/contrib/moderngpu/LICENSE
          Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
-    4. CUB Library - For details, see, 3rdparty/nvidia_cub/LICENSE.TXT
+    4. CUB Library - For details, see, 3rdparty/cub/LICENSE.TXT
          Copyright (c) 2010-2011, Duane Merrill.  All rights reserved.
          Copyright (c) 2011-2016, NVIDIA CORPORATION.  All rights reserved.
-    5. CUB mersenne.h - For details, see 3rdparty/nvidia_cub/test/mersenne.h
+    5. CUB mersenne.h - For details, see 3rdparty/cub/test/mersenne.h
          Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
     6. Googlemock - For details, see, 3rdparty/googletest/googlemock/LICENSE
          Copyright 2006-2015, Google Inc.

Makefile

@@ -485,7 +485,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/nvidia_cub
+	CFLAGS += -I$(ROOTDIR)/3rdparty/cub
 	ALL_DEP += $(CUOBJ) $(EXTRA_CUOBJ) $(PLUGIN_CUOBJ)
 	LDFLAGS += -lcufft
 	ifeq ($(ENABLE_CUDA_RTC), 1)