Drop latest changes
This commit is contained in:
Antonio Trande
parent
cb66a31e64
commit
680bb229b8
56
petsc.spec
56
petsc.spec
@ -36,16 +36,13 @@
|
||||
|
||||
%if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 64
|
||||
%bcond_without arch64
|
||||
%bcond_without metis64
|
||||
%else
|
||||
%bcond_without metis
|
||||
%bcond_with arch64
|
||||
%endif
|
||||
|
||||
%bcond_without blas
|
||||
%if %{with arch64}
|
||||
%bcond_without blas64
|
||||
%bcond_without index64
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 9
|
||||
@ -63,11 +60,7 @@
|
||||
## Sundials needs mpi ?
|
||||
%bcond_with sundials_serial
|
||||
#
|
||||
%if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 32
|
||||
%bcond_without superlu
|
||||
# Needed superludist >= 6.3.0
|
||||
%bcond_without superludist >= 6.3.0
|
||||
%endif
|
||||
#
|
||||
|
||||
## Suitesparse
|
||||
@ -76,8 +69,19 @@
|
||||
%bcond_with suitesparse64
|
||||
#
|
||||
|
||||
## SuperLUDIST needs parmetis
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
%bcond_without superludist >= 6.3.0
|
||||
%bcond_without cgns
|
||||
%bcond_without hdf5
|
||||
%else
|
||||
# Needed superludist >= 6.3.0
|
||||
%bcond_with superludist
|
||||
## hdf5 is required by cgns
|
||||
## See rhbz#1904164
|
||||
%bcond_with cgns
|
||||
%bcond_with hdf5
|
||||
%endif
|
||||
%bcond_with superlumt
|
||||
#
|
||||
|
||||
@ -85,6 +89,13 @@
|
||||
%bcond_with tetgen
|
||||
#
|
||||
|
||||
## Metis
|
||||
%bcond_without metis
|
||||
%if 0%{?fedora} || 0%{?rhel} < 8
|
||||
%bcond_without metis64
|
||||
%endif
|
||||
#
|
||||
|
||||
# 'scalapack' is required by 'MUMPS'
|
||||
%if %{with openmpi}
|
||||
%bcond_without mpi
|
||||
@ -279,7 +290,7 @@
|
||||
Name: petsc
|
||||
Summary: Portable Extensible Toolkit for Scientific Computation
|
||||
Version: %{releasever}.4
|
||||
Release: 12%{?dist}
|
||||
Release: 13%{?dist}
|
||||
License: BSD
|
||||
URL: https://petsc.org/
|
||||
Source0: https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-with-docs-%{version}.tar.gz
|
||||
@ -575,16 +586,13 @@ pushd %{name}-%{version}
|
||||
rm $(grep -rl '/\* Generated by Cython')
|
||||
popd
|
||||
|
||||
pushd %{name}-%{version}
|
||||
%if %{with metis64}
|
||||
%patch4 -p1 -b .metis64
|
||||
%endif
|
||||
popd
|
||||
|
||||
%if %{with arch64}
|
||||
cp -a %{name}-%{version} build64
|
||||
pushd build64
|
||||
%patch1 -p0
|
||||
%if %{with metis64}
|
||||
%patch4 -p1 -b .metis64
|
||||
%endif
|
||||
popd
|
||||
%endif
|
||||
|
||||
@ -613,9 +621,7 @@ popd
|
||||
pushd %{name}-%{version}
|
||||
%configure --with-cc=gcc --with-cxx=g++ --with-fc=gfortran \
|
||||
%{petsc_build_options} \
|
||||
%if %{with index64}
|
||||
--with-64-bit-indices=1 \
|
||||
%endif
|
||||
--with-64-bit-indices=0 \
|
||||
%if %{with blas}
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 9
|
||||
--with-blaslapack=1 --with-blaslapack-lib=-l%{blaslib}%{blasvar} --with-blaslapack-include=%{_includedir}/%{blaslib} \
|
||||
@ -623,7 +629,9 @@ pushd %{name}-%{version}
|
||||
--with-openblas=1 --with-openblas-lib=-l%{blaslib}%{blasvar} --with-openblas-include=%{_includedir}/%{blaslib} \
|
||||
%endif
|
||||
%endif
|
||||
%if %{with metis}
|
||||
--with-metis=1 \
|
||||
%endif
|
||||
%if %{with tetgen}
|
||||
--with-tetgen=1 \
|
||||
--with-tetgen-lib=-ltetgen \
|
||||
@ -651,7 +659,9 @@ pushd build64
|
||||
%configure --with-cc=gcc --with-cxx=g++ --with-fc=gfortran \
|
||||
%{petsc_build_options} \
|
||||
--with-64-bit-indices=1 \
|
||||
%if %{with metis64}
|
||||
--with-metis=1 \
|
||||
%endif
|
||||
%if %{with blas64}
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 9
|
||||
--with-blaslapack=1 --with-blaslapack-lib=-l%{blaslib}%{blasvar}64 --with-blaslapack-include=%{_includedir}/%{blaslib} \
|
||||
@ -683,10 +693,10 @@ export FC=mpifort
|
||||
--FC_LINKER_FLAGS="$LDFLAGS -lgfortran -lmpi_mpifh" \
|
||||
--LIBS=" -lmpi -lmpi_mpifh" \
|
||||
%{petsc_mpibuild_options} \
|
||||
%if %{with metis}
|
||||
--with-metis=1 \
|
||||
%if %{with index64}
|
||||
--with-64-bit-indices=1 \
|
||||
%endif
|
||||
--with-64-bit-indices=0 \
|
||||
%if %{with blas}
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 9
|
||||
--with-blaslapack=1 --with-blaslapack-lib=-l%{blaslib}%{blasvar} --with-blaslapack-include=%{_includedir}/%{blaslib} \
|
||||
@ -724,10 +734,10 @@ export FC=mpifort
|
||||
--FC_LINKER_FLAGS="$LDFLAGS -lgfortran -lfmpich -lmpichf90" \
|
||||
--LIBS=" -lmpich -lfmpich -lmpichf90" \
|
||||
%{petsc_mpibuild_options} \
|
||||
%if %{with metis}
|
||||
--with-metis=1 \
|
||||
%if %{with index64}
|
||||
--with-64-bit-indices=1 \
|
||||
%endif
|
||||
--with-64-bit-indices=0 \
|
||||
%if %{with blas}
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 9
|
||||
--with-blaslapack=1 --with-blaslapack-lib=-l%{blaslib}%{blasvar} --with-blaslapack-include=%{_includedir}/%{blaslib} \
|
||||
@ -1158,6 +1168,9 @@ xvfb-run -a make MAKE_NP=$RPM_BUILD_NCPUS all test -C build64 V=1 MPIEXEC='%{_bu
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Feb 24 2023 Antonio Trande <sagitter@fedoraproject.org> - 3.17.4-13
|
||||
- Drop latest changes
|
||||
|
||||
* Thu Feb 23 2023 Antonio Trande <sagitter@fedoraproject.org> - 3.17.4-12
|
||||
- Enable PETSC_INDEX_SIZE_64 in 64-bit architectures
|
||||
- Use always metis64 in 64-bit architectures
|
||||
@ -1759,3 +1772,4 @@ xvfb-run -a make MAKE_NP=$RPM_BUILD_NCPUS all test -C build64 V=1 MPIEXEC='%{_bu
|
||||
|
||||
* Sun Jun 19 2016 Antonio Trande <sagitter@fedoraproject.org> - 3.7.2-1
|
||||
- New package
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user