[incubator-mxnet] branch master updated: Add MKLDNN headers to pip package (#14339)

[zh...@apache.org]

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

zhasheng 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 efb8823  Add MKLDNN headers to pip package (#14339)
efb8823 is described below

commit efb8823c89b89bf39e9edfb1d1efb1ec152d12ae
Author: Yuxi Hu <da...@gmail.com>
AuthorDate: Wed Mar 6 18:08:14 2019 -0800

    Add MKLDNN headers to pip package (#14339)
    
    * add MKLDNN headers to pip package
    
    * only add headers for mkl packages
---
 tools/pip/MANIFEST.in | 1 +
 tools/pip/setup.py    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/tools/pip/MANIFEST.in b/tools/pip/MANIFEST.in
index 1edefa0..dd48098 100644
--- a/tools/pip/MANIFEST.in
+++ b/tools/pip/MANIFEST.in
@@ -27,5 +27,6 @@ recursive-include mxnet *.so.*
 recursive-include mxnet *.dylib
 recursive-include mxnet *_LICENSE
 recursive-include mxnet *.h
+recursive-include mxnet *.hpp
 recursive-include mxnet *.cuh
 recursive-include dmlc_tracker *.py
diff --git a/tools/pip/setup.py b/tools/pip/setup.py
index f5f9545..c9134d5 100644
--- a/tools/pip/setup.py
+++ b/tools/pip/setup.py
@@ -155,6 +155,8 @@ if variant.endswith('MKL'):
         package_data['mxnet'].append('mxnet/libiomp5.so')
         package_data['mxnet'].append('mxnet/libmkldnn.so.0')
     shutil.copy(os.path.join(os.path.dirname(LIB_PATH[0]), '../MKLML_LICENSE'), os.path.join(CURRENT_DIR, 'mxnet'))
+    shutil.copytree(os.path.join(CURRENT_DIR, 'mxnet-build/3rdparty/mkldnn/include'),
+                    os.path.join(CURRENT_DIR, 'mxnet/include/mkldnn'))
     package_data['mxnet'].append('mxnet/MKLML_LICENSE')
 if platform.system() == 'Linux':
     shutil.copy(os.path.join(os.path.dirname(LIB_PATH[0]), 'libgfortran.so.3'), os.path.join(CURRENT_DIR, 'mxnet'))