Moved cub to 3rdparty (#8878)

apache · Nov 30, 2017 · 0df7953 · 0df7953
1 parent 47a71a6
commit 0df7953
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -14,7 +14,7 @@
 	path = dlpack
 	url = https://github.com/dmlc/dlpack
 [submodule "cub"]
-	path = cub
+	path = 3rdparty/cub
 	url = https://github.com/dmlc/cub
 [submodule "3rdparty/openmp"]
 	path = 3rdparty/openmp

diff --git a/cub → 3rdparty/cub b/cub → 3rdparty/cub
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -187,7 +187,7 @@ endforeach()
 
 include_directories("include")
 include_directories("mshadow")
-include_directories("cub")
+include_directories("3rdparty/cub")
 include_directories("nnvm/include")
 include_directories("dmlc-core/include")
 include_directories("dlpack/include")

diff --git a/Makefile b/Makefile
@@ -327,7 +327,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)/cub
+	CFLAGS += -I$(ROOTDIR)/3rdparty/cub
 	ALL_DEP += $(CUOBJ) $(EXTRA_CUOBJ) $(PLUGIN_CUOBJ)
 	LDFLAGS += -lcuda -lcufft -lnvrtc
 	SCALA_PKG_PROFILE := $(SCALA_PKG_PROFILE)-gpu