The package rpms/elpa.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/elpa.git/commit/?id=42638b4f5dba9....
Change:
-%ifarch x86_64 ppc64le
Thanks.
Full change:
============
commit 42638b4f5dba95303fbb22ed4ff8742dc28d788e
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Apr 15 23:35:07 2021 +0200
disable mpich tests and enable openmpi on all arches
mpich tests seem to hang on all arches
openmpi tests seem to work fine everywhere
diff --git a/elpa.spec b/elpa.spec
index 4c1a756..332cfaa 100644
--- a/elpa.spec
+++ b/elpa.spec
@@ -247,11 +247,7 @@ rm %{buildroot}%{_pkgdocdir}/USERS_GUIDE_DEPRECATED_LEGACY_API.md
%check
. /etc/profile.d/modules.sh
for s in '' _openmp ; do
-%ifarch x86_64 ppc64le
- for mpi in '' mpich ; do
-%else
- for mpi in '' mpich openmpi ; do
-%endif
+ for mpi in '' openmpi ; do
pushd ${s:-.}/${mpi:-serial}
if [ -n "$mpi" ]; then
module load mpi/${mpi}-%{_arch}
@@ -342,6 +338,8 @@ done
* Thu Apr 15 2021 Dominik Mierzejewski <rpm(a)greysector.net> 2020.11.001-1
- update to 2020.11.001
- drop obsolete patches
+- disable mpich tests for now, they seem to hang on all arches
+- enable openmpi tests on all arches instead
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
2020.05.001-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit 7a959dfc7bdf268c435f3b12130957cc58b02f75
Merge: 6090800 7967be8
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Apr 15 15:50:19 2021 +0200
Merge branch 'f33' into f34
diff --cc elpa.spec
index 44a9a38,8ced33a..4c1a756
--- a/elpa.spec
+++ b/elpa.spec
@@@ -348,9 -334,10 +339,13 @@@ don
%{_fmoddir}/openmpi*/*.mod
%changelog
+ * Thu Apr 15 2021 Dominik Mierzejewski <rpm(a)greysector.net> 2020.11.001-1
+ - update to 2020.11.001
+ - drop obsolete patches
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
2020.05.001-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Tue Sep 15 2020 Dominik Mierzejewski <rpm(a)greysector.net> 2020.05.001-1
- update to 2020.05.001 (ABI and API break)
- rebase patches and drop obsolete ones
commit 7967be85990c5184a8442764af5e3f0881767e49
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Apr 15 13:37:05 2021 +0200
update to 2020.11.001
drop obsolete patches
diff --git a/.gitignore b/.gitignore
index 13ce3a2..0b346a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
/elpa-2019.05.002.tar.gz.asc
/elpa-2020.05.001.tar.gz
/elpa-2020.05.001.tar.gz.asc
+/elpa-2020.11.001.tar.gz
+/elpa-2020.11.001.tar.gz.asc
diff --git a/elpa-c-binding.patch b/elpa-c-binding.patch
deleted file mode 100644
index c6c0171..0000000
--- a/elpa-c-binding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mpich/test/shared/test_blacs_infrastructure.F90.layout
mpich/test/shared/test_blacs_infrastructure.F90
---- mpich/test/shared/test_blacs_infrastructure.F90.layout 2020-06-08 16:09:32.000000000
+0200
-+++ mpich/test/shared/test_blacs_infrastructure.F90 2020-09-24 16:32:01.225307325 +0200
-@@ -84,7 +84,7 @@ module test_blacs_infrastructure
- #ifdef SXAURORA
- character(len=1), intent(in) :: layout
- #else
-- character(len=1), intent(in), value :: layout
-+ character(kind=c_char), intent(in), value :: layout
- #endif
- TEST_INT_TYPE, intent(out) :: my_blacs_ctxt, my_prow, my_pcol
-
diff --git a/elpa-flexiblas.patch b/elpa-flexiblas.patch
deleted file mode 100644
index 8f6e678..0000000
--- a/elpa-flexiblas.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mpich/configure.ac.fb mpich/configure.ac
---- mpich/configure.ac.fb 2020-09-15 13:19:43.467050663 +0200
-+++ mpich/configure.ac 2020-09-15 13:19:43.468050671 +0200
-@@ -527,7 +527,7 @@ if test x"${have_mkl}" = x"yes" ; then
- else
-
- dnl first check blas
-- AC_SEARCH_LIBS([dgemm],[openblas satlas blas],[have_blas=yes],[have_blas=no])
-+ AC_SEARCH_LIBS([dgemm],[flexiblas openblas satlas
blas],[have_blas=yes],[have_blas=no])
- AC_MSG_CHECKING([whether we can link a program with a blas lib])
- AC_MSG_RESULT([${have_blas}])
-
diff --git a/elpa-vsx.patch b/elpa-vsx.patch
deleted file mode 100644
index 7f3de10..0000000
--- a/elpa-vsx.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff -up mpich/src/elpa2/kernels/real_128bit_256bit_512bit_BLOCK_template.c.vsx
mpich/src/elpa2/kernels/real_128bit_256bit_512bit_BLOCK_template.c
---- mpich/src/elpa2/kernels/real_128bit_256bit_512bit_BLOCK_template.c.vsx 2020-05-27
13:16:25.000000000 +0200
-+++ mpich/src/elpa2/kernels/real_128bit_256bit_512bit_BLOCK_template.c 2020-09-21
15:23:52.106489501 +0200
-@@ -184,7 +184,7 @@
- #ifdef DOUBLE_PRECISION_REAL
- #define offset 2
- #define __SIMD_DATATYPE __vector double
--#define __SIMD_LOAD (__vector double) vec_ld
-+#define _SIMD_LOAD (__vector double) vec_ld
- #endif
-
- #ifdef SINGLE_PRECISION_REAL
-@@ -197,6 +197,7 @@
- #define _SIMD_STORE vec_st
- #define _SIMD_ADD vec_add
- #define _SIMD_MUL vec_mul
-+#define _SIMD_SUB vec_sub
- #define _SIMD_SET1 vec_splats
-
- #endif /* VEC_SET == SPARC64_SSE */
-@@ -1629,7 +1630,7 @@ void CONCAT_7ARGS(PREFIX,_hh_trafo_real_
-
-
- #undef ROW_LENGTH
--#if VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == NEON_ARCH64_128
-+#if VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == VSX_SSE || VEC_SET ==
NEON_ARCH64_128
- #ifdef DOUBLE_PRECISION_REAL
- #define ROW_LENGTH 6
- #define STEP_SIZE 6
-@@ -1640,7 +1641,7 @@ void CONCAT_7ARGS(PREFIX,_hh_trafo_real_
- #define STEP_SIZE 12
- #define UPPER_BOUND 8
- #endif
--#endif /* VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == NEON_ARCH64_128
*/
-+#endif /* VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == VSX_SSE || VEC_SET
== NEON_ARCH64_128 */
-
- #if VEC_SET == AVX_256 || VEC_SET == AVX2_256
- #ifdef DOUBLE_PRECISION_REAL
-@@ -1680,14 +1681,14 @@ void CONCAT_7ARGS(PREFIX,_hh_trafo_real_
-
-
- #undef ROW_LENGTH
--#if VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == NEON_ARCH64_128
-+#if VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == VSX_SSE || VEC_SET ==
NEON_ARCH64_128
- #ifdef DOUBLE_PRECISION_REAL
- #define ROW_LENGTH 4
- #endif
- #ifdef SINGLE_PRECISION_REAL
- #define ROW_LENGTH 8
- #endif
--#endif /* VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == NEON_ARCH64_128
*/
-+#endif /* VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == VSX_SSE || VEC_SET
== NEON_ARCH64_128 */
-
- #if VEC_SET == AVX_256 || VEC_SET == AVX2_256
- #ifdef DOUBLE_PRECISION_REAL
-@@ -1715,14 +1716,14 @@ void CONCAT_7ARGS(PREFIX,_hh_trafo_real_
- }
-
- #undef ROW_LENGTH
--#if VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == NEON_ARCH64_128
-+#if VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == VSX_SSE || VEC_SET ==
NEON_ARCH64_128
- #ifdef DOUBLE_PRECISION_REAL
- #define ROW_LENGTH 2
- #endif
- #ifdef SINGLE_PRECISION_REAL
- #define ROW_LENGTH 4
- #endif
--#endif /* VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == NEON_ARCH64_128
*/
-+#endif /* VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == VSX_SSE || VEC_SET
== NEON_ARCH64_128 */
-
- #if VEC_SET == AVX_256 || VEC_SET == AVX2_256
- #ifdef DOUBLE_PRECISION_REAL
-@@ -1772,7 +1773,7 @@ void CONCAT_7ARGS(PREFIX,_hh_trafo_real_
- #ifdef BLOCK6
-
- #undef ROW_LENGTH
--#if VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == NEON_ARCH64_128
-+#if VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == VSX_SSE || VEC_SET ==
NEON_ARCH64_128
- #ifdef DOUBLE_PRECISION_REAL
- #define ROW_LENGTH 4
- #define STEP_SIZE 4
-@@ -1783,7 +1784,7 @@ void CONCAT_7ARGS(PREFIX,_hh_trafo_real_
- #define STEP_SIZE 8
- #define UPPER_BOUND 4
- #endif
--#endif /* VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == NEON_ARCH64_128
*/
-+#endif /* VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == VSX_SSE || VEC_SET
== NEON_ARCH64_128 */
-
- #if VEC_SET == AVX_256 || VEC_SET == AVX2_256
- #ifdef DOUBLE_PRECISION_REAL
-@@ -1822,14 +1823,14 @@ void CONCAT_7ARGS(PREFIX,_hh_trafo_real_
- }
-
- #undef ROW_LENGTH
--#if VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == NEON_ARCH64_128
-+#if VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == VSX_SSE || VEC_SET ==
NEON_ARCH64_128
- #ifdef DOUBLE_PRECISION_REAL
- #define ROW_LENGTH 2
- #endif
- #ifdef SINGLE_PRECISION_REAL
- #define ROW_LENGTH 4
- #endif
--#endif /* VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == NEON_ARCH64_128
*/
-+#endif /* VEC_SET == SSE_128 || VEC_SET == SPARC64_SSE || VEC_SET == VSX_SSE || VEC_SET
== NEON_ARCH64_128 */
-
- #if VEC_SET == AVX_256 || VEC_SET == AVX2_256
- #ifdef DOUBLE_PRECISION_REAL
-diff -up mpich/src/elpa2/kernels/real_vsx_4hv_double_precision.c.vsx
mpich/src/elpa2/kernels/real_vsx_4hv_double_precision.c
---- mpich/src/elpa2/kernels/real_vsx_4hv_double_precision.c.vsx 2020-05-27
13:16:25.000000000 +0200
-+++ mpich/src/elpa2/kernels/real_vsx_4hv_double_precision.c 2020-09-21 15:15:22.777337971
+0200
-@@ -49,11 +49,11 @@
- #define REALCASE 1
- #define DOUBLE_PRECISION 1
- #define BLOCK4 1
--#define SIMD_SET VSX_SSE
-+#define VEC_SET VSX_SSE
- #include "../../general/precision_macros.h"
--#include "real_vsx_4hv_template.c"
-+#include "real_128bit_256bit_512bit_BLOCK_template.c"
- #undef BLOCK4
--#undef SIMD_SET
-+#undef VEC_SET
- #undef REALCASE
- #undef DOUBLE_PRECISION
-
-diff -up mpich/src/elpa2/kernels/real_vsx_4hv_single_precision.c.vsx
mpich/src/elpa2/kernels/real_vsx_4hv_single_precision.c
---- mpich/src/elpa2/kernels/real_vsx_4hv_single_precision.c.vsx 2020-05-27
13:16:25.000000000 +0200
-+++ mpich/src/elpa2/kernels/real_vsx_4hv_single_precision.c 2020-09-21 15:15:22.777337971
+0200
-@@ -49,11 +49,11 @@
- #define REALCASE 1
- #define SINGLE_PRECISION 1
- #define BLOCK4 1
--#define SIMD_SET VSX_SSE
-+#define VEC_SET VSX_SSE
- #include "../../general/precision_macros.h"
--#include "real_vsx_4hv_template.c"
-+#include "real_128bit_256bit_512bit_BLOCK_template.c"
- #undef BLOCK4
--#undef SIMD_SET
-+#undef VEC_SET
- #undef REALCASE
- #undef SINGLE_PRECISION
-
-diff -up mpich/src/elpa2/kernels/real_vsx_6hv_double_precision.c.vsx
mpich/src/elpa2/kernels/real_vsx_6hv_double_precision.c
---- mpich/src/elpa2/kernels/real_vsx_6hv_double_precision.c.vsx 2020-05-27
13:16:25.000000000 +0200
-+++ mpich/src/elpa2/kernels/real_vsx_6hv_double_precision.c 2020-09-21 15:15:22.777337971
+0200
-@@ -49,11 +49,11 @@
- #define REALCASE 1
- #define DOUBLE_PRECISION 1
- #define BLOCK6 1
--#define SIMD_SET VSX_SSE
-+#define VEC_SET VSX_SSE
- #include "../../general/precision_macros.h"
--#include "real_vsx_6hv_template.c"
-+#include "real_128bit_256bit_512bit_BLOCK_template.c"
- #undef BLOCK6
--#undef SIMD_SET
-+#undef VEC_SET
- #undef REALCASE
- #undef DOUBLE_PRECISION
-
-diff -up mpich/src/elpa2/kernels/real_vsx_6hv_single_precision.c.vsx
mpich/src/elpa2/kernels/real_vsx_6hv_single_precision.c
---- mpich/src/elpa2/kernels/real_vsx_6hv_single_precision.c.vsx 2020-05-27
13:16:25.000000000 +0200
-+++ mpich/src/elpa2/kernels/real_vsx_6hv_single_precision.c 2020-09-21 15:15:22.777337971
+0200
-@@ -51,7 +51,7 @@
- #define BLOCK6 1
- #define VEC_SET VSX_SSE
- #include "../../general/precision_macros.h"
--#include "real_vsx_6hv_template.c"
-+#include "real_128bit_256bit_512bit_BLOCK_template.c"
- #undef VEC_SET
- #undef BLOCK6
- #undef REALCASE
diff --git a/elpa.spec b/elpa.spec
index 7b51e2e..8ced33a 100644
--- a/elpa.spec
+++ b/elpa.spec
@@ -8,20 +8,14 @@
Summary: High-performance library for parallel solution of eigenvalue problems
Name: elpa
-Version: 2020.05.001
+Version: 2020.11.001
Release: 1%{?dist}
URL:
https://elpa.mpcdf.mpg.de/software
-Source0:
https://elpa.mpcdf.mpg.de/html/Releases/%{version}/elpa-%{version}.tar.gz
-Source1:
https://elpa.mpcdf.mpg.de/html/Releases/%{version}/elpa-%{version}.tar.gz...
+Source0:
https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/%{version}/el...
+Source1:
https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/%{version}/el...
Source2: gpg-keyring-26BC8F899C6A2698BDD6EF6A69260748A5F870B5.gpg
# drop _onenode suffix from non-MPI builds
Patch1: elpa-onenode.patch
-# fix typos in VSX code
-Patch2: elpa-vsx.patch
-# fix test failures on x86_64
-Patch3: elpa-c-binding.patch
-# add FlexiBLAS support
-Patch6: elpa-flexiblas.patch
License: LGPLv3+
BuildRequires: flexiblas-devel
BuildRequires: gcc-gfortran
@@ -148,9 +142,6 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0}
mv elpa-%{version} mpich
pushd mpich
%patch1 -p1 -b .onenode
-%patch2 -p1 -b .vsx
-%patch3 -p1 -b .cb
-%patch6 -p1 -b .fb
autoreconf -vifs
popd
cp -pr mpich openmpi
@@ -343,6 +334,10 @@ done
%{_fmoddir}/openmpi*/*.mod
%changelog
+* Thu Apr 15 2021 Dominik Mierzejewski <rpm(a)greysector.net> 2020.11.001-1
+- update to 2020.11.001
+- drop obsolete patches
+
* Tue Sep 15 2020 Dominik Mierzejewski <rpm(a)greysector.net> 2020.05.001-1
- update to 2020.05.001 (ABI and API break)
- rebase patches and drop obsolete ones
diff --git a/sources b/sources
index b651319..33ed840 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (elpa-2020.05.001.tar.gz) =
0bd6bc15256f30df17066df357a109c9620cd423a4f5063a1fc3a3d44c7dfe091ec5f6dacfaacecbc006de220fb44c1cce3398471a00d41c5e93bc6f4023e207
-SHA512 (elpa-2020.05.001.tar.gz.asc) =
7e37ef2be8bbdbdc31205208cd9a718ec952504b7edde763f0cb2d608aca1e1922c7a8bea08f27e00152193011dbe3d95ec28f2e190f215613f885e5ea3c7341
+SHA512 (elpa-2020.11.001.tar.gz) =
5f1e57fab0dcbd0a155c4bf3ec0edaada640122b9c1e85b19f545465a8bbca080e6365f5f1b15317426ca0e3e9a38914f0221c931627dee7726b0cd6775f7fe7
+SHA512 (elpa-2020.11.001.tar.gz.asc) =
5fbf10db534d71a9e01322c8214ef5e5b475d30e4e65beaa0505c2d4057cd3b914e6aea7a79a20c120cb64ed63b7a2104bbfb07f5a9227422bd25f1c125b873a