From d7b106fab793df2fc89748b29a83a21fa96b353f Mon Sep 17 00:00:00 2001
From: Sebastian Achilles <s.achilles@fz-juelich.de>
Date: Mon, 4 Oct 2021 14:31:48 +0200
Subject: [PATCH] Rename gompi/2022 to gompi/2021b and update to UCX 1.11.2
---
Golden_Repo/README.md | 24 +++++++++----------
.../g/gompi/{gompi-2022.eb => gompi-2021b.eb} | 2 +-
.../o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb | 2 +-
.../u/UCX/{UCX-1.11.1.eb => UCX-1.11.2.eb} | 4 ++--
4 files changed, 16 insertions(+), 16 deletions(-)
rename Golden_Repo/g/gompi/{gompi-2022.eb => gompi-2021b.eb} (96%)
rename Golden_Repo/u/UCX/{UCX-1.11.1.eb => UCX-1.11.2.eb} (95%)
diff --git a/Golden_Repo/README.md b/Golden_Repo/README.md
index 0e3755cf3..5034c7173 100644
--- a/Golden_Repo/README.md
+++ b/Golden_Repo/README.md
@@ -18,23 +18,23 @@ The table below shows the details of the toolchains in the 2022 stage:
| Toolchain name | Toolchain version | Underlying GCC | Compiler | MPI | CUDA | Math libraries | Includes software from |
|-----------------|---------------------------|----------------|------------------|-------------------------|----------|----------------|---------------------------|
-| gpsmpi | 2022 | 11.2.0 | GCC 11.2.0 | ParaStationMPI 5.4.X | TBD§ | | GCCcore, GCC |
-| nvompic | 2022 | 11.2.0 | NVHPC TBD | OpenMPI TBD | TBD | | GCCcore, NVHPC |
-| npsmpic | 2022 | 11.2.0 | NVHPC TBD | ParaStationMPI 5.4.X | TBD | | GCCcore, NVHPC |
-| ipsmpi | 2022 | 11.2.0 | Intel TBD | ParaStationMPI 5.4.X | TBD§ | | GCCcore, intel-compilers |
-| iimpi | 2022 | 11.2.0 | Intel TBD | Intel MPI TBD | | | GCCcore, intel-compilers |
-| gompi | 2022 | 11.2.0 | GCC 11.2.0 | OpenMPI TBD | TBD§ | | GCCcore, GCC |
-| iompi | 2022 | 11.2.0 | Intel TBD | OpenMPI TBD | TBD§ | | GCCcore, intel-compilers |
+| gpsmpi | 2021b | 11.2.0 | GCC 11.2.0 | ParaStationMPI 5.4.X | TBD§ | | GCCcore, GCC |
+| nvompic | 2021b | 11.2.0 | NVHPC TBD | OpenMPI TBD | TBD | | GCCcore, NVHPC |
+| npsmpic | 2021b | 11.2.0 | NVHPC TBD | ParaStationMPI 5.4.X | TBD | | GCCcore, NVHPC |
+| ipsmpi | 2021b | 11.2.0 | Intel TBD | ParaStationMPI 5.4.X | TBD§ | | GCCcore, intel-compilers |
+| iimpi | 2021b | 11.2.0 | Intel TBD | Intel MPI TBD | | | GCCcore, intel-compilers |
+| gompi | 2021b | 11.2.0 | GCC 11.2.0 | OpenMPI TBD | TBD§ | | GCCcore, GCC |
+| iompi | 2021b | 11.2.0 | Intel TBD | OpenMPI TBD | TBD§ | | GCCcore, intel-compilers |
- Compilers+MPI+Math
| Toolchain name | Toolchain version | Underlying GCC | Compiler | MPI | CUDA | Math libraries | Includes software from |
|-----------------|---------------------------|----------------|------------------|-------------------------|----------|----------------|---------------------------|
-| gpsmkl | 2022 | 11.2.0 | GCC 11.2.0 | ParaStationMPI 5.4.X | TBD§ | MKL TBD | GCCcore, GCC, gpsmpi |
-| gomkl | 2022 | 11.2.0 | GCC 11.2.0 | OpenMPI TBD | TBD§ | MKL TBD | GCCcore, GCC, gompi |
-| intel | 2022 | 11.2.0 | Intel TBD | Intel MPI TBD | | MKL TBD | GCCcore, GCC, iimpi |
-| intel-para | 2022 | 11.2.0 | Intel TBD | ParaStationMPI 5.4.X | | MKL TBD | GCCcore, GCC, ipsmpi |
-| iomkl | 2022 | 11.2.0 | Intel TBD | OpenMPI TBD | TBD§ | MKL TBD | GCCcore, GCC, iompi |
+| gpsmkl | 2021b | 11.2.0 | GCC 11.2.0 | ParaStationMPI 5.4.X | TBD§ | MKL TBD | GCCcore, GCC, gpsmpi |
+| gomkl | 2021b | 11.2.0 | GCC 11.2.0 | OpenMPI TBD | TBD§ | MKL TBD | GCCcore, GCC, gompi |
+| intel | 2021b | 11.2.0 | Intel TBD | Intel MPI TBD | | MKL TBD | GCCcore, GCC, iimpi |
+| intel-para | 2021b | 11.2.0 | Intel TBD | ParaStationMPI 5.4.X | | MKL TBD | GCCcore, GCC, ipsmpi |
+| iomkl | 2021b | 11.2.0 | Intel TBD | OpenMPI TBD | TBD§ | MKL TBD | GCCcore, GCC, iompi |
§ Not included in the toolchain just as dependency
diff --git a/Golden_Repo/g/gompi/gompi-2022.eb b/Golden_Repo/g/gompi/gompi-2021b.eb
similarity index 96%
rename from Golden_Repo/g/gompi/gompi-2022.eb
rename to Golden_Repo/g/gompi/gompi-2021b.eb
index daa38a66d..86988f972 100644
--- a/Golden_Repo/g/gompi/gompi-2022.eb
+++ b/Golden_Repo/g/gompi/gompi-2021b.eb
@@ -1,7 +1,7 @@
easyblock = "Toolchain"
name = 'gompi'
-version = '2022'
+version = '2021b'
homepage = '(none)'
description = """gcc and GFortran based compiler toolchain,
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
index b0ae5d684..db2f8c5b5 100644
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
+++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
@@ -31,7 +31,7 @@ builddependencies = [
dependencies = [
('zlib', '1.2.11'),
('hwloc', '2.5.0'),
- ('UCX', '1.11.1', '', SYSTEM),
+ ('UCX', '1.11.2', '', SYSTEM),
('CUDA', '11.4', '', SYSTEM),
('libevent', '2.1.12'),
]
diff --git a/Golden_Repo/u/UCX/UCX-1.11.1.eb b/Golden_Repo/u/UCX/UCX-1.11.2.eb
similarity index 95%
rename from Golden_Repo/u/UCX/UCX-1.11.1.eb
rename to Golden_Repo/u/UCX/UCX-1.11.2.eb
index 1cda9008b..4f551f94a 100644
--- a/Golden_Repo/u/UCX/UCX-1.11.1.eb
+++ b/Golden_Repo/u/UCX/UCX-1.11.2.eb
@@ -1,7 +1,7 @@
easyblock = 'ConfigureMake'
name = 'UCX'
-version = '1.11.1'
+version = '1.11.2'
homepage = 'https://www.openucx.org/'
description = """Unified Communication X
@@ -17,7 +17,7 @@ toolchainopts = {'pic': True}
source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
sources = ['%(namelower)s-%(version)s.tar.gz']
checksums = [
- '29338cad18858517f96b46ff83bdd259a5899e274792cebd269717c660aa86fd', # ucx-1.11.1.tar.gz
+ 'deebf86a5344fc2bd9e55449f88c650c4514928592807c9bc6fe4190e516c6df', # ucx-1.11.2.tar.gz
]
builddependencies = [
--
GitLab