Skip to content

Commit b06280c

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

3 files changed

Lines changed: 37 additions & 5 deletions

File tree

toolchain/scripts/package_versions.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ openblas_alt_sha256="27342cff518646afb4c2b976d809102e368957974c250a25ccc965e5306
5656
# STAGE 3: Scientific Computing Libraries
5757
# =============================================================================
5858

59-
# 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"
59+
# ELPA (supports dual versions) - main=2026.02.002, alt=2025.06.002
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: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,13 @@ case "$with_elpa" in
8686
# with long lines, and that a bunch of libs can be found
8787
cd elpa-${elpa_ver}
8888

89+
# Workaround for current ELPA version; note the situation might
90+
# change, so revise this patch carefully when version changes
91+
if [ "${elpa_ver}" = "${elpa_main_ver}" ]; then
92+
patch -l -p1 < "${SCRIPT_DIR}/stage3/elpa-${elpa_ver}-library-only.patch" \
93+
> elpa_library_only.patch.log 2>&1 || tail -n ${LOG_LINES} elpa_library_only.patch.log
94+
fi
95+
8996
# ELPA-2017xxxx enables AVX2 by default, switch off if machine doesn't support it.
9097
AVX_flag=""
9198
AVX512_flags=""
@@ -127,6 +134,7 @@ case "$with_elpa" in
127134
--enable-openmp=${enable_openmp} \
128135
--enable-static=no \
129136
--enable-shared=yes \
137+
--with-test-programs=no \
130138
--disable-c-tests \
131139
--disable-cpp-tests \
132140
${config_flags} \
@@ -159,6 +167,7 @@ case "$with_elpa" in
159167
--enable-openmp=${enable_openmp} \
160168
--enable-static=no \
161169
--enable-shared=yes \
170+
--with-test-programs=no \
162171
--disable-c-tests \
163172
--disable-cpp-tests \
164173
${config_flags} \
@@ -191,6 +200,9 @@ case "$with_elpa" in
191200
cd ..
192201

193202
write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage3/$(basename ${SCRIPT_NAME})"
203+
if [ "${elpa_ver}" = "${elpa_main_ver}" ]; then
204+
write_checksums "${SCRIPT_DIR}/stage3/elpa-${elpa_ver}-library-only.patch"
205+
fi
194206
fi
195207
[ "$enable_openmp" != "yes" ] && elpa_dir_openmp=""
196208
elpa_include="${pkg_install_dir}/IF_CUDA(nvidia|cpu)/include/elpa${elpa_dir_openmp}-${elpa_ver}"

0 commit comments

Comments
 (0)