Updates will be applied on October 27th between 12pm - 12:45pm EDT (UTC-0400). Gitlab may be slow during the maintenance window.

Commit 8b63265e authored by Jakub Benda's avatar Jakub Benda
Browse files

FindLAPACK: Unify internal variables related to MKL

Auxiliary internal variables related to MKL are now consistently
prefixed with LAPACK_mkl_ and unset at the end of the MKL section.
parent ede1715c
...@@ -178,7 +178,7 @@ if(BLAS_FOUND) ...@@ -178,7 +178,7 @@ if(BLAS_FOUND)
#intel lapack #intel lapack
if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
if (NOT WIN32) if (NOT WIN32)
set(LM "-lm") set(LAPACK_mkl_LM "-lm")
endif () endif ()
if (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED) if (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED)
if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED) if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
...@@ -188,9 +188,9 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") ...@@ -188,9 +188,9 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
endif() endif()
if (BLA_VENDOR MATCHES "_64ilp") if (BLA_VENDOR MATCHES "_64ilp")
set(BLAS_mkl_ILP_MODE "ilp64") set(LAPACK_mkl_ILP_MODE "ilp64")
else () else ()
set(BLAS_mkl_ILP_MODE "lp64") set(LAPACK_mkl_ILP_MODE "lp64")
endif () endif ()
set(LAPACK_SEARCH_LIBS "") set(LAPACK_SEARCH_LIBS "")
...@@ -207,7 +207,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") ...@@ -207,7 +207,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
list(APPEND LAPACK_SEARCH_LIBS list(APPEND LAPACK_SEARCH_LIBS
"mkl_intel_c") "mkl_intel_c")
list(APPEND LAPACK_SEARCH_LIBS list(APPEND LAPACK_SEARCH_LIBS
"mkl_lapack95_${BLAS_mkl_ILP_MODE}") "mkl_lapack95_${LAPACK_mkl_ILP_MODE}")
else() else()
set(LAPACK_mkl_SEARCH_SYMBOL "cheev") set(LAPACK_mkl_SEARCH_SYMBOL "cheev")
set(_LIBRARIES LAPACK_LIBRARIES) set(_LIBRARIES LAPACK_LIBRARIES)
...@@ -222,7 +222,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") ...@@ -222,7 +222,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
if (NOT ${_LIBRARIES}) if (NOT ${_LIBRARIES})
check_lapack_libraries( check_lapack_libraries(
${_LIBRARIES} ${_LIBRARIES}
BLAS LAPACK
${LAPACK_mkl_SEARCH_SYMBOL} ${LAPACK_mkl_SEARCH_SYMBOL}
"" ""
"" ""
...@@ -235,17 +235,19 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") ...@@ -235,17 +235,19 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
if (NOT ${_LIBRARIES}) if (NOT ${_LIBRARIES})
check_lapack_libraries( check_lapack_libraries(
${_LIBRARIES} ${_LIBRARIES}
BLAS LAPACK
${LAPACK_mkl_SEARCH_SYMBOL} ${LAPACK_mkl_SEARCH_SYMBOL}
"" ""
"${IT}" "${IT}"
"${_BLAS_LIBRARIES}" "${_BLAS_LIBRARIES}"
"${CMAKE_THREAD_LIBS_INIT};${LM}" "${CMAKE_THREAD_LIBS_INIT};${LAPACK_mkl_LM}"
) )
endif () endif ()
endforeach () endforeach ()
unset(BLAS_mkl_ILP_MODE) unset(LAPACK_mkl_ILP_MODE)
unset(LAPACK_mkl_SEARCH_SYMBOL)
unset(LAPACK_mkl_LM)
endif () endif ()
endif() endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment