[GitHub] cjolivier01 closed pull request #9923: Removed MXNET_USE_MKLDNN definition when option USE_MKLDNN is disabled

[GitBox <gi...@apache.org>]

cjolivier01 closed pull request #9923: Removed MXNET_USE_MKLDNN definition when option USE_MKLDNN is disabled
URL: https://github.com/apache/incubator-mxnet/pull/9923
 
 
   

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/CMakeLists.txt b/CMakeLists.txt
index d229cb0847d..7f68ed25c82 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()


 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services