Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
Change CUB submodule to track Nvidia CUB project.
Browse files Browse the repository at this point in the history
Directly change submodule URL will impact every developer.
"git submodule update" won't work, developer has to use
"git submodule sync" first.

To avoid impact every developer, remove CUB and add a new
"nvidia_cub" to workaround this issue.
  • Loading branch information
frankfliu committed Nov 19, 2018
1 parent 5a83b6b commit 677ba9b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 677ba9b

Please sign in to comment.