From 41f28b47ab29f5b7aadd04a615648fd8b5d1f65b Mon Sep 17 00:00:00 2001 From: Iñaki Úcar Date: Aug 27 2020 15:03:55 +0000 Subject: https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager --- diff --git a/ceres-solver.spec b/ceres-solver.spec index c657a27..17b22f4 100644 --- a/ceres-solver.spec +++ b/ceres-solver.spec @@ -3,7 +3,7 @@ Version: 1.14.0 # Release candidate versions are messy. Give them a release of # e.g. "0.1.0%{?dist}" for RC1 (and remember to adjust the Source0 # URL). Non-RC releases go back to incrementing integers starting at 1. -Release: 5%{?dist} +Release: 6%{?dist} Summary: A non-linear least squares minimizer License: BSD @@ -13,6 +13,12 @@ Source0: http://%{name}.org/%{name}-%{version}.tar.gz # Partial backport of bbe790e0f3ba9e9565862067198d2760ab669ec8: fix possible out of bounds array access Patch2: ceres-solver_bounds.patch +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 +%global blaslib flexiblas +%else +%global blaslib openblas +%endif + %if 0%{?rhel} > 0 && 0%{?rhel} < 7 # Exclude ppc64 because suitesparse is not available on ppc64 # https://lists.fedoraproject.org/pipermail/epel-devel/2015-May/011193.html @@ -39,13 +45,8 @@ BuildRequires: suitesparse-devel >= 3.4.0-9 # If the suitesparse package was built with TBB then we need TBB too BuildRequires: tbb-devel -# Use atlas for BLAS -BuildRequires: openblas-srpm-macros -%ifarch %{openblas_arches} -BuildRequires: openblas-devel -%else -BuildRequires: atlas-devel -%endif +# Use FlexiBLAS or OpenBLAS for BLAS +BuildRequires: %{blaslib}-devel BuildRequires: gflags-devel >= 2.2.1 # Build against miniglog on RHEL6 until glog package is added to EPEL6 %if (0%{?rhel} != 06) @@ -99,9 +100,7 @@ developing applications that use %{name}. %build %cmake \ -DCXSPARSE_INCLUDE_DIR:PATH=%{_includedir}/suitesparse \ -%ifnarch %{openblas_arches} - -DBLAS_LIBRARIES:PATH=%{_libdir}/atlas/libsatlas.so \ -%endif + -DBLAS_LIBRARIES=-l%{blaslib} \ -DGFLAGS_INCLUDE_DIR=%{_includedir} %cmake_build @@ -133,6 +132,9 @@ CTEST_OUTPUT_ON_FAILURE=1 %ctest %changelog +* Thu Aug 27 2020 Iñaki Úcar - 1.14.0-6 +- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager + * Tue Jul 28 2020 Scott K Logan - 1.14.0-5 - Drop lapack-devel now that FindLAPACK supports BLAS correctly - Drop BLAS_LIBRARIES var when not using ATLAS