Commit c2dd240f authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'SCS_mp'

069a5c31 FindLAPACK: SCSL also has LAPACK routines
dbcc5eaa

 FindBLAS: Update SCSL library
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !6402
parents 272bbda6 069a5c31
Pipeline #239964 canceled with stages
......@@ -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?
......
......@@ -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.+")
......
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