cherry-pick: Fix missing MKLDNN headers (apache#18310)

MoisesHer · Jun 23, 2020 · a6abf75 · a6abf75
1 parent 016023b
commit a6abf75
Showing 1 changed file with 3 additions and 4 deletions.
diff --git 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')):