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

Disable sundials on MPI builds

Browse Source
This commit is contained in:
sagitter 2017-11-09 17:40:45 +01:00
parent a78e6740a0
commit e72e997590
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
petsc.spec
View File

@ -82,7 +82,7 @@
# 'scalapack' is required by 'mumps' # 'scalapack' is required by 'mumps'
%if %{with openmpi} %if %{with openmpi}
%bcond_without mpi %bcond_without mpi
%bcond_without sundials %bcond_with sundials
%bcond_without scalapack %bcond_without scalapack
%bcond_without mumps %bcond_without mumps
%bcond_without ptscotch %bcond_without ptscotch
@ -91,7 +91,7 @@
%if %{with mpich} %if %{with mpich}
%bcond_without mpi %bcond_without mpi
%bcond_without sundials %bcond_with sundials
%bcond_without scalapack %bcond_without scalapack
%bcond_without mumps %bcond_without mumps
%bcond_without ptscotch %bcond_without ptscotch
@ -385,8 +385,8 @@ pushd %{name}-%{version}
CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \ CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
%else %else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
%endif %endif
--with-default-arch=0 --with-make=1 \ --with-default-arch=0 --with-make=1 \
--with-single-library=1 \ --with-single-library=1 \
@ -431,7 +431,7 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
%if %{with mumps_serial} %if %{with mumps_serial}
--with-mumps-serial=1 \ --with-mumps-serial=1 \
--with-mumps-include=%{_includedir}/MUMPS \ --with-mumps-include=%{_includedir}/MUMPS \
--with-mumps-lib="-lmumps_common -ldmumps -lpord" \ --with-mumps-lib=-ldmumps \
%endif %endif
--with-mpi=0 \ --with-mpi=0 \
--with-x=1 \ --with-x=1 \
@ -464,8 +464,8 @@ pushd build64
CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \ CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
%else %else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
%endif %endif
--with-default-arch=0 --with-make=1 \ --with-default-arch=0 --with-make=1 \
--with-single-library=1 \ --with-single-library=1 \
@ -525,8 +525,8 @@ pushd buildopenmpi_dir
CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \ CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
%else %else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
%endif %endif
--with-default-arch=0 --with-make=1 \ --with-default-arch=0 --with-make=1 \
--with-single-library=1 \ --with-single-library=1 \
@ -575,28 +575,28 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
%endif %endif
%if %{with cgns} %if %{with cgns}
--with-cgns=1 \ --with-cgns=1 \
--with-cgns-include="" \ --with-cgns-include= \
--with-cgns-lib="-L$MPI_LIB -lhdf5 -lcgns" \ --with-cgns-lib="-L$MPI_LIB -lhdf5 -lcgns" \
%endif %endif
%if %{with hdf5} %if %{with hdf5}
--with-hdf5=1 \ --with-hdf5=1 \
--with-hdf5-include="" \ --with-hdf5-include= \
--with-hdf5-lib="-L$MPI_LIB -lhdf5" \ --with-hdf5-lib="-L$MPI_LIB -lhdf5" \
%endif %endif
%if %{with ptscotch} %if %{with ptscotch}
--with-ptscotch=1 \ --with-ptscotch=1 \
--with-ptscotch-include="" \ --with-ptscotch-include= \
--with-ptscotch-lib="-L$MPI_LIB -lptscotch -lscotch -lptscotcherr -lscotcherr" \ --with-ptscotch-lib="-L$MPI_LIB -lptscotch -lscotch -lptscotcherr -lscotcherr" \
%endif %endif
%if %{with mumps} %if %{with mumps}
--with-mumps=1 \ --with-mumps=1 \
--with-mumps-include="" \ --with-mumps-include=$MPI_INCLUDE \
--with-mumps-lib="-L$MPI_LIB -lmumps_common -ldmumps -lpord" \ --with-mumps-lib="-L$MPI_LIB -ldmumps" \
%endif %endif
%if %{with sundials} %if %{with sundials}
--with-sundials=1 \ --with-sundials=1 \
--with-sundials-include="" \ --with-sundials-include= \
--with-sundials-lib="-L$MPI_LIB -lsundials_nvecparallel -lsundials_cvode" \ --with-sundials-lib=-lsundials_nvecparallel \
%endif %endif
%if %{with superludist} %if %{with superludist}
--with-superlu_dist=1 \ --with-superlu_dist=1 \
@ -615,7 +615,7 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
%endif %endif
%if %{with fftw} %if %{with fftw}
--with-fftw=1 \ --with-fftw=1 \
--with-fftw-include="" \ --with-fftw-include= \
--with-fftw-lib="-L$MPI_LIB -lfftw3_mpi -lfftw3" \ --with-fftw-lib="-L$MPI_LIB -lfftw3_mpi -lfftw3" \
%endif %endif
--with-pthread=1 \ --with-pthread=1 \
@ -637,7 +637,7 @@ CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,no
CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
%else %else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
%endif %endif
--with-default-arch=0 --with-make=1 \ --with-default-arch=0 --with-make=1 \
--with-single-library=1 \ --with-single-library=1 \
@ -686,12 +686,12 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
%endif %endif
%if %{with cgns} %if %{with cgns}
--with-cgns=1 \ --with-cgns=1 \
--with-cgns-include="" \ --with-cgns-include= \
--with-cgns-lib="-L$MPI_LIB -lhdf5 -lcgns" \ --with-cgns-lib="-L$MPI_LIB -lhdf5 -lcgns" \
%endif %endif
%if %{with hdf5} %if %{with hdf5}
--with-hdf5=1 \ --with-hdf5=1 \
--with-hdf5-include="" \ --with-hdf5-include= \
--with-hdf5-lib="-L$MPI_LIB -lhdf5" \ --with-hdf5-lib="-L$MPI_LIB -lhdf5" \
%endif %endif
%if %{with ptscotch} %if %{with ptscotch}
@ -701,13 +701,13 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
%endif %endif
%if %{with mumps} %if %{with mumps}
--with-mumps=1 \ --with-mumps=1 \
--with-mumps-include="" \ --with-mumps-include=$MPI_INCLUDE \
--with-mumps-lib="-L$MPI_LIB -lmumps_common -ldmumps -lpord" \ --with-mumps-lib="-L$MPI_LIB -ldmumps" \
%endif %endif
%if %{with sundials} %if %{with sundials}
--with-sundials=1 \ --with-sundials=1 \
--with-sundials-include="" \ --with-sundials-include= \
--with-sundials-lib="-L$MPI_LIB -lsundials_nvecparallel -lsundials_cvode" \ --with-sundials-lib=-lsundials_nvecparallel \
%endif %endif
%if %{with superludist} %if %{with superludist}
--with-superlu_dist=1 \ --with-superlu_dist=1 \
@ -726,7 +726,7 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
%endif %endif
%if %{with fftw} %if %{with fftw}
--with-fftw=1 \ --with-fftw=1 \
--with-fftw-include="" \ --with-fftw-include= \
--with-fftw-lib="-L$MPI_LIB -lfftw3_mpi -lfftw3" \ --with-fftw-lib="-L$MPI_LIB -lfftw3_mpi -lfftw3" \
%endif %endif
--with-pthread=1 \ --with-pthread=1 \
@ -1022,6 +1022,7 @@ make -C buildmpich_dir test
%changelog %changelog
* Wed Nov 08 2017 Antonio Trande <sagitter@fedoraproject.org> - 3.8.0-3 * Wed Nov 08 2017 Antonio Trande <sagitter@fedoraproject.org> - 3.8.0-3
- Rebuild for hypre-2.13.0 - Rebuild for hypre-2.13.0
- Disable sundials on MPI builds
* Sun Oct 29 2017 Antonio Trande <sagitter@fedoraproject.org> - 3.8.0-2 * Sun Oct 29 2017 Antonio Trande <sagitter@fedoraproject.org> - 3.8.0-2
- Define openblas arches - Define openblas arches