Skip to content

Commit 559346a

Browse files
committed
Toolchain: ELPA 2026.02.002 (bugfix release)
1 parent a9132cb commit 559346a

3 files changed

Lines changed: 33 additions & 5 deletions

File tree

toolchain/scripts/package_versions.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ openblas_alt_sha256="27342cff518646afb4c2b976d809102e368957974c250a25ccc965e5306
5757
# =============================================================================
5858

5959
# ELPA (supports dual versions) - main=2026.02.001, alt=2024.05.001
60-
elpa_main_ver="2026.02.001"
61-
elpa_main_sha256="a379f27f4dbd27b2ee45017afec656d064301e97150c874649bdfd64957b75ed"
62-
elpa_alt_ver="2024.05.001"
63-
elpa_alt_sha256="9caf41a3e600e2f6f4ce1931bd54185179dade9c171556d0c9b41bbc6940f2f6"
60+
elpa_main_ver="2026.02.002"
61+
elpa_main_sha256="02e3c59fec53cd8eb66a4cc15fa4fbf190cf9654227223fb8ad55713e9427932"
62+
elpa_alt_ver="2025.06.002"
63+
elpa_alt_sha256="de3180c06e2b0dbb56939e84ad1a5fd1684465bd38ad2196792d0f4028937fda"
6464

6565
# FFTW (supports dual versions) - main=3.3.11, alt=3.3.10
6666
fftw_main_ver="3.3.11"
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--- a/Makefile.in
2+
+++ b/Makefile.in
3+
@@ -43752,6 +43752,6 @@
4+
# library with shared sources for the test files
5+
noinst_LTLIBRARIES = libelpa@SUFFIX@_public.la \
6+
- libelpa@SUFFIX@_private.la libelpatest@SUFFIX@.la
7+
+ libelpa@SUFFIX@_private.la
8+
libelpa@SUFFIX@_public_la_FCFLAGS = $(AM_FCFLAGS) $(FC_MODOUT)modules $(FC_MODINC)private_modules
9+
libelpa@SUFFIX@_public_la_SOURCES = \
10+
src/elpa.F90 \
11+
--- a/src/solve_tridi/merge_systems_template.F90
12+
+++ b/src/solve_tridi/merge_systems_template.F90
13+
@@ -809,4 +809,6 @@
14+
- write(error_unit,*) "Returing early from merge_systems (na1==1 .or. na1==2)"
15+
+ if (wantDebug) then
16+
+ write(error_unit,*) "Returing early from merge_systems (na1==1 .or. na1==2)"
17+
+ endif
18+
! na=1 can be tested with "mpirun -n 4 ./validate_real_double_solve_tridiagonal_1stage_gpu_blocktridi 3 3 1"
19+
! na=2 can be tested with "mpirun -n 4 ./validate_real_double_solve_tridiagonal_1stage_gpu_toeplitz 4 4 2"
20+
else if (na1>2) then

toolchain/scripts/stage3/install_elpa.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ case "$with_elpa" in
8686
# with long lines, and that a bunch of libs can be found
8787
cd elpa-${elpa_ver}
8888

89+
if [ "${version_suffix}" = "main" ]; then
90+
patch -l -p1 < "${SCRIPT_DIR}/stage3/elpa-${elpa_ver}-library-only.patch" \
91+
> elpa_library_only.patch.log 2>&1 || tail_excerpt elpa_library_only.patch.log
92+
fi
93+
8994
# ELPA-2017xxxx enables AVX2 by default, switch off if machine doesn't support it.
9095
AVX_flag=""
9196
AVX512_flags=""
@@ -127,6 +132,7 @@ case "$with_elpa" in
127132
--enable-openmp=${enable_openmp} \
128133
--enable-static=no \
129134
--enable-shared=yes \
135+
--with-test-programs=no \
130136
--disable-c-tests \
131137
--disable-cpp-tests \
132138
${config_flags} \
@@ -159,6 +165,7 @@ case "$with_elpa" in
159165
--enable-openmp=${enable_openmp} \
160166
--enable-static=no \
161167
--enable-shared=yes \
168+
--with-test-programs=no \
162169
--disable-c-tests \
163170
--disable-cpp-tests \
164171
${config_flags} \
@@ -190,7 +197,8 @@ case "$with_elpa" in
190197
done
191198
cd ..
192199

193-
write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage3/$(basename ${SCRIPT_NAME})"
200+
write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage3/$(basename ${SCRIPT_NAME})" \
201+
"${SCRIPT_DIR}/stage3/elpa-${elpa_ver}-library-only.patch"
194202
fi
195203
[ "$enable_openmp" != "yes" ] && elpa_dir_openmp=""
196204
elpa_include="${pkg_install_dir}/IF_CUDA(nvidia|cpu)/include/elpa${elpa_dir_openmp}-${elpa_ver}"

0 commit comments

Comments
 (0)