The package rpms/hypre.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/hypre.git/commit/?id=6145042b3829....
Change:
-%ifarch s390 s390x
Thanks.
Full change:
============
commit 9f5cc3e705f6897c7c3da4cdc0dd9eb49293ab70
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Mon Dec 3 16:41:39 2018 +0000
- Don't link bundled blas and lapack
diff --git a/hypre.spec b/hypre.spec
index 8c37dbf..535491b 100644
--- a/hypre.spec
+++ b/hypre.spec
@@ -25,7 +25,7 @@
Name: hypre
Version: 2.14.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: High performance matrix preconditioners
# FEI_mv/ml/src/Include/ml_vampir.h has a GPL notice, but it doesn't
# look copyright-significant.
@@ -169,7 +169,7 @@ pushd src
--with-lapack --enable-shared --with-superlu
--with-superlu-include=%_includedir/SuperLU \
LDFLAGS="-lsuperlu -fopenmp -lm $LDFLAGS -Wl,--as-needed" \
CFLAGS="$CFLAGS -O3 -Dhypre_dgesvd=dgesvd_ -fopenmp"
-make %{?_smp_mflags}
+make %{?_smp_mflags} BLASFILES= LAPACKFILES= BLASLIBDIRS=
popd
%global do_mpi_build \
@@ -180,7 +180,7 @@ popd
--enable-shared --with-dsuperlu
--with-dsuperlu-include=$MPI_INCLUDE/superlu_dist \\\
LDFLAGS=" -lsuperlu_dist -lsuperlu -lptscotch -Wl,--as-needed
$LDFLAGS" \\\
CFLAGS="$CFLAGS -O3 -Dhypre_dgesvd=dgesvd_" \
- make %{?_smp_mflags}
+ make %{?_smp_mflags} BLASFILES= LAPACKFILES= BLASLIBDIRS=
%if %{with openmpi}
pushd openmpi
@@ -286,6 +286,9 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
%doc docs/*.pdf
%changelog
+* Mon Dec 3 2018 Dave Love <loveshack(a)fedoraproject.org> - 2.14.0-5
+- Don't link bundled blas and lapack
+
* Thu Jul 19 2018 Sandro Mani <manisandro(a)gmail.com> - 2.14.0-4
- Rebuild (scotch)
commit 115786aa668113cfb162ecdd5758112bd30a2b62
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Thu Jul 19 14:30:42 2018 +0200
Rebuild (scotch)
diff --git a/hypre.spec b/hypre.spec
index f878e32..8c37dbf 100644
--- a/hypre.spec
+++ b/hypre.spec
@@ -25,7 +25,7 @@
Name: hypre
Version: 2.14.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: High performance matrix preconditioners
# FEI_mv/ml/src/Include/ml_vampir.h has a GPL notice, but it doesn't
# look copyright-significant.
@@ -286,6 +286,9 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
%doc docs/*.pdf
%changelog
+* Thu Jul 19 2018 Sandro Mani <manisandro(a)gmail.com> - 2.14.0-4
+- Rebuild (scotch)
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.14.0-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 4e88c13bd5202b73b834cc31a42912163d8acdcc
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 05:29:15 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/hypre.spec b/hypre.spec
index 6517d33..f878e32 100644
--- a/hypre.spec
+++ b/hypre.spec
@@ -25,7 +25,7 @@
Name: hypre
Version: 2.14.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: High performance matrix preconditioners
# FEI_mv/ml/src/Include/ml_vampir.h has a GPL notice, but it doesn't
# look copyright-significant.
@@ -286,6 +286,9 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
%doc docs/*.pdf
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.14.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Tue Apr 24 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.14.0-2
- Build hypre-openmpi on s390x (#1571450)
commit 6145042b382944850e3c7d273b50710f02d852d9
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Thu Apr 26 10:09:07 2018 +0100
Build hypre-openmpi on s390x (#1571450)
diff --git a/hypre.spec b/hypre.spec
index ecf76fd..6517d33 100644
--- a/hypre.spec
+++ b/hypre.spec
@@ -11,10 +11,9 @@
%bcond_without mpich
%endif
-%ifarch s390 s390x
-%bcond_with openmpi
-%else
+%if 0%{?fedora}
%bcond_without openmpi
+%bcond_without mpich
%endif
%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
@@ -26,7 +25,7 @@
Name: hypre
Version: 2.14.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: High performance matrix preconditioners
# FEI_mv/ml/src/Include/ml_vampir.h has a GPL notice, but it doesn't
# look copyright-significant.
@@ -240,8 +239,12 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
%_mpich_unload
%endif
+%if 0%{?ldconfig_scriptlets}
+%ldconfig_scriptlets
+%else
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+%endif
%{!?_licensedir:%global license %doc}
@@ -283,6 +286,9 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
%doc docs/*.pdf
%changelog
+* Tue Apr 24 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.14.0-2
+- Build hypre-openmpi on s390x (#1571450)
+
* Fri Mar 23 2018 Dave Love <loveshack(a)fedoraproject.org> - 2.14.0-1
- Update to 2.14.0 (#1557645)
- Reinstate superlu and use superlu_dist
commit 95a7df1aa6b503eee71a26f2d6a56fa4ab1997e2
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Mon Mar 26 18:34:44 2018 +0100
Update to 2.14.0 (#1557645)
Reinstate superlu and use superlu_dist
diff --git a/hypre-test.patch b/hypre-test.patch
index 56e26f4..b57beeb 100644
--- a/hypre-test.patch
+++ b/hypre-test.patch
@@ -1,21 +1,11 @@
-*** hypre-2.11.2/src/test/runtest.sh~ 2017-03-13 19:37:24.000000000 +0000
---- hypre-2.11.2/src/test/runtest.sh 2017-05-04 12:54:11.105714813 +0000
-***************
-*** 11,17 ****
- RunEcho=""
- ExecFileNames="" # string of executable file names used
- TestDirNames="" # string of names of TEST_* directories used
-! HOST=`hostname`
- NumThreads=0 # number of OpenMP threads to use if > 0
- Valgrind="" # string to add to MpirunString when using
valgrind
-
---- 11,17 ----
- RunEcho=""
- ExecFileNames="" # string of executable file names used
- TestDirNames="" # string of names of TEST_* directories used
-! HOST=
- NumThreads=0 # number of OpenMP threads to use if > 0
- Valgrind="" # string to add to MpirunString when using
valgrind
-
-
-Diff finished. Thu May 4 12:54:16 2017
+*** hypre-2.14.0/src/test/runtest.sh~
+--- hypre-2.14.0/src/test/runtest.sh
+@@ -11,7 +11,7 @@
+ RunEcho=""
+ ExecFileNames="" # string of executable file names used
+ TestDirNames="" # string of names of TEST_* directories used
+-HOST=`hostname`
++HOST=
+ NumThreads=0 # number of OpenMP threads to use if > 0
+ Valgrind="" # string to add to MpirunString when using
valgrind
+ mpibind="" # string to add to MpirunString when using mpibind
diff --git a/hypre.spec b/hypre.spec
index cf75b15..ecf76fd 100644
--- a/hypre.spec
+++ b/hypre.spec
@@ -25,8 +25,8 @@
%endif
Name: hypre
-Version: 2.13.0
-Release: 6%{?dist}
+Version: 2.14.0
+Release: 1%{?dist}
Summary: High performance matrix preconditioners
# FEI_mv/ml/src/Include/ml_vampir.h has a GPL notice, but it doesn't
# look copyright-significant.
@@ -40,12 +40,6 @@ Patch2: hypre-test.patch
BuildRequires: gcc-c++ gcc-gfortran automake libtool libtool-ltdl-devel
BuildRequires: SuperLU-devel
-%if %{with openmpi}
-BuildRequires: openmpi-devel superlu_dist-openmpi-devel ptscotch-openmpi-devel
-%endif
-%if %{with mpich}
-BuildRequires: mpich-devel superlu_dist-mpich-devel ptscotch-mpich-devel
-%endif
%if %use_openblas
BuildRequires: openblas-devel
%else
@@ -82,6 +76,7 @@ Development files for %name
%package openmpi
Summary: High performance matrix preconditioners - openmpi
Requires: openmpi%{?_isa}
+BuildRequires: superlu_dist-openmpi-devel ptscotch-openmpi-devel
%description openmpi
%desc
@@ -91,7 +86,8 @@ This is the openmpi version.
%package openmpi-devel
Summary: Development files for %name-openmpi
Requires: %{name}-openmpi%{?_isa} = %{version}-%{release}
-Requires: openmpi-devel%{?_isa} SuperLU-devel%{?_isa}
+Requires: openmpi-devel%{?_isa} superlu_dist-openmpi-devel%{?_isa}
+Requires: ptscotch-openmpi-devel%{?_isa}
%if %use_openblas
Requires: openblas-devel%{?_isa}
%else
@@ -106,6 +102,7 @@ Development files for %name-openmpi
%package mpich
Summary: High performance matrix preconditioners - mpich
Requires: mpich%{?_isa}
+BuildRequires: superlu_dist-mpich-devel ptscotch-mpich-devel
%description mpich
%desc
@@ -121,7 +118,7 @@ Requires: mpich-devel
%else
Requires: mpich-devel%{?_isa}
%endif
-Requires: SuperLU-devel%{?_isa}
+Requires: superlu_dist-mpich-devel%{?_isa} ptscotch-mpich-devel%{?_isa}
%if %use_openblas
Requires: openblas-devel%{?_isa}
%else
@@ -143,8 +140,8 @@ Documentation for hypre
%prep
%setup -q -n %name-%version
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .soname
+%patch2 -p1 -b .test
find \( -name \*.[ch] -o -name \*.cxx \) -perm /=x -exec chmod 0644 {} \;
@@ -157,23 +154,22 @@ cp -a src mpich
%build
%if %use_openblas
-%global lalibs --with-blas-lib=-lopenblas --with-lapack-lib=-lopenblas
+%global lalibs --with-blas-libs=openblas --with-lapack-libs=openblas
--with-blas-lib-dirs=%_libdir --with-lapack-lib-dirs=%_libdir --with-superlu
--with-superlu-include=%_includedir/SuperLU
%else
%if 0%{?el6}
-%global lalibs --with-blas-lib="-L%_libdir/atlas -lf77blas"
--with-lapack-lib="-L%_libdir/atlas -llappack"
+%global lalibs --with-blas-libs=f77blas --with-lapack-libs=lapack
--with-blas-lib-dirs=%_libdir/atlas --with-lapack-lib-dirs=%_libdir/atlas --with-superlu
--with-superlu-include=%_includedir/SuperLU
%else
-%global lalibs --with-blas-lib-dirs="-L%_libdir/atlas -lsatlas"
--with-lapack-lib-dirs="-L%_libdir/atlas -lsatlas"
+%global lalibs --with-blas-libs=satlas --with-lapack-libs=satlas
--with-blas-lib-dirs=%_libdir/atlas --with-lapack-lib-dirs=%_libdir/atlas --with-superlu
--with-superlu-include=%_includedir/SuperLU
%endif
%endif
pushd src
# -O3 seems like a good idea for vectorization, at least.
-%configure --without-MPI --with-timing \
+%configure --without-MPI --with-timing --with-openmp \
%lalibs \
- --enable-shared --with-superlu --with-superlu-lib=-lsuperlu \
- --with-superlu-include=%_includedir/SuperLU --with-mli \
- LDFLAGS="$LDFLAGS -Wl,--as-needed -lsuperlu" \
- CFLAGS="$CFLAGS -O3"
+ --with-lapack --enable-shared --with-superlu
--with-superlu-include=%_includedir/SuperLU \
+ LDFLAGS="-lsuperlu -fopenmp -lm $LDFLAGS -Wl,--as-needed" \
+ CFLAGS="$CFLAGS -O3 -Dhypre_dgesvd=dgesvd_ -fopenmp"
make %{?_smp_mflags}
popd
@@ -181,10 +177,10 @@ popd
%configure --prefix=$MPI_HOME --with-MPI --with-MPI-include=$MPI_INCLUDE \\\
--with-MPI-lib-dirs=$MPI_LIB --with-timing --without-openmp \\\
%lalibs \\\
- --enable-shared --with-dsuperlu --with-dsuperlu-lib=-lsuperlu_dist \\\
- --with-dsuperlu-include=$MPI_INCLUDE/superlu_dist \\\
- LDFLAGS="$LDFLAGS -Wl,--as-needed -lsuperlu_dist" \\\
- CFLAGS="$CFLAGS -O3" \
+ --with-fei --with-mli \\\
+ --enable-shared --with-dsuperlu
--with-dsuperlu-include=$MPI_INCLUDE/superlu_dist \\\
+ LDFLAGS=" -lsuperlu_dist -lsuperlu -lptscotch -Wl,--as-needed
$LDFLAGS" \\\
+ CFLAGS="$CFLAGS -O3 -Dhypre_dgesvd=dgesvd_" \
make %{?_smp_mflags}
%if %{with openmpi}
@@ -287,6 +283,10 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
%doc docs/*.pdf
%changelog
+* Fri Mar 23 2018 Dave Love <loveshack(a)fedoraproject.org> - 2.14.0-1
+- Update to 2.14.0 (#1557645)
+- Reinstate superlu and use superlu_dist
+
* Wed Mar 07 2018 Adam Williamson <awilliam(a)redhat.com> - 2.13.0-6
- Rebuild to fix GCC 8 mis-compilation
See
https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
commit 5b835636754edc14df709c377abbcd6690470eb4
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Sat Mar 24 19:24:20 2018 +0000
New source
diff --git a/.gitignore b/.gitignore
index 55d48fa..1ac86ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/hypre-2.11.1.tar.gz
/hypre-2.11.2.tar.gz
/hypre-2.13.0.tar.gz
+/hypre-2.14.0.tar.gz
diff --git a/sources b/sources
index 8b13c11..6abd793 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hypre-2.13.0.tar.gz) =
e78d16a561b710cefc3b1ef7f3ba768caffd532e65c2368fd2f98497b7a46f521f4f86fb504238d06fbd1f8040a44d890c366fbd17d197440970f7b9be052303
+SHA512 (hypre-2.14.0.tar.gz) =
c7b59fb7ab1cc906e339fcc00603898e44234a65aa74600f740bc825aa94aa66ff0cbd4bd4b7f339c0d28ff5bd9494f15b57f2017a22348fee14b4e8333f1e6c