PR#2: Release 2.5.5 + switch back to flexiblas rhbz#2121388 - rpms/openmeeg

rpms / openmeeg

#2 Release 2.5.5 + switch back to flexiblas rhbz#2121388

Merged 2 years ago by sagitter. Opened 2 years ago by iucar.

rpms/ iucar/openmeeg rawhide into rawhide

Iñaki Úcar • 2 years ago

28efbe6

.gitignore

file modified

		`@@ -4,3 +4,4 @@`
		`/openmeeg-2.4.1.tar.gz`
		`/openmeeg-2.4.2.tar.gz`
		`/openmeeg-2.4.7.tar.gz`
		`+ /openmeeg-2.5.5.tar.gz`

openmeeg-use_builtin_find_blas_lapack.patch

file added

+43

		`@@ -0,0 +1,43 @@`
		`+ From 11b0270f45ff2d8eeee3c42524656a989545392e Mon Sep 17 00:00:00 2001`
		`+ From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>`
		`+ Date: Sun, 28 Aug 2022 12:57:45 +0200`
		`+ Subject: [PATCH] use built-in find blas/lapack`
		`+`
		`+ ---`
		`+ .../OpenMEEGMathsBlasLapackConfig.h \| 2 +-`
		`+ cmake/thirdParties.cmake \| 10 +++++++++-`
		`+ 2 files changed, 10 insertions(+), 2 deletions(-)`
		`+`
		`+ diff --git a/OpenMEEGMaths/include/BlasLapackImplementations/OpenMEEGMathsBlasLapackConfig.h b/OpenMEEGMaths/include/BlasLapackImplementations/OpenMEEGMathsBlasLapackConfig.h`
		`+ index 8293163..53c7252 100644`
		`+ --- a/OpenMEEGMaths/include/BlasLapackImplementations/OpenMEEGMathsBlasLapackConfig.h`
		`+ +++ b/OpenMEEGMaths/include/BlasLapackImplementations/OpenMEEGMathsBlasLapackConfig.h`
		`+ @@ -1,6 +1,6 @@`
		`+ #pragma once`
		`+`
		`+ -#include <BlasLapackImplementations/FortranCInterface.h>`
		`+ +#include <flexiblas/flexiblas_fortran_mangle.h>`
		`+`
		`+ #define CblasColMajor`
		`+ #define CblasTrans 'T'`
		`+ diff --git a/cmake/thirdParties.cmake b/cmake/thirdParties.cmake`
		`+ index 7076d7e..8126354 100644`
		`+ --- a/cmake/thirdParties.cmake`
		`+ +++ b/cmake/thirdParties.cmake`
		`+ @@ -1,4 +1,12 @@`
		`+ -include(FindBLASImplementation)`
		`+ +find_package(BLAS)`
		`+ +if (BLAS_FOUND)`
		`+ + set(HAVE_BLAS ON)`
		`+ +endif()`
		`+ +find_package(LAPACK)`
		`+ +if (LAPACK_FOUND)`
		`+ + set(HAVE_LAPACK ON)`
		`+ + set(USE_LAPACK ON)`
		`+ +endif()`
		`+`
		`+ if (BLA_STATIC)`
		`+ set(MATIO_USE_STATIC_LIBRARIES TRUE) # XXX This should be an option`
		`+ --`
		`+ 2.36.1`
		`+`

openmeeg.spec

file modified

+9 -9

		`@@ -11,8 +11,6 @@`

		`%bcond_with debug`

		`- %global blaslib openblas`
		`-`
		`# This package fails its testsuite with LTO. Disable LTO for now`
		`%define _lto_cflags %{nil}`

		`@@ -22,19 +20,20 @@`
		`#%%global relsuf rc4`

		`Name: openmeeg`
		`- Version: 2.4.7`
		`+ Version: 2.5.5`
		`Release: 1%{?dist}`
		`Summary: Low-frequency bio-electromagnetism solving forward problems in the field of EEG and MEG`
		`License: CeCILL-B`
		`URL: http://openmeeg.github.io/`
		`Source0: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz`
		`+ Patch0: %{name}-use_builtin_find_blas_lapack.patch`

		`BuildRequires: make`
		`BuildRequires: cmake3`
		`BuildRequires: gcc-c++, git, chrpath`
		`BuildRequires: gnuplot, wget, graphviz`
		`BuildRequires: expat-devel`
		`- BuildRequires: %{blaslib}-devel`
		`+ BuildRequires: flexiblas-devel`
		`%{?fedora:BuildRequires: gifticlib-devel}`
		`%{?fedora:BuildRequires: nifticlib-devel}`
		`BuildRequires: zlib-devel`
		`@@ -69,8 +68,6 @@`
		`-DCMAKE_SKIP_RPATH:BOOL=YES \\\`
		`-DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\`
		`-DCMAKE_INSTALL_INCLUDEDIR:PATH=include/%{name} \\\`
		`- -DBLA_IMPLEMENTATION:STRING=OpenBLAS \\\`
		`- -DBLAS_openblas_LIBRARY:FILEPATH=%{_libdir}/libopenblas.so \\\`
		`-DUSE_OMP:BOOL=ON \\\`
		`%if %{with python} \`
		`-DENABLE_PYTHON:BOOL=ON \\\`
		`@@ -139,15 +136,13 @@`
		`%endif`

		`%prep`
		`- %autosetup -n %{name}-%{version}`
		`+ %autosetup -p1 -n %{name}-%{version}`

		`%build`
		`%if %{with debug}`
		`export CXXFLAGS="-O0 -g -fPIC"`
		`export CFLAGS="-O0 -g -fPIC"`
		`%endif`
		`- export CXXFLAGS="%{build_cxxflags} -I%{_includedir}/%{blaslib}"`
		`- export CFLAGS="%{build_cflags} -I%{_includedir}/%{blaslib}"`
		`%cmake %{openmeeg_cmake_options}`
		`%cmake_build`

		`@@ -156,6 +151,7 @@`

		`%if %{with check}`
		`%check`
		`+ export FLEXIBLAS=netlib`
		`export LD_LIBRARY_PATH=%{buildroot}%{_libdir}`
		`export PYTHONPATH=%{buildroot}%{python3_sitearch}`
		`%if %{with debug}`
		`@@ -191,6 +187,10 @@`
		`%endif`

		`%changelog`
		`+ * Sun Aug 28 2022 Iñaki Úcar <iucar@fedoraproject.org> - 2.5.5-1`
		`+ - Release 2.5.5`
		`+ - Switch back to flexiblas rhbz#2121388`
		`+`
		`* Tue Jul 26 2022 Antonio Trande <sagitter@fedoraproject.org> - 2.4.7-1`
		`- Release 2.4.7`
		`- Disable vtk for rhbz#2104109`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (openmeeg-2.4.7.tar.gz) = 3de39e16bc3f5acc728bbf399e0853f44d2e6b39e46b2ff4745163086de09d7e17cb7dfe3a6d3e25daed10cdf91fbe60cf685af1d1e872968c4ae94ccef48eb5`
		`+ SHA512 (openmeeg-2.5.5.tar.gz) = 594f08c36d4b5f13b4f3963e895f3bb6fd37e53ce5940bd646c467f5fb20cdbfe776fcdea99ddd4397141c32ed5db10555f260978a422d60f72579eeb7627b77`

iucar commented 2 years ago

It should be noted upstream that they are doing too many things: cmake finds BLAS and LAPACK implementations just fine, including FlexiBLAS since v3.19.