From a6abf75f1e3d1a8b296b197d308cd6133ebe85a9 Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Thu, 14 May 2020 22:55:47 -0700 Subject: [PATCH] cherry-pick: Fix missing MKLDNN headers (#18310) --- tools/pip/setup.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/pip/setup.py b/tools/pip/setup.py index d01051713f2f..e5142c72c1b9 100644 --- a/tools/pip/setup.py +++ b/tools/pip/setup.py @@ -156,10 +156,9 @@ def skip_markdown_comments(md): package_data = {'mxnet': [os.path.join('mxnet', os.path.basename(LIB_PATH[0]))], 'dmlc_tracker': []} -if variant.endswith('MKL'): - if platform.system() == 'Darwin': - shutil.copytree(os.path.join(CURRENT_DIR, 'mxnet-build/3rdparty/mkldnn/build/install/include'), - os.path.join(CURRENT_DIR, 'mxnet/include/mkldnn')) +if variant != 'native': + shutil.copytree(os.path.join(CURRENT_DIR, 'mxnet-build/3rdparty/mkldnn/build/install/include'), + os.path.join(CURRENT_DIR, 'mxnet/include/mkldnn')) if platform.system() == 'Linux': libdir, mxdir = os.path.dirname(LIB_PATH[0]), os.path.join(CURRENT_DIR, 'mxnet') if os.path.exists(os.path.join(libdir, 'libgfortran.so.3')):