[incubator-mxnet] branch master updated: [MXNET-1110] Add header files required by horovod (#13062)

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

anirudh2290 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f55488  [MXNET-1110] Add header files required by horovod (#13062)
2f55488 is described below

commit 2f55488a446acadba02e0d8a6cb42edf47abe1d0
Author: Lin Yuan <ap...@gmail.com>
AuthorDate: Wed Dec 5 09:38:25 2018 -0800

    [MXNET-1110] Add header files required by horovod (#13062)
    
    * Add header files required by horovod
    
    * Add symbolic link and cherry picked required header
    
    * add python API to return include path
    
    * update link
    
    * fix windows CI
    
    * fix windows build
    
    * fix dlpack link
    
    * merge with master
    
    * exclude 3rd party header files from license check
    
    * exclude license check
    
    * exclude include directory
    
    * remove commented lines
---
 ci/build_windows.py                                 | 3 ---
 include/dlpack                                      | 1 +
 include/dmlc                                        | 1 +
 include/mshadow                                     | 1 +
 include/nnvm                                        | 1 +
 tests/nightly/apache_rat_license_check/rat-excludes | 1 +
 6 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ci/build_windows.py b/ci/build_windows.py
index 56769f7..b7d47fb 100755
--- a/ci/build_windows.py
+++ b/ci/build_windows.py
@@ -160,9 +160,6 @@ def windows_package(args):
         copy_tree('python', j(pkgdir, 'python'))
         logging.info('packing headers')
         copy_tree('include', j(pkgdir, 'include'))
-        copy_tree(j('3rdparty','dmlc-core','include'), j(pkgdir, 'include'))
-        copy_tree(j('3rdparty','mshadow', 'mshadow'), j(pkgdir, 'include', 'mshadow'))
-        copy_tree(j('3rdparty','tvm','nnvm', 'include'), j(pkgdir,'include', 'nnvm', 'include'))
         logging.info("Compressing package: %s", pkgfile)
         check_call(['7z', 'a', pkgfile, pkgdir])
 
diff --git a/include/dlpack b/include/dlpack
new file mode 120000
index 0000000..e19164b
--- /dev/null
+++ b/include/dlpack
@@ -0,0 +1 @@
+../3rdparty/dlpack/include/dlpack
\ No newline at end of file
diff --git a/include/dmlc b/include/dmlc
new file mode 120000
index 0000000..869c40b
--- /dev/null
+++ b/include/dmlc
@@ -0,0 +1 @@
+../3rdparty/dmlc-core/include/dmlc
\ No newline at end of file
diff --git a/include/mshadow b/include/mshadow
new file mode 120000
index 0000000..0ff1a4b
--- /dev/null
+++ b/include/mshadow
@@ -0,0 +1 @@
+../3rdparty/mshadow/mshadow
\ No newline at end of file
diff --git a/include/nnvm b/include/nnvm
new file mode 120000
index 0000000..779dd44
--- /dev/null
+++ b/include/nnvm
@@ -0,0 +1 @@
+../3rdparty/tvm/nnvm/include/nnvm
\ No newline at end of file
diff --git a/tests/nightly/apache_rat_license_check/rat-excludes b/tests/nightly/apache_rat_license_check/rat-excludes
index 0c305f4..0d95792 100755
--- a/tests/nightly/apache_rat_license_check/rat-excludes
+++ b/tests/nightly/apache_rat_license_check/rat-excludes
@@ -58,3 +58,4 @@ moderngpu/*
 deformable_im2col.cuh
 deformable_im2col.h
 REQUIRE
+include/*
\ No newline at end of file