From f9ea60884b8e91c5a89c62f9742ffe65931c13e4 Mon Sep 17 00:00:00 2001 From: Yuxi Hu Date: Tue, 5 Mar 2019 16:51:48 -0800 Subject: [PATCH 1/2] add MKLDNN headers to pip package --- 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 1edefa026ebc..dd48098c6504 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 f5f9545619bf..966264334179 100644 --- a/tools/pip/setup.py +++ b/tools/pip/setup.py @@ -97,6 +97,8 @@ def has_ext_modules(self): os.path.join(CURRENT_DIR, 'mxnet/include/mshadow')) shutil.copytree(os.path.join(CURRENT_DIR, 'mxnet-build/3rdparty/tvm/nnvm/include/nnvm'), os.path.join(CURRENT_DIR, 'mxnet/include/nnvm')) +shutil.copytree(os.path.join(CURRENT_DIR, 'mxnet-build/3rdparty/mkldnn/include'), + os.path.join(CURRENT_DIR, 'mxnet/include/mkldnn')) package_name = 'mxnet' From 91e6af76027e50b2258e2458f8506fb70ed1e2e1 Mon Sep 17 00:00:00 2001 From: Yuxi Hu Date: Tue, 5 Mar 2019 22:27:35 -0800 Subject: [PATCH 2/2] only add headers for mkl packages --- tools/pip/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/pip/setup.py b/tools/pip/setup.py index 966264334179..c9134d51e200 100644 --- a/tools/pip/setup.py +++ b/tools/pip/setup.py @@ -97,8 +97,6 @@ def has_ext_modules(self): os.path.join(CURRENT_DIR, 'mxnet/include/mshadow')) shutil.copytree(os.path.join(CURRENT_DIR, 'mxnet-build/3rdparty/tvm/nnvm/include/nnvm'), os.path.join(CURRENT_DIR, 'mxnet/include/nnvm')) -shutil.copytree(os.path.join(CURRENT_DIR, 'mxnet-build/3rdparty/mkldnn/include'), - os.path.join(CURRENT_DIR, 'mxnet/include/mkldnn')) package_name = 'mxnet' @@ -157,6 +155,8 @@ def has_ext_modules(self): 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'))