[GitHub] KellenSunderland closed pull request #13378: [DO NOT MERGE] Testing subrepo by branch

[GitBox <gi...@apache.org>]

KellenSunderland closed pull request #13378: [DO NOT MERGE] Testing subrepo by branch
URL: https://github.com/apache/incubator-mxnet/pull/13378
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.gitmodules b/.gitmodules
index 836d824a6f5..a1002e8994f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,12 +20,13 @@
 	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
+	branch = 1.8.0
diff --git a/3rdparty/cub b/3rdparty/cub
deleted file mode 160000
index 05eb57faa0a..00000000000
--- a/3rdparty/cub
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 05eb57faa0a4cac37c2a86fdf4b4dc865a95a1a3
diff --git a/3rdparty/nvidia_cub b/3rdparty/nvidia_cub
new file mode 160000
index 00000000000..c3cceac115c
--- /dev/null
+++ b/3rdparty/nvidia_cub
@@ -0,0 +1 @@
+Subproject commit c3cceac115c072fb63df1836ff46d8c60d9eb304
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b8bbd2e027..1fdb88d2617 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,7 +312,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")
@@ -494,7 +494,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 a8b57e58376..39fdc8e3894 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 16ea59f3d58..ed5fa6c4a11 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)


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services