This is an automated email from the ASF dual-hosted git repository. cjolivier01 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 40da6cc Removed MXNET_USE_MKLDNN definition when option USE_MKLDNN is disabled (#9923) 40da6cc is described below commit 40da6ccd2775ebe08683518c866bcb2fec467347 Author: Anton Chernov <mecher...@gmail.com> AuthorDate: Thu Mar 1 16:22:17 2018 +0100 Removed MXNET_USE_MKLDNN definition when option USE_MKLDNN is disabled (#9923) * Removed MXNET_USE_MKLDNN definition when option USE_MKLDNN is disabled * Fixed accidential endif directive removing --- CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d229cb0..7f68ed2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,13 +156,19 @@ if(USE_MKL_IF_AVAILABLE) else() find_package(MKL) endif() + if(MKL_FOUND) include_directories(${MKL_INCLUDE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/operator/mkl) - add_definitions(-DMXNET_USE_MKLDNN=1) + + if(USE_MKLDNN) + add_definitions(-DMXNET_USE_MKLDNN=1) + endif() + add_definitions(-DUSE_MKL=1) add_definitions(-DCUB_MKL=1) list(APPEND mxnet_LINKER_LIBS ${MKL_LIBRARIES}) + if(NOT MSVC) list(APPEND mxnet_LINKER_LIBS dl) endif() -- To stop receiving notification emails like this one, please contact cjolivie...@apache.org.