#2 Switch back to flexiblas rhbz#2121389
Closed a year ago by iucar. Opened 2 years ago by iucar.
rpms/ iucar/freefem++ rawhide  into  rawhide

file modified
+9 -8
@@ -24,7 +24,7 @@ 

  Summary: PDE solving tool

  Name: freefem++

  Version: %{expand:%(echo %tarvers | tr - .)}

- Release: 4%{?dist}

+ Release: 5%{?dist}

  URL: https://freefem.org

  Source0: https://github.com/FreeFem/FreeFem-sources/archive/v%{tarvers}.tar.gz#/%{tarname}-%{tarvers}.tar.gz

  
@@ -112,7 +112,6 @@ 

  BuildRequires:	gmm-devel

  BuildRequires:	fftw-devel

  BuildRequires:	hdf5-devel

- BuildRequires:	lapack-devel

  BuildRequires:	metis-devel

  # mmg's packaging is a mess

  BuildRequires:	mmg-devel mmg2d-devel mmgs-devel mmg3d-devel
@@ -143,10 +142,9 @@ 

  BuildRequires:	/etc/profile.d/modules.sh

  BuildRequires:	openmpi-devel

  BuildRequires:	arpack-devel

- BuildRequires:	openblas-devel

+ BuildRequires:	flexiblas-devel

  BuildRequires:	fftw-devel

  BuildRequires:	hdf5-devel

- BuildRequires:	lapack-devel

  BuildRequires:	suitesparse-devel

  BuildRequires:	SuperLU-devel

  
@@ -174,10 +172,9 @@ 

  BuildRequires:	/etc/profile.d/modules.sh

  BuildRequires:	mpich-devel

  BuildRequires:	arpack-devel

- BuildRequires:	openblas-devel

+ BuildRequires:	flexiblas-devel

  BuildRequires:	fftw-devel

  BuildRequires:	hdf5-devel

- BuildRequires:	lapack-devel

  BuildRequires:	suitesparse-devel

  BuildRequires:	SuperLU-devel

  
@@ -229,6 +226,7 @@ 

  # Bogus permissions

  find . -type f -perm 755 \( -name "*.c*" -o -name "*.h*" -o -name "*.edp" -o -name "*.idp" \) | xargs chmod 644

  

+ sed -i 's/-llapack/-lflexiblas/' configure.ac

  autoreconf -vif

  

  mkdir -p 3rdparty/pkg
@@ -265,7 +263,7 @@ 

  	--enable-boost \

  	--disable-mmg3d \

  	--disable-parmetis --disable-parmmg \

- 	--with-blas="-L%{_libdir} -lopenblas" \

+ 	--with-blas="-lflexiblas" \

  	--without-cadna \

  	--with-mpi=no \

  	--docdir=%{_pkgdocdir} \
@@ -297,7 +295,7 @@ 

  	--enable-boost \

  	--disable-mmg3d \

  	--disable-parmetis --disable-parmmg \

- 	--with-blas="-L%{_libdir} -lopenblas" \

+ 	--with-blas="-lflexiblas" \

  	--without-cadna \

  	--with-mpi=yes \

  	--docdir=%{_pkgdocdir} \
@@ -388,6 +386,9 @@ 

  %endif

  

  %changelog

+ * Thu Aug 25 2022 Iñaki Úcar <iucar@fedoraproject.org> - 4.11-5

+ - Switch back to flexiblas rhbz#2121389

+ 

  * Tue Aug 23 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.11-4

  - Rebuild for gsl-2.7.1

  

The CI will confirm this, but here's a successful scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=91253729. This works ok and all tests pass. So as I said in the list, unless I'm missing something, please merge this into F36 and F37 too.

rebased onto 7bca44e

2 years ago

rebased onto 8c790b2

2 years ago

After this rebase, I see in the Fedora CI scratch build:

