You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2017/11/30 04:32:41 UTC
[GitHub] piiswrong closed pull request #8878: Moved NVIDIA's cub module to 3rdparty directory
piiswrong closed pull request #8878: Moved NVIDIA's cub module to 3rdparty directory
URL: https://github.com/apache/incubator-mxnet/pull/8878
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 f9b2ab68f4..4ad3e407f9 100644
--- 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 b/3rdparty/cub
similarity index 100%
rename from cub
rename to 3rdparty/cub
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d8706181c..50f60089cf 100644
--- 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
index ceed645043..647ec6f504 100644
--- 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
----------------------------------------------------------------
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