szha closed pull request #13775: Fix USE_MKLDNN check in Makefile URL: https://github.com/apache/incubator-mxnet/pull/13775
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/Makefile b/Makefile index 56f2537d68f..51914c4e2e5 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 03f438db89d..8a1aa2c165c 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 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