$ curl -s https://kojipkgs.fedoraproject.org//work/tasks/4349/91264349/build.log | grep "++ add"
configure:     ++ add f77 :  -L/usr/lib/gcc/x86_64-redhat-linux/12 -L/usr/lib/gcc/x86_64-redhat-linux/12/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/12/../../.. -lgfortran -lm -lquadmath ;  -DAdd_   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add fc :  -L/usr/lib/gcc/x86_64-redhat-linux/12 -L/usr/lib/gcc/x86_64-redhat-linux/12/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/12/../../.. -lgfortran -lm -lquadmath ;  -DAdd_   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add pthread : -lpthread ;   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add cxx11 : -std=c++14 ;  -std=c++14 in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add fftw3 : -lfftw3 ;   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add blas : -lflexiblas ;   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add arpack : -larpack -lflexiblas ;   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add lapack : -lflexiblas ;   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add amd : -lumfpack  -lamd -lcholmod -lcolamd ;  -I/usr/include/suitesparse in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add umfpack : -lumfpack  -lamd -lcholmod -lcolamd ;  -I/usr/include/suitesparse in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add gsl : -lgsl -lgslcblas -lm ;  -I/usr/include in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add hdf5 : -L/usr/lib64   -lm -ldl -lz -lsz -lhdf5_hl  -lhdf5 -lhdf5_hl ;  -I/usr/include in  plugin/seq/WHERE_LIBRARY-config "
eval ./ff-c++ addNewType.cpp
configure:     ++ add f77 :  -L/usr/lib/gcc/x86_64-redhat-linux/12 -L/usr/lib/gcc/x86_64-redhat-linux/12/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/12/../../.. -lgfortran -lm -lquadmath ;  -DAdd_   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add fc :  -L/usr/lib/gcc/x86_64-redhat-linux/12 -L/usr/lib/gcc/x86_64-redhat-linux/12/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/12/../../.. -lgfortran -lm -lquadmath ;  -DAdd_   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add pthread : -lpthread ;   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add cxx11 : -std=c++14 ;  -std=c++14 in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add mpifc : -L/usr/lib64/mpich/lib -lmpifort -Wl,-rpath -Wl,/usr/lib64/mpich/lib -Wl,--enable-new-dtags -lmpi  ;  -I/usr/include/mpich-x86_64  in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add mpif77 : -L/usr/lib64/mpich/lib -lmpifort -Wl,-rpath -Wl,/usr/lib64/mpich/lib -Wl,--enable-new-dtags -lmpi  ;  -I/usr/include/mpich-x86_64  in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add mpi : -L/usr/lib64/mpich/lib -lmpicxx -Wl,-rpath -Wl,/usr/lib64/mpich/lib -Wl,--enable-new-dtags -lmpi  ;  -I/usr/include/mpich-x86_64  in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add petsc : -Wl,-rpath,/usr/lib -L/usr/lib  -lpetsc  -L/usr/lib64/mpich/lib -lHYPRE -lcmumps -ldmumps -lsmumps -lzmumps -lmumps_common -lpord -lscalapack -lsuperlu_dist -lflexiblas -lptscotch -lscotch -lptscotcherr -lscotcherr -lcgns -lhdf5 -lhdf5_hl -lmetis -lm -lX11 -lquadmath -lstdc++ -ldl -lmpich -lfmpich -lmpichf90 ;   -I/usr/include -I/usr/include/mpich-x86_64/petsc -I/usr/lib64/gfortran/modules/mpich/petsc -I/usr/include/mpich-x86_64/hypre -I/usr/include/mpich-x86_64/superlu_dist in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add metis :  -lmetis ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add ptscotch :  -L/usr/lib64/mpich/lib -lptscotch -lscotch -lptscotcherr -lscotcherr ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add scotch : -L/usr/lib64/mpich/lib  -lscotch  -lscotcherr ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add mumps :  -lcmumps -ldmumps -lsmumps -lzmumps -lmumps_common -lpord ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add scalapack :  -L/usr/lib64/mpich/lib -lscalapack ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add blaslapack :  -lflexiblas ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add fftw3 : -lfftw3 ;   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add lapack :  ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add blas : -lflexiblas ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add arpack : -larpack -lflexiblas ;   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add amd : -lumfpack  -lamd -lcholmod -lcolamd ;  -I/usr/include/suitesparse in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add umfpack : -lumfpack  -lamd -lcholmod -lcolamd ;  -I/usr/include/suitesparse in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add gsl : -lgsl -lgslcblas -lm ;  -I/usr/include in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add hdf5 : -L/usr/lib64   -lm -ldl -lz -lsz -lhdf5_hl  -lhdf5 -lhdf5_hl ;  -I/usr/include in  plugin/seq/WHERE_LIBRARY-config "
eval ./ff-c++ addNewType.cpp
configure:     ++ add f77 :  -L/usr/lib/gcc/x86_64-redhat-linux/12 -L/usr/lib/gcc/x86_64-redhat-linux/12/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/12/../../.. -lgfortran -lm -lquadmath ;  -DAdd_   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add fc :  -L/usr/lib/gcc/x86_64-redhat-linux/12 -L/usr/lib/gcc/x86_64-redhat-linux/12/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/12/../../.. -lgfortran -lm -lquadmath ;  -DAdd_   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add pthread : -lpthread ;   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add cxx11 : -std=c++14 ;  -std=c++14 in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add mpifc : -L/usr/lib64/openmpi/lib -Wl,-rpath -Wl,/usr/lib64/openmpi/lib -Wl,--enable-new-dtags -lmpi_usempif08 -lmpi_usempi_ignore_tkr -lmpi_mpifh -lmpi  ;  -I/usr/include/openmpi-x86_64  in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add mpif77 : -L/usr/lib64/openmpi/lib -Wl,-rpath -Wl,/usr/lib64/openmpi/lib -Wl,--enable-new-dtags -lmpi_usempif08 -lmpi_usempi_ignore_tkr -lmpi_mpifh -lmpi  ;  -I/usr/include/openmpi-x86_64  in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add mpi : -L/usr/lib64/openmpi/lib -Wl,-rpath -Wl,/usr/lib64/openmpi/lib -Wl,--enable-new-dtags -lmpi_cxx -lmpi  ;  -I/usr/include/openmpi-x86_64  in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add petsc : -Wl,-rpath,/usr/lib -L/usr/lib  -lpetsc  -L/usr/lib64/openmpi/lib -lHYPRE -lcmumps -ldmumps -lsmumps -lzmumps -lmumps_common -lpord -lscalapack -lsuperlu_dist -lflexiblas -lptscotch -lscotch -lptscotcherr -lscotcherr -lcgns -lhdf5 -lhdf5_hl -lmetis -lm -lX11 -lquadmath -lstdc++ -ldl -lmpi -lmpi_mpifh ;   -I/usr/include -I/usr/include/openmpi-x86_64/petsc -I/usr/lib64/gfortran/modules/openmpi/petsc -I/usr/include/openmpi-x86_64/hypre -I/usr/include/openmpi-x86_64/superlu_dist in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add metis :  -lmetis ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add ptscotch :  -L/usr/lib64/openmpi/lib -lptscotch -lscotch -lptscotcherr -lscotcherr ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add scotch : -L/usr/lib64/openmpi/lib  -lscotch  -lscotcherr ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add mumps :  -lcmumps -ldmumps -lsmumps -lzmumps -lmumps_common -lpord ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add scalapack :  -L/usr/lib64/openmpi/lib -lscalapack ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add blaslapack :  -lflexiblas ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add fftw3 : -lfftw3 ;   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add lapack :  ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add blas : -lflexiblas ;    in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add arpack : -larpack -lflexiblas ;   in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add amd : -lumfpack  -lamd -lcholmod -lcolamd ;  -I/usr/include/suitesparse in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add umfpack : -lumfpack  -lamd -lcholmod -lcolamd ;  -I/usr/include/suitesparse in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add gsl : -lgsl -lgslcblas -lm ;  -I/usr/include in  plugin/seq/WHERE_LIBRARY-config "
configure:     ++ add hdf5 : -L/usr/lib64   -lm -ldl -lz -lsz -lhdf5_hl  -lhdf5 -lhdf5_hl ;  -I/usr/include in  plugin/seq/WHERE_LIBRARY-config "
eval ./ff-c++ addNewType.cpp

