Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Fix USE_MKLDNN check in Makefile #13775

Merged
merged 4 commits into from
Jan 6, 2019
Merged

Fix USE_MKLDNN check in Makefile #13775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04bf132
fix makefile
TaoLv Jan 5, 2019
92774f8
change make/config.mk
TaoLv Jan 5, 2019
875d0b1
add comments
TaoLv Jan 5, 2019
89f1584
retrigger ci
TaoLv Jan 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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
View file
Open in desktop
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 =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does the right value miss?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we have different default behavior for different platforms at this time, we cannot have a proper default value for USE_MKLDNN here. So I leave it undefined.


# whether use NNPACK library
USE_NNPACK = 0
Expand Down