[incubator-mxnet] branch master updated: Fix USE_MKLDNN check in Makefile (#13775)

[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 17c8b25  Fix USE_MKLDNN check in Makefile (#13775)
17c8b25 is described below

commit 17c8b25367859818b7aa5ec5466472f96f8c82e1
Author: Tao Lv <ta...@intel.com>
AuthorDate: Mon Jan 7 04:04:38 2019 +0800

    Fix USE_MKLDNN check in Makefile (#13775)
    
    * fix makefile
    
    * change make/config.mk
    
    * add comments
    
    * retrigger ci
---
 Makefile       | 2 +-
 make/config.mk | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 56f2537..51914c4 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ endif
 # use customized config file
 include $(config)
 
-ifndef $(USE_MKLDNN)
+ifndef USE_MKLDNN
 ifneq ($(UNAME_S), Darwin)
 ifneq ($(UNAME_S), Windows)
 ifeq ($(UNAME_P), x86_64)
diff --git a/make/config.mk b/make/config.mk
index 03f438d..8a1aa2c 100644
--- a/make/config.mk
+++ b/make/config.mk
@@ -98,8 +98,10 @@ USE_LIBJPEG_TURBO_PATH = NONE
 # use openmp for parallelization
 USE_OPENMP = 1
 
-# whether use MKL-DNN library
-USE_MKLDNN = 0
+# whether use MKL-DNN library: 0 = disabled, 1 = enabled
+# if USE_MKLDNN is not defined, MKL-DNN will be enabled by default on x86 Linux.
+# you can disable it explicity with USE_MKLDNN = 0
+USE_MKLDNN =
 
 # whether use NNPACK library
 USE_NNPACK = 0