rpms/petsc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use always metis64 in 64-bit architectures

Browse Source
This commit is contained in:
Antonio Trande 2023-02-23 22:09:51 +01:00
parent 51b7647b72
commit ada2d00b4a
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
petsc.spec
View File

@ -36,7 +36,9 @@
%if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 64 %if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 64
%bcond_without arch64 %bcond_without arch64
%bcond_without metis64
%else %else
%bcond_without metis
%bcond_with arch64 %bcond_with arch64
%endif %endif
@ -90,13 +92,6 @@
%bcond_with tetgen %bcond_with tetgen
# #
## Metis
%bcond_without metis
%if 0%{?fedora} || 0%{?rhel} < 8
%bcond_without metis64
%endif
#
# 'scalapack' is required by 'MUMPS' # 'scalapack' is required by 'MUMPS'
%if %{with openmpi} %if %{with openmpi}
%bcond_without mpi %bcond_without mpi
@ -587,13 +582,16 @@ pushd %{name}-%{version}
rm $(grep -rl '/\* Generated by Cython') rm $(grep -rl '/\* Generated by Cython')
popd popd
pushd %{name}-%{version}
%if %{with metis64}
%patch4 -p1 -b .metis64
%endif
popd
%if %{with arch64} %if %{with arch64}
cp -a %{name}-%{version} build64 cp -a %{name}-%{version} build64
pushd build64 pushd build64
%patch1 -p0 %patch1 -p0
%if %{with metis64}
%patch4 -p1 -b .metis64
%endif
popd popd
%endif %endif
@ -632,9 +630,7 @@ pushd %{name}-%{version}
--with-openblas=1 --with-openblas-lib=-l%{blaslib}%{blasvar} --with-openblas-include=%{_includedir}/%{blaslib} \ --with-openblas=1 --with-openblas-lib=-l%{blaslib}%{blasvar} --with-openblas-include=%{_includedir}/%{blaslib} \
%endif %endif
%endif %endif
%if %{with metis}
--with-metis=1 \ --with-metis=1 \
%endif
%if %{with tetgen} %if %{with tetgen}
--with-tetgen=1 \ --with-tetgen=1 \
--with-tetgen-lib=-ltetgen \ --with-tetgen-lib=-ltetgen \
@ -662,9 +658,7 @@ pushd build64
%configure --with-cc=gcc --with-cxx=g++ --with-fc=gfortran \ %configure --with-cc=gcc --with-cxx=g++ --with-fc=gfortran \
%{petsc_build_options} \ %{petsc_build_options} \
--with-64-bit-indices=1 \ --with-64-bit-indices=1 \
%if %{with metis64}
--with-metis=1 \ --with-metis=1 \
%endif
%if %{with blas64} %if %{with blas64}
%if 0%{?fedora} || 0%{?rhel} >= 9 %if 0%{?fedora} || 0%{?rhel} >= 9
--with-blaslapack=1 --with-blaslapack-lib=-l%{blaslib}%{blasvar}64 --with-blaslapack-include=%{_includedir}/%{blaslib} \ --with-blaslapack=1 --with-blaslapack-lib=-l%{blaslib}%{blasvar}64 --with-blaslapack-include=%{_includedir}/%{blaslib} \
@ -696,9 +690,7 @@ export FC=mpifort
--FC_LINKER_FLAGS="$LDFLAGS -lgfortran -lmpi_mpifh" \ --FC_LINKER_FLAGS="$LDFLAGS -lgfortran -lmpi_mpifh" \
--LIBS=" -lmpi -lmpi_mpifh" \ --LIBS=" -lmpi -lmpi_mpifh" \
%{petsc_mpibuild_options} \ %{petsc_mpibuild_options} \
%if %{with metis}
--with-metis=1 \ --with-metis=1 \
%endif
%if %{with index64} %if %{with index64}
--with-64-bit-indices=1 \ --with-64-bit-indices=1 \
%endif %endif
@ -739,9 +731,7 @@ export FC=mpifort
--FC_LINKER_FLAGS="$LDFLAGS -lgfortran -lfmpich -lmpichf90" \ --FC_LINKER_FLAGS="$LDFLAGS -lgfortran -lfmpich -lmpichf90" \
--LIBS=" -lmpich -lfmpich -lmpichf90" \ --LIBS=" -lmpich -lfmpich -lmpichf90" \
%{petsc_mpibuild_options} \ %{petsc_mpibuild_options} \
%if %{with metis}
--with-metis=1 \ --with-metis=1 \
%endif
%if %{with index64} %if %{with index64}
--with-64-bit-indices=1 \ --with-64-bit-indices=1 \
%endif %endif
@ -1177,6 +1167,7 @@ xvfb-run -a make MAKE_NP=$RPM_BUILD_NCPUS all test -C build64 V=1 MPIEXEC='%{_bu
%changelog %changelog
* Thu Feb 23 2023 Antonio Trande <sagitter@fedoraproject.org> - 3.17.4-12 * Thu Feb 23 2023 Antonio Trande <sagitter@fedoraproject.org> - 3.17.4-12
- Enable PETSC_INDEX_SIZE_64 in 64-bit architectures - Enable PETSC_INDEX_SIZE_64 in 64-bit architectures
- Use always metis64 in 64-bit architectures
* Thu Feb 23 2023 Antonio Trande <sagitter@fedoraproject.org> - 3.17.4-11 * Thu Feb 23 2023 Antonio Trande <sagitter@fedoraproject.org> - 3.17.4-11
- Disable LTO flags - Disable LTO flags