rpms/cmake
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch to support FlexiBLAS

Browse Source
This commit is contained in:
Björn Esser 2020-09-30 13:00:27 +02:00
parent 372a70dc79
commit 4ad1e486f5
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
cmake-3.18.3-findblas.patch Normal file
View File

@ -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()

3
cmake.spec
View File

@ -101,6 +101,8 @@ Patch101: %{name}-fedora-flag_release.patch
# Add dl to CMAKE_DL_LIBS on MINGW # Add dl to CMAKE_DL_LIBS on MINGW
# https://gitlab.kitware.com/cmake/cmake/issues/17600 # https://gitlab.kitware.com/cmake/cmake/issues/17600
Patch102: %{name}-mingw-dl.patch Patch102: %{name}-mingw-dl.patch
# rhbz#1871346
Patch103: %{name}-3.18.3-findblas.patch
# Patch for renaming on EPEL # Patch for renaming on EPEL
%if 0%{?name_suffix:1} %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 <besser82@fedoraproject.org> - 3.18.3-1 * Wed Sep 30 12:49:57 CEST 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.3-1
- Update to 3.18.3 - Update to 3.18.3
- Explicitly require make - Explicitly require make
- Add patch to support FlexiBLAS
* Tue Sep 29 2020 Christoph Junghans <junghans@votca.org> - 3.18.2-2 * Tue Sep 29 2020 Christoph Junghans <junghans@votca.org> - 3.18.2-2
- Make %ctest non-verbose by default - Make %ctest non-verbose by default