Fixed mshadow MKL/MKLML finding

apache · Aug 8, 2018 · 394baac · 394baac
1 parent d84854c
commit 394baac
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/cmake/ChooseBLAS.cmake b/cmake/ChooseBLAS.cmake
@@ -123,10 +123,10 @@ function(try_mklml)
 
   include(${CMAKE_CURRENT_LIST_DIR}/DownloadMKLML.cmake)
   find_package(MKLML REQUIRED)
-  include_directories(SYSTEM ${MKLML_INCLUDE_DIRS})
-  set(mxnet_LINKER_LIBS ${mxnet_LINKER_LIBS} ${MKLML_LIBRARIES} PARENT_SCOPE)
+  include_directories(SYSTEM ${MKL_INCLUDE_DIRS})
+  set(mxnet_LINKER_LIBS ${mxnet_LINKER_LIBS} ${MKL_LIBRARIES} PARENT_SCOPE)
 
-  set(MKL_FOUND ${MKLML_FOUND} PARENT_SCOPE)
+  set(MKL_FOUND ${MKL_FOUND} PARENT_SCOPE)
   set(MKLROOT ${MKLROOT} PARENT_SCOPE)
 
   set(BLAS MKL PARENT_SCOPE)

diff --git a/cmake/Modules/FindMKL.cmake b/cmake/Modules/FindMKL.cmake
@@ -32,6 +32,10 @@
 #   MKL_LIBRARIES        : the libraries to link against.
 #
 
+if(MKL_FOUND)
+  return()
+endif()
+
 if($ENV{MKLROOT})
   file(TO_CMAKE_PATH "$ENV{MKLROOT}" MKLROOT)
   message(STATUS "MKLROOT=${MKLROOT}")

diff --git a/cmake/Modules/FindMKLML.cmake b/cmake/Modules/FindMKLML.cmake
@@ -23,9 +23,13 @@
 #
 # The following are set after configuration is done:
 #
-# MKLML_FOUND
-# MKLML_INCLUDE_DIRS
-# MKLML_LIBRARIES
+# MKL_FOUND
+# MKL_INCLUDE_DIRS
+# MKL_LIBRARIES
+
+if(MKL_FOUND)
+  return()
+endif()
 
 if($ENV{MKLROOT})
   file(TO_CMAKE_PATH "$ENV{MKLROOT}" MKLROOT)
@@ -96,7 +100,8 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(MKLML DEFAULT_MSG ${LOOKED_FOR})
 
 if(MKLML_FOUND)
-  set(MKLML_INCLUDE_DIRS "${MKLML_INCLUDE_DIR}")
+  set(MKL_FOUND ${MKLML_FOUND})
+  set(MKL_INCLUDE_DIRS "${MKLML_INCLUDE_DIR}")
 
   mark_as_advanced(${LOOKED_FOR})