Skip to content

Commit

Permalink
Change CUB submodule to track Nvidia CUB project. (apache#13322)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
frankfliu authored and wkcn committed Mar 31, 2019
1 parent 4075212 commit b6eac1d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion 3rdparty/cub
Submodule cub deleted from 05eb57
1 change: 1 addition & 0 deletions 3rdparty/nvidia_cub
Submodule nvidia_cub added at c3ccea
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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})
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b6eac1d

Please sign in to comment.