which seems sane and comparable to what the build with openblas produces. This is the diff:

6,8c6,8
< configure:     ++ add blas : -L/usr/lib64 -lopenblas ;   in  plugin/seq/WHERE_LIBRARY-config "
< configure:     ++ add arpack : -larpack -llapack ;   in  plugin/seq/WHERE_LIBRARY-config "
< configure:     ++ add lapack : -L/usr/lib64 -lopenblas ;   in  plugin/seq/WHERE_LIBRARY-config "
---
> configure:     ++ add blas : -lflexiblas ;   in  plugin/seq/WHERE_LIBRARY-config "
> configure:     ++ add arpack : -larpack -lflexiblas ;   in  plugin/seq/WHERE_LIBRARY-config "
> configure:     ++ add lapack : -lflexiblas ;   in  plugin/seq/WHERE_LIBRARY-config "
31c31
< configure:     ++ add arpack : -larpack -llapack ;   in  plugin/seq/WHERE_LIBRARY-config "
---
> configure:     ++ add arpack : -larpack -lflexiblas ;   in  plugin/seq/WHERE_LIBRARY-config "
54c54
< configure:     ++ add arpack : -larpack -llapack ;   in  plugin/seq/WHERE_LIBRARY-config "
---
> configure:     ++ add arpack : -larpack -lflexiblas ;   in  plugin/seq/WHERE_LIBRARY-config "

Dear maintainer, we are one week away from the F37 beta release, and it would be great to have this fix by then.

Pull-Request has been closed by iucar

a year ago
Metadata