From 4ad1e486f51c98818dce59f9140451717408dc50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 30 Sep 2020 13:00:27 +0200 Subject: [PATCH] Add patch to support FlexiBLAS --- cmake-3.18.3-findblas.patch | 69 +++++++++++++++++++++++++++++++++++++ cmake.spec | 3 ++ 2 files changed, 72 insertions(+) create mode 100644 cmake-3.18.3-findblas.patch diff --git a/cmake-3.18.3-findblas.patch b/cmake-3.18.3-findblas.patch new file mode 100644 index 0000000..94ab505 --- /dev/null +++ b/cmake-3.18.3-findblas.patch @@ -0,0 +1,69 @@ +diff -ur cmake-3.18.2.orig/Modules/FindBLAS.cmake cmake-3.18.2/Modules/FindBLAS.cmake +--- cmake-3.18.2.orig/Modules/FindBLAS.cmake 2020-08-20 14:20:32.000000000 +0200 ++++ cmake-3.18.2/Modules/FindBLAS.cmake 2020-09-14 19:36:13.952349073 +0200 +@@ -27,6 +27,7 @@ + possibilities. List of vendors valid in this module: + + * ``Goto`` ++ * ``FlexiBLAS`` + * ``OpenBLAS`` + * ``FLAME`` + * ``ATLAS PhiPACK`` +@@ -538,6 +539,22 @@ + "" + "" + "" ++ ) ++ endif() ++endif() ++ ++# FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/) ++if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All") ++ if(NOT BLAS_LIBRARIES) ++ check_blas_libraries( ++ BLAS_LIBRARIES ++ BLAS ++ sgemm ++ "" ++ "flexiblas" ++ "" ++ "" ++ "" + ) + endif() + endif() +diff -ur cmake-3.18.2.orig/Modules/FindLAPACK.cmake cmake-3.18.2/Modules/FindLAPACK.cmake +--- cmake-3.18.2.orig/Modules/FindLAPACK.cmake 2020-08-20 14:20:32.000000000 +0200 ++++ cmake-3.18.2/Modules/FindLAPACK.cmake 2020-09-14 19:38:43.204639078 +0200 +@@ -26,6 +26,7 @@ + If set, checks only the specified vendor, if not set checks all the + possibilities. List of vendors valid in this module: + ++ * ``FlexiBLAS`` + * ``OpenBLAS`` + * ``FLAME`` + * ``Intel10_32`` (intel mkl v10 32 bit) +@@ -349,6 +350,23 @@ + "" + "" + "" ++ "${BLAS_LIBRARIES}" ++ ) ++ endif() ++ endif() ++ ++ # FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/) ++ if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All") ++ if(NOT LAPACK_LIBRARIES) ++ check_lapack_libraries( ++ LAPACK_LIBRARIES ++ LAPACK ++ cheev ++ "" ++ "flexiblas" ++ "" ++ "" ++ "" + "${BLAS_LIBRARIES}" + ) + endif() diff --git a/cmake.spec b/cmake.spec index 60c6e8a..a4c0098 100644 --- a/cmake.spec +++ b/cmake.spec @@ -101,6 +101,8 @@ Patch101: %{name}-fedora-flag_release.patch # Add dl to CMAKE_DL_LIBS on MINGW # https://gitlab.kitware.com/cmake/cmake/issues/17600 Patch102: %{name}-mingw-dl.patch +# rhbz#1871346 +Patch103: %{name}-3.18.3-findblas.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -510,6 +512,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake * Wed Sep 30 12:49:57 CEST 2020 Björn Esser - 3.18.3-1 - Update to 3.18.3 - Explicitly require make +- Add patch to support FlexiBLAS * Tue Sep 29 2020 Christoph Junghans - 3.18.2-2 - Make %ctest non-verbose by default