Skip to content

Commit

Permalink
Fix USE_MKLDNN check in Makefile (apache#13775)
Browse files Browse the repository at this point in the history
* fix makefile

* change make/config.mk

* add comments

* retrigger ci
  • Loading branch information
TaoLv authored and haohuw committed Jun 23, 2019
1 parent 0ac0f70 commit 057982e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions make/config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 057982e

Please sign in to comment.