You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by wk...@apache.org on 2019/03/31 23:38:31 UTC
[incubator-mxnet] branch master updated: Change CUB submodule to
track Nvidia CUB project. (#13322)
This is an automated email from the ASF dual-hosted git repository.
wkcn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new b6eac1d Change CUB submodule to track Nvidia CUB project. (#13322)
b6eac1d is described below
commit b6eac1da01d4ad4c260f0576860148ad11444054
Author: Frank Liu <fr...@gmail.com>
AuthorDate: Sun Mar 31 16:38:15 2019 -0700
Change CUB submodule to track Nvidia CUB project. (#13322)
* Change CUB submodule to track Nvidia CUB project.
Directly change submodule URL will impact every developer.
"git submodule update" won't work, developer has to use
"git submodule sync" first.
* retrigger CI
---
.gitmodules | 6 +++---
3rdparty/cub | 1 -
3rdparty/nvidia_cub | 1 +
CMakeLists.txt | 4 ++--
LICENSE | 4 ++--
Makefile | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 836d824..e0ffec1 100644
--- a/.gitmodules
+++ b/.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
diff --git a/3rdparty/cub b/3rdparty/cub
deleted file mode 160000
index 05eb57f..0000000
--- 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 0000000..c3cceac
--- /dev/null
+++ b/3rdparty/nvidia_cub
@@ -0,0 +1 @@
+Subproject commit c3cceac115c072fb63df1836ff46d8c60d9eb304
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6299c0f..4e582ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -328,7 +328,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")
@@ -512,7 +512,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 b73ba37..72fe08f 100644
--- a/LICENSE
+++ b/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/cub/LICENSE.TXT
+ 4. CUB Library - For details, see, 3rdparty/nvidia_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/cub/test/mersenne.h
+ 5. CUB mersenne.h - For details, see 3rdparty/nvidia_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.
diff --git a/Makefile b/Makefile
index 8ca7080..43d212e 100644
--- a/Makefile
+++ b/Makefile
@@ -453,7 +453,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)