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

fixed config.mk and Makefile bugs for installing mkl #15424

Merged
merged 2 commits into from
Jul 19, 2019
Merged

fixed config.mk and Makefile bugs for installing mkl #15424

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7939d3
fixed config.mk and Makefile bugs for installing mkl
Jul 1, 2019
4d7589b
remove comments from the previous changes
Jul 16, 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
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,13 @@ ifeq ($(USE_CUDNN), 1)
LDFLAGS += -lcudnn
endif

ifeq ($(use_blas), open)
ifeq ($(USE_BLAS), open)
CFLAGS += -DMXNET_USE_BLAS_OPEN=1
else ifeq ($(use_blas), atlas)
else ifeq ($(USE_BLAS), atlas)
CFLAGS += -DMXNET_USE_BLAS_ATLAS=1
else ifeq ($(use_blas), mkl)
else ifeq ($(USE_BLAS), mkl)
CFLAGS += -DMXNET_USE_BLAS_MKL=1
else ifeq ($(use_blas), apple)
else ifeq ($(USE_BLAS), apple)
CFLAGS += -DMXNET_USE_BLAS_APPLE=1
endif

Expand Down
2 changes: 2 additions & 0 deletions make/config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ USE_LAPACK_PATH =
USE_INTEL_PATH = NONE

# If use MKL only for BLAS, choose static link automatically to allow python wrapper
# Please Note: You have to set USE_BLAS = mkl here if you want to build mxnet with mkl correctly. Otherwise USE_STATIC_MKL will be set to NONE.
# USE_BLAS = mkl
ifeq ($(USE_BLAS), mkl)
USE_STATIC_MKL = 1
else
Expand Down