diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-17 15:18:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-11-17 15:18:21 (GMT) |
| commit | 6e078505444faf3b140e9032ddfdd23d3d5e3fd6 (patch) | |
| tree | 6fd29c87259f71a9b1832f3b683031f8976cbe71 | |
| parent | 7dfeafaaaa15e0ff80e00cb875d4f037bf08b0aa (diff) | |
| parent | f5bc78263e15f07fc1fed15d970d7ecf9e84f7cc (diff) | |
| download | CMake-6e078505444faf3b140e9032ddfdd23d3d5e3fd6.zip CMake-6e078505444faf3b140e9032ddfdd23d3d5e3fd6.tar.gz CMake-6e078505444faf3b140e9032ddfdd23d3d5e3fd6.tar.bz2 | |
Merge topic 'blas-lapack-flame'
f5bc7826 Find{BLAS,LAPACK}: Add support for FLAME blis and libflame
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1486
| -rw-r--r-- | Help/release/dev/blas-lapack-flame.rst | 5 | ||||
| -rw-r--r-- | Modules/FindBLAS.cmake | 15 | ||||
| -rw-r--r-- | Modules/FindLAPACK.cmake | 15 |
3 files changed, 35 insertions, 0 deletions
diff --git a/Help/release/dev/blas-lapack-flame.rst b/Help/release/dev/blas-lapack-flame.rst new file mode 100644 index 0000000..fdc3a69 --- /dev/null +++ b/Help/release/dev/blas-lapack-flame.rst @@ -0,0 +1,5 @@ +blas-lapack-flame +----------------- + +* The :module:`FindBLAS` and :module:`FindLAPACK` modules learned to support + `FLAME <https://github.com/flame>`__ ``blis`` and ``libflame``. diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index 2684617..bb8b308 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -36,6 +36,7 @@ # # * Goto # * OpenBLAS +# * FLAME # * ATLAS PhiPACK # * CXML # * DXML @@ -190,6 +191,20 @@ if (BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All") endif() endif () +if (BLA_VENDOR STREQUAL "FLAME" OR BLA_VENDOR STREQUAL "All") + if(NOT BLAS_LIBRARIES) + # FLAME's blis library (https://github.com/flame/blis) + check_fortran_libraries( + BLAS_LIBRARIES + BLAS + sgemm + "" + "blis" + "" + ) + endif() +endif () + if (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All") if(NOT BLAS_LIBRARIES) # BLAS in ATLAS library? (http://math-atlas.sourceforge.net/) diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake index a451e6c..a3c87f8 100644 --- a/Modules/FindLAPACK.cmake +++ b/Modules/FindLAPACK.cmake @@ -37,6 +37,7 @@ # # * Intel(mkl) # * OpenBLAS +# * FLAME # * ACML # * Apple # * NAS @@ -201,6 +202,20 @@ if (BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All") endif() endif () +if (BLA_VENDOR STREQUAL "FLAME" OR BLA_VENDOR STREQUAL "All") + if(NOT LAPACK_LIBRARIES) + check_lapack_libraries( + LAPACK_LIBRARIES + LAPACK + cheev + "" + "flame" + "${BLAS_LIBRARIES}" + "" + ) + endif() +endif () + #acml lapack if (BLA_VENDOR MATCHES "ACML" OR BLA_VENDOR STREQUAL "All") if (BLAS_LIBRARIES MATCHES ".+acml.+") |