From 73e452eb98ecea915164444a417b9c18a0a84e82 Mon Sep 17 00:00:00 2001
From: "Igor S. Gerasimov" <i.s.ger@ya.ru>
Date: Tue, 27 Jul 2021 20:15:10 +0300
Subject: FindBLAS: IBM ESSL 6.1 does not required BLAS lib

---
 Modules/FindBLAS.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 799d179..0d95723 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -893,7 +893,7 @@ if(BLA_VENDOR STREQUAL "SGIMATH" OR BLA_VENDOR STREQUAL "All")
   endif()
 endif()
 
-# BLAS in IBM ESSL library? (requires generic BLAS lib, too)
+# BLAS in IBM ESSL library?
 if(BLA_VENDOR STREQUAL "IBMESSL" OR BLA_VENDOR STREQUAL "All")
   if(NOT BLAS_LIBRARIES)
     check_blas_libraries(
@@ -901,7 +901,7 @@ if(BLA_VENDOR STREQUAL "IBMESSL" OR BLA_VENDOR STREQUAL "All")
       BLAS
       sgemm
       ""
-      "essl;blas"
+      "essl"
       ""
       ""
       ""
-- 
cgit v0.12


From ccb85f8943746fefac9f9e6f6e69e9074d243484 Mon Sep 17 00:00:00 2001
From: "Igor S. Gerasimov" <i.s.ger@ya.ru>
Date: Tue, 27 Jul 2021 20:22:30 +0300
Subject: FindBLAS: Add possibility to find OMP parallelized version of ESSL

---
 Modules/FindBLAS.cmake | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 0d95723..2ea6d98 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -109,7 +109,8 @@ BLAS/LAPACK Vendors
 ``Goto``
   GotoBLAS
 
-``IBMESSL``
+``IBMESSL``, ``IBMESSL_SMP``
+
   IBM Engineering and Scientific Subroutine Library
 
 ``Intel``
@@ -894,19 +895,26 @@ if(BLA_VENDOR STREQUAL "SGIMATH" OR BLA_VENDOR STREQUAL "All")
 endif()
 
 # BLAS in IBM ESSL library?
-if(BLA_VENDOR STREQUAL "IBMESSL" OR BLA_VENDOR STREQUAL "All")
+if(BLA_VENDOR MATCHES "IBMESSL" OR BLA_VENDOR STREQUAL "All")
+  set(_blas_essl_lib "essl")
+
+  if(BLA_VENDOR MATCHES "_SMP")
+    set(_blas_essl_lib "${_blas_essl_lib}smp")
+  endif()
   if(NOT BLAS_LIBRARIES)
     check_blas_libraries(
       BLAS_LIBRARIES
       BLAS
       sgemm
       ""
-      "essl"
+      "${_blas_essl_lib}"
       ""
       ""
       ""
       )
   endif()
+
+  unset(_blas_essl_lib)
 endif()
 
 # BLAS in acml library?
-- 
cgit v0.12


From 03913b12cb9ae48d81ec773a1c6b93ba5fd2ad5d Mon Sep 17 00:00:00 2001
From: "Igor S. Gerasimov" <i.s.ger@ya.ru>
Date: Tue, 27 Jul 2021 20:40:51 +0300
Subject: FindLAPACK: IBM ESSL 6.1 also has LAPACK routines

---
 Modules/FindLAPACK.cmake | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index aa5423a..d70453b 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -586,6 +586,30 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
     unset(_ssl2_suffix)
   endif()
 
+  # LAPACK in IBM ESSL library?
+  if(NOT LAPACK_LIBRARIES
+      AND (BLA_VENDOR MATCHES "IBMESSL" OR BLA_VENDOR STREQUAL "All"))
+    set(_lapack_essl_lib "essl")
+
+    # Check for OpenMP support, VIA BLA_VENDOR of esslsmp
+    if(BLA_VENDOR MATCHES "_SMP")
+      set(_lapack_essl_lib "${_lapack_essl_lib}smp")
+    endif()
+
+    check_lapack_libraries(
+      LAPACK_LIBRARIES
+      LAPACK
+      cheev
+      ""
+      "${_lapack_essl_lib}"
+      ""
+      ""
+      ""
+      "${BLAS_LIBRARIES}"
+    )
+    unset(_lapack_essl_lib)
+  endif()
+
   # NVHPC Library?
   if(NOT LAPACK_LIBRARIES
       AND (BLA_VENDOR MATCHES "NVHPC" OR BLA_VENDOR STREQUAL "All"))
-- 
cgit v0.12