Skip to content

Commit 0f9d7d9

Browse files
authored
Toolchain: Packages updating (#7285)
* Toolchain: Packages updating * Delete empty .gitmodules and add .gitattributes See #7271; follow up to #7273 and #7277 * Remove unused flags (problem not solved yet) * Fix MPICH installing failure
1 parent a8413b3 commit 0f9d7d9

6 files changed

Lines changed: 28 additions & 29 deletions

File tree

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.gitattributes export-ignore
2+
.gitignore export-ignore
3+
.gitmodules export-ignore
4+
.pre-commit-config.yaml export-ignore
5+
.github/ export-ignore

.gitmodules

Whitespace-only changes.

generate_build_info.sh

100644100755
File mode changed.

toolchain/scripts/lib/config_manager.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ config_set_defaults() {
374374

375375
# Default enable options (following original script logic)
376376
CONFIG_CACHE["dry_run"]="__FALSE__"
377-
CONFIG_CACHE["enable_tsan"]="__FALSE__"
377+
CONFIG_CACHE["ENABLE_TSAN"]="__FALSE__"
378378
CONFIG_CACHE["enable_opencl"]="__FALSE__"
379379
CONFIG_CACHE["enable_cuda"]="__FALSE__"
380380
CONFIG_CACHE["enable_hip"]="__FALSE__"
@@ -1242,4 +1242,4 @@ config_apply_modes() {
12421242
;;
12431243
esac
12441244
fi
1245-
}
1245+
}

toolchain/scripts/package_versions.sh

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,41 +30,41 @@ cmake_alt_sha256_macos="3d603e507c7579b13518ef752b4ffcf3ed479fba80ee171d7d85da81
3030
# STAGE 1: MPI Implementations
3131
# =============================================================================
3232

33-
# OpenMPI (supports dual versions) - main=5.0.8, alt=4.1.6
34-
openmpi_main_ver="5.0.8"
35-
openmpi_main_sha256="53131e1a57e7270f645707f8b0b65ba56048f5b5ac3f68faabed3eb0d710e449"
36-
openmpi_alt_ver="4.1.6"
37-
openmpi_alt_sha256="f740994485516deb63b5311af122c265179f5328a0d857a567b85db00b11e415"
33+
# OpenMPI (supports dual versions) - main=5.0.10, alt=4.1.8
34+
openmpi_main_ver="5.0.10"
35+
openmpi_main_sha256="0acecc4fc218e5debdbcb8a41d182c6b0f1d29393015ed763b2a91d5d7374cc6"
36+
openmpi_alt_ver="4.1.8"
37+
openmpi_alt_sha256="466f68e3132a1dc02710cc2011fafced8336d98359fa2dae4dddcfd5719f12a9"
3838

39-
# MPICH (supports dual versions) - main=4.3.1, alt=4.1.0
40-
mpich_main_ver="4.3.1"
41-
mpich_main_sha256="acc11cb2bdc69678dc8bba747c24a28233c58596f81f03785bf2b7bb7a0ef7dc"
42-
mpich_alt_ver="4.1.0"
43-
mpich_alt_sha256="8b1ec63bc44c7caa2afbb457bc5b3cd4a70dbe46baba700123d67c48dc5ab6a0"
39+
# MPICH (supports dual versions) - main=5.0.1, alt=4.3.2
40+
mpich_main_ver="5.0.1"
41+
mpich_main_sha256="8c1832a13ddacf071685069f5fadfd1f2877a29e1a628652892c65211b1f3327"
42+
mpich_alt_ver="4.3.2"
43+
mpich_alt_sha256="47d774587a7156a53752218c811c852e70ac44db9c502dc3f399b4cb817e3818"
4444

4545
# =============================================================================
4646
# STAGE 2: Math Libraries
4747
# =============================================================================
4848

49-
# OpenBLAS (supports dual versions) - main=0.3.30, alt=0.3.27
50-
openblas_main_ver="0.3.30"
51-
openblas_main_sha256="27342cff518646afb4c2b976d809102e368957974c250a25ccc965e53063c95d"
52-
openblas_alt_ver="0.3.27"
53-
openblas_alt_sha256="aa2d68b1564fe2b13bc292672608e9cdeeeb6dc34995512e65c3b10f4599e897"
49+
# OpenBLAS (supports dual versions) - main=0.3.33, alt=0.3.30
50+
openblas_main_ver="0.3.33"
51+
openblas_main_sha256="6761af1d9f5d353ab4f0b7497be2643313b36c8f31caec0144bfef198e71e6ab"
52+
openblas_alt_ver="0.3.30"
53+
openblas_alt_sha256="27342cff518646afb4c2b976d809102e368957974c250a25ccc965e53063c95d"
5454

5555
# =============================================================================
5656
# STAGE 3: Scientific Computing Libraries
5757
# =============================================================================
5858

59-
# ELPA (supports dual versions) - main=2025.06.001, alt=2024.05.001
60-
elpa_main_ver="2025.06.001"
61-
elpa_main_sha256="feeb1fea1ab4a8670b8d3240765ef0ada828062ef7ec9b735eecba2848515c94"
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"
6262
elpa_alt_ver="2024.05.001"
6363
elpa_alt_sha256="9caf41a3e600e2f6f4ce1931bd54185179dade9c171556d0c9b41bbc6940f2f6"
6464

65-
# FFTW (supports dual versions) - Special case: both main and alt are 3.3.10
66-
fftw_main_ver="3.3.10"
67-
fftw_main_sha256="56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467"
65+
# FFTW (supports dual versions) - main=3.3.11, alt=3.3.10
66+
fftw_main_ver="3.3.11"
67+
fftw_main_sha256="5630c24cdeb33b131612f7eb4b1a9934234754f9f388ff8617458d0be6f239a1"
6868
fftw_alt_ver="3.3.10"
6969
fftw_alt_sha256="56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467"
7070

toolchain/scripts/stage1/install_mpich.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ source "${INSTALLDIR}"/toolchain.env
3737
[ ${MPI_MODE} != "mpich" ] && exit 0
3838
[ -f "${BUILDDIR}/setup_mpich" ] && rm "${BUILDDIR}/setup_mpich"
3939

40-
MPICH_CFLAGS=""
41-
MPICH_LDFLAGS=""
42-
MPICH_LIBS=""
4340
! [ -d "${BUILDDIR}" ] && mkdir -p "${BUILDDIR}"
4441
cd "${BUILDDIR}"
4542

@@ -78,11 +75,8 @@ case "${with_mpich}" in
7875
./configure \
7976
--prefix="${pkg_install_dir}" \
8077
--libdir="${pkg_install_dir}/lib" \
81-
MPICC="" \
8278
FFLAGS="${FCFLAGS} ${compat_flag}" \
8379
FCFLAGS="${FCFLAGS} ${compat_flag}" \
84-
--without-x \
85-
--enable-gl=no \
8680
--with-device=${MPICH_DEVICE} \
8781
> configure.log 2>&1 || tail -n ${LOG_LINES} configure.log
8882
make -j $(get_nprocs) > make.log 2>&1 || tail -n ${LOG_LINES} make.log

0 commit comments

Comments
 (0)