From 970b18e9a5dca2c5bb6d1ecc79f3f9d1c727d641 Mon Sep 17 00:00:00 2001 From: Jakub Benda Date: Sun, 4 Nov 2018 17:08:15 +0000 Subject: FindBLAS: Correct symbol searched in BLAS95 wrapper The symbol "SGEMM", originally used to determine if a library provides Fortran 95 wrappers for BLAS, has been replaced by "sgemm_f95". "SGEMM" is provided by libmkl_intel_(i)lp64, which does not provide the generic Fortran 95 wrappers. Instead, libmkl_blas95_(i)lp does; one of the specializations of the type-generic interfaces contained in that library is "sgemm_f95". --- Modules/FindBLAS.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index e955bc2..efcf355 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -222,7 +222,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") set(BLAS_SEARCH_LIBS "") if(BLA_F95) - set(BLAS_mkl_SEARCH_SYMBOL SGEMM) + set(BLAS_mkl_SEARCH_SYMBOL sgemm_f95) set(_LIBRARIES BLAS95_LIBRARIES) if (WIN32) if (BLA_STATIC) -- cgit v0.12 From f1a3e4eca8310e8357a1fe0c0bfe75021952b874 Mon Sep 17 00:00:00 2001 From: Jakub Benda Date: Sun, 4 Nov 2018 17:16:32 +0000 Subject: FindLAPACK: Correct library name and symbol searched in LAPACK95 wrapper The symbol "CHEEV", originally used to determine if a library provides Fortran 95 wrappers for LAPACK, has been replaced by "cheev_f95". "CHEEV" is provided by libmkl_intel_(i)lp64, which does not provide the generic Fortran 95 wrappers. Instead, libmkl_lapack95_(i)lp64 does; one of the specializations of the type-generic interfaces contained in that library is "lapack_f95". Also, FindLAPACK used libmkl_intel_(i)lp64 instead of the correct libmkl_lapack95_(i)lp64 library for LAPACK95 functionality. This has been fixed, too. --- Modules/FindLAPACK.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake index 7ca9950..2c6145a 100644 --- a/Modules/FindLAPACK.cmake +++ b/Modules/FindLAPACK.cmake @@ -287,7 +287,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") set(LAPACK_SEARCH_LIBS "") if (BLA_F95) - set(LAPACK_mkl_SEARCH_SYMBOL "CHEEV") + set(LAPACK_mkl_SEARCH_SYMBOL "cheev_f95") set(_LIBRARIES LAPACK95_LIBRARIES) set(_BLAS_LIBRARIES ${BLAS95_LIBRARIES}) @@ -298,7 +298,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") list(APPEND LAPACK_SEARCH_LIBS "mkl_intel_c") list(APPEND LAPACK_SEARCH_LIBS - "mkl_intel_${BLAS_mkl_ILP_MODE}") + "mkl_lapack95_${BLAS_mkl_ILP_MODE}") else() set(LAPACK_mkl_SEARCH_SYMBOL "cheev") set(_LIBRARIES LAPACK_LIBRARIES) -- cgit v0.12