diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-29 12:41:02 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-29 08:41:13 -0400 |
| commit | c2dd240f0072d3f0aa36c33507ad52d2d2d64980 (patch) | |
| tree | 6181584fa370aa2d141ff33a36ea02802ee19f88 | |
| parent | 272bbda602138ca3a1420e77ce9e342315489b74 (diff) | |
| parent | 069a5c3188e76aa26a22bbf1ec9d27a803813124 (diff) | |
| download | cmake-c2dd240f0072d3f0aa36c33507ad52d2d2d64980.tar.gz | |
Merge topic 'SCS_mp'
069a5c3188 FindLAPACK: SCSL also has LAPACK routines
dbcc5eaa05 FindBLAS: Update SCSL library
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6402
| -rw-r--r-- | Modules/FindBLAS.cmake | 14 | ||||
| -rw-r--r-- | Modules/FindLAPACK.cmake | 24 |
2 files changed, 35 insertions, 3 deletions
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index 2ea6d984e1..a44af4d2a4 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -151,7 +151,7 @@ BLAS/LAPACK Vendors ``PhiPACK`` Portable High Performance ANSI C (PHiPAC) -``SCSL`` +``SCSL``, ``SCSL_mp`` Scientific Computing Software Library ``SGIMATH`` @@ -863,19 +863,27 @@ if(BLA_VENDOR STREQUAL "SunPerf" OR BLA_VENDOR STREQUAL "All") endif() # BLAS in SCSL library? (SGI/Cray Scientific Library) -if(BLA_VENDOR STREQUAL "SCSL" OR BLA_VENDOR STREQUAL "All") +if(BLA_VENDOR MATCHES "SCSL" OR BLA_VENDOR STREQUAL "All") + set(_blas_scsl_lib "scs") + + if(BLA_VENDOR MATCHES "_mp") + set(_blas_scsl_lib "${_blas_scsl_lib}_mp") + endif() + if(NOT BLAS_LIBRARIES) check_blas_libraries( BLAS_LIBRARIES BLAS sgemm "" - "scsl" + "${_blas_scsl_lib}" "" "" "" ) endif() + + unset(_blas_scsl_lib) endif() # BLAS in SGIMATH library? diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake index d70453be02..f36acfdb56 100644 --- a/Modules/FindLAPACK.cmake +++ b/Modules/FindLAPACK.cmake @@ -491,6 +491,30 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE) ) endif() + # LAPACK in SCSL library? (SGI/Cray Scientific Library) + if(NOT LAPACK_LIBRARIES + AND (BLA_VENDOR MATCHES "SCSL" OR BLA_VENDOR STREQUAL "All")) + set(_lapack_scsl_lib "scs") + + # Check for OpenMP support, VIA BLA_VENDOR of scs_mp + if(BLA_VENDOR MATCHES "_mp") + set(_lapack_scsl_lib "${_lapack_scsl_lib}_mp") + endif() + + check_lapack_libraries( + LAPACK_LIBRARIES + LAPACK + cheev + "" + "${_lapack_scsl_lib}" + "" + "" + "" + "${BLAS_LIBRARIES}" + ) + unset(_lapack_scsl_lib) + endif() + # BLAS in acml library? if(BLA_VENDOR MATCHES "ACML" OR BLA_VENDOR STREQUAL "All") if(BLAS_LIBRARIES MATCHES ".+acml.+") |