[GitHub] eric-haibin-lin closed pull request #10112: [MXNET-16] [DO NOT MERGE] Move submodules to 3rdparty

[GitBox <gi...@apache.org>]

eric-haibin-lin closed pull request #10112: [MXNET-16] [DO NOT MERGE] Move submodules to 3rdparty
URL: https://github.com/apache/incubator-mxnet/pull/10112
 
 
   

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 cdb8a553679..51d7d009197 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,7 +11,7 @@
 	path = nnvm
 	url = https://github.com/dmlc/nnvm
 [submodule "dlpack"]
-	path = dlpack
+	path = 3rdparty/dlpack
 	url = https://github.com/dmlc/dlpack
 [submodule "3rdparty/openmp"]
 	path = 3rdparty/openmp
diff --git a/dlpack b/3rdparty/dlpack
similarity index 100%
rename from dlpack
rename to 3rdparty/dlpack
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3a895583b4..d5df5a3c837 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -248,7 +248,7 @@ include_directories("3rdparty/cub")
 include_directories("nnvm/include")
 include_directories("nnvm/tvm/include")
 include_directories("dmlc-core/include")
-include_directories("dlpack/include")
+include_directories("3rdparty/dlpack/include")
 
 # commented out until PR goes through
 #if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/dlpack)
diff --git a/Makefile b/Makefile
index 862a40c3406..b404c86af47 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ ifndef NNVM_PATH
 endif
 
 ifndef DLPACK_PATH
-	DLPACK_PATH = $(ROOTDIR)/dlpack
+	DLPACK_PATH = $(ROOTDIR)/3rdparty/dlpack
 endif
 
 ifndef AMALGAMATION_PATH
diff --git a/amalgamation/Makefile b/amalgamation/Makefile
index bd9403e620c..effb3db751d 100644
--- a/amalgamation/Makefile
+++ b/amalgamation/Makefile
@@ -80,7 +80,7 @@ mxnet_predict0.d: mxnet_predict0.cc nnvm.d dmlc.d
 	${CXX} ${CFLAGS} -M -MT mxnet_predict0.o \
 	-I ${MXNET_ROOT}/ -I ${MXNET_ROOT}/mshadow/ -I ${MXNET_ROOT}/dmlc-core/include -I ${MXNET_ROOT}/dmlc-core/src \
 	-I ${MXNET_ROOT}/nnvm/include \
-	-I ${MXNET_ROOT}/dlpack/include \
+	-I ${MXNET_ROOT}/3rdparty/dlpack/include \
 	-I ${MXNET_ROOT}/include \
 	-D__MIN__=$(MIN) mxnet_predict0.cc > mxnet_predict0.d
 	cat dmlc.d >> mxnet_predict0.d
diff --git a/tools/license_header.py b/tools/license_header.py
index 14d3f587d93..039872dd44f 100755
--- a/tools/license_header.py
+++ b/tools/license_header.py
@@ -63,7 +63,7 @@
 _WHITE_LIST = ['R-package/',
                'cub/',
                'docker/Dockerfiles',
-               'dlpack/',
+               #'dlpack/',
                'dmlc-core/',
                'mshadow/',
                'nnvm',


 

----------------------------------------------------------------
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