From 2e180df633b4439d6ab841f794b37e3054581e40 Mon Sep 17 00:00:00 2001
From: Damian Alvarez <swmanage@jwlogin08.juwels>
Date: Wed, 2 Jun 2021 09:44:22 +0200
Subject: [PATCH] Modify the NVHPC packages to upgrade them to 21.5

---
 Golden_Repo/README.md                                         | 4 ++--
 .../{NVHPC-21.4-GCC-10.3.0.eb => NVHPC-21.5-GCC-10.3.0.eb}    | 4 ++--
 Golden_Repo/n/npsmpic/npsmpic-2021.eb                         | 2 +-
 ...4-GCC-10.3.0.eb => OpenMPI-4.1.1-NVHPC-21.5-GCC-10.3.0.eb} | 2 +-
 ...4-GCC-10.3.0.eb => psmpi-5.4.9-1-NVHPC-21.5-GCC-10.3.0.eb} | 2 +-
 ...4-GCC-10.3.0.eb => OpenMPI-4.1.1-NVHPC-21.5-GCC-10.3.0.eb} | 2 +-
 ...4-GCC-10.3.0.eb => psmpi-5.4.9-1-NVHPC-21.5-GCC-10.3.0.eb} | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename Golden_Repo/n/NVHPC/{NVHPC-21.4-GCC-10.3.0.eb => NVHPC-21.5-GCC-10.3.0.eb} (97%)
 rename Golden_Repo/o/OpenMPI/{OpenMPI-4.1.1-NVHPC-21.4-GCC-10.3.0.eb => OpenMPI-4.1.1-NVHPC-21.5-GCC-10.3.0.eb} (96%)
 rename Golden_Repo/p/psmpi/{psmpi-5.4.9-1-NVHPC-21.4-GCC-10.3.0.eb => psmpi-5.4.9-1-NVHPC-21.5-GCC-10.3.0.eb} (96%)
 rename Overlays/hdfml_overlay/o/OpenMPI/{OpenMPI-4.1.1-NVHPC-21.4-GCC-10.3.0.eb => OpenMPI-4.1.1-NVHPC-21.5-GCC-10.3.0.eb} (96%)
 rename Overlays/hdfml_overlay/p/psmpi/{psmpi-5.4.9-1-NVHPC-21.4-GCC-10.3.0.eb => psmpi-5.4.9-1-NVHPC-21.5-GCC-10.3.0.eb} (96%)

diff --git a/Golden_Repo/README.md b/Golden_Repo/README.md
index e13c741bf..c2dd03cce 100644
--- a/Golden_Repo/README.md
+++ b/Golden_Repo/README.md
@@ -16,7 +16,7 @@ The table below shows the details of the toolchains in the 2020 stage:
 | NVHPC           | 21.1-GCC-9.3.0            | 9.3.0          | NVHPC 21.1       |                         | 11.0.X§  |                | GCCcore                   |
 | iccifort        | 2020.2.254-GCC-9.3.0      | 9.3.0          | Intel 2020.2.254 |                         |          |                | GCCcore                   |
 | GCC             | 10.3.0                    | 10.3.0         | GCC 10.3.0       |                         |          |                | GCCcore                   |
-| NVHPC           | 21.4-GCC-10.3.0           | 10.3.0         | NVHPC 21.4       |                         | 11.3.X§  |                | GCCcore                   |
+| NVHPC           | 21.5-GCC-10.3.0           | 10.3.0         | NVHPC 21.5       |                         | 11.3.X§  |                | GCCcore                   |
 | intel-compilers | 2021.2.0-GCC-10.3.0       | 10.3.0         | Intel 2021.2.0   |                         |          |                | GCCcore                   |
 
 - Compilers+MPI
@@ -32,7 +32,7 @@ The table below shows the details of the toolchains in the 2020 stage:
 | gompi           | 2020                      | 9.3.0          | GCC 9.3.0        | OpenMPI 4.1.0rc1        | 11.0.X§  |                | GCCcore, GCC              |
 | iompi           | 2020                      | 9.3.0          | Intel 2020.2.254 | OpenMPI 4.1.0rc1        | 11.0.X§  |                | GCCcore, iccifort         |
 | gpsmpi          | 2021                      | 10.3.0         | GCC 10.3.0       | ParaStationMPI 5.4.X    | 11.3.X§  |                | GCCcore, GCC              |
-| npsmpic         | 2021                      | 10.3.0         | NVHPC 21.4       | ParaStationMPI 5.4.X    | 11.3.X   |                | GCCcore, NVHPC            |
+| npsmpic         | 2021                      | 10.3.0         | NVHPC 21.5       | ParaStationMPI 5.4.X    | 11.3.X   |                | GCCcore, NVHPC            |
 | ipsmpi          | 2021                      | 10.3.0         | Intel 2021.2.0   | ParaStationMPI 5.4.X    | 11.3.X§  |                | GCCcore, intel-compilers  |
 | iimpi           | 2021                      | 10.3.0         | Intel 2021.2.0   | Intel MPI 2021.2.0      |          |                | GCCcore, intel-compilers  |
 | gompi           | 2021                      | 10.3.0         | GCC 10.3.0       | OpenMPI 4.1.1           | 11.3.X§  |                | GCCcore, GCC              |
diff --git a/Golden_Repo/n/NVHPC/NVHPC-21.4-GCC-10.3.0.eb b/Golden_Repo/n/NVHPC/NVHPC-21.5-GCC-10.3.0.eb
similarity index 97%
rename from Golden_Repo/n/NVHPC/NVHPC-21.4-GCC-10.3.0.eb
rename to Golden_Repo/n/NVHPC/NVHPC-21.5-GCC-10.3.0.eb
index adcf1a04b..b81417b84 100644
--- a/Golden_Repo/n/NVHPC/NVHPC-21.4-GCC-10.3.0.eb
+++ b/Golden_Repo/n/NVHPC/NVHPC-21.5-GCC-10.3.0.eb
@@ -2,7 +2,7 @@
 import os as local_os
 
 name = 'NVHPC'
-version = '21.4'
+version = '21.5'
 local_gccver = '10.3.0'
 versionsuffix = f'-GCC-{local_gccver}'
 
@@ -20,7 +20,7 @@ sources = [local_tarball_tmpl % '%(arch)s']
 checksums = [
     {
         local_tarball_tmpl % 'x86_64':
-            '391d5604a70f61bdd4ca6a3e4692f6f2391948990c8a35c395b6867341890031',
+            '21989e52c58a6914743631c8200de1fec7e10b3449c6c1833f3032ee74b85f8e',
     }
 ]
 
diff --git a/Golden_Repo/n/npsmpic/npsmpic-2021.eb b/Golden_Repo/n/npsmpic/npsmpic-2021.eb
index 5909d0bec..5b94e35a9 100644
--- a/Golden_Repo/n/npsmpic/npsmpic-2021.eb
+++ b/Golden_Repo/n/npsmpic/npsmpic-2021.eb
@@ -10,7 +10,7 @@ site_contacts = 'sc@fz-juelich.de'
 
 toolchain = SYSTEM
 
-local_compiler = ('NVHPC', '21.4-GCC-10.3.0')
+local_compiler = ('NVHPC', '21.5-GCC-10.3.0')
 
 dependencies = [
     local_compiler,
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.4-GCC-10.3.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.5-GCC-10.3.0.eb
similarity index 96%
rename from Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.4-GCC-10.3.0.eb
rename to Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.5-GCC-10.3.0.eb
index 0b22ac110..3e98dfaaa 100644
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.4-GCC-10.3.0.eb
+++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.5-GCC-10.3.0.eb
@@ -8,7 +8,7 @@ description = """The Open MPI Project is an open source MPI-3 implementation."""
 
 site_contacts = 'sc@fz-juelich.de'
 
-toolchain = {'name': 'NVHPC', 'version': '21.4-GCC-10.3.0'}
+toolchain = {'name': 'NVHPC', 'version': '21.5-GCC-10.3.0'}
 toolchainopts = {'pic': True}
 
 source_urls = [
diff --git a/Golden_Repo/p/psmpi/psmpi-5.4.9-1-NVHPC-21.4-GCC-10.3.0.eb b/Golden_Repo/p/psmpi/psmpi-5.4.9-1-NVHPC-21.5-GCC-10.3.0.eb
similarity index 96%
rename from Golden_Repo/p/psmpi/psmpi-5.4.9-1-NVHPC-21.4-GCC-10.3.0.eb
rename to Golden_Repo/p/psmpi/psmpi-5.4.9-1-NVHPC-21.5-GCC-10.3.0.eb
index 1078e6485..04e5b05a2 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.4.9-1-NVHPC-21.4-GCC-10.3.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.4.9-1-NVHPC-21.5-GCC-10.3.0.eb
@@ -9,7 +9,7 @@ various batch systems for tighter process control.
 
 site_contacts = 'sc@fz-juelich.de'
 
-toolchain = {'name': 'NVHPC', 'version': '21.4-GCC-10.3.0'}
+toolchain = {'name': 'NVHPC', 'version': '21.5-GCC-10.3.0'}
 
 sources = ['%(version)s.tar.gz']
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
diff --git a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.4-GCC-10.3.0.eb b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.5-GCC-10.3.0.eb
similarity index 96%
rename from Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.4-GCC-10.3.0.eb
rename to Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.5-GCC-10.3.0.eb
index b3cc79ea0..9d9f437bf 100644
--- a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.4-GCC-10.3.0.eb
+++ b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.5-GCC-10.3.0.eb
@@ -8,7 +8,7 @@ description = """The Open MPI Project is an open source MPI-3 implementation."""
 
 site_contacts = 'sc@fz-juelich.de'
 
-toolchain = {'name': 'NVHPC', 'version': '21.4-GCC-10.3.0'}
+toolchain = {'name': 'NVHPC', 'version': '21.5-GCC-10.3.0'}
 toolchainopts = {'pic': True}
 
 source_urls = [
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.4.9-1-NVHPC-21.4-GCC-10.3.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.4.9-1-NVHPC-21.5-GCC-10.3.0.eb
similarity index 96%
rename from Overlays/hdfml_overlay/p/psmpi/psmpi-5.4.9-1-NVHPC-21.4-GCC-10.3.0.eb
rename to Overlays/hdfml_overlay/p/psmpi/psmpi-5.4.9-1-NVHPC-21.5-GCC-10.3.0.eb
index f77cd74ed..36e6ee76a 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.4.9-1-NVHPC-21.4-GCC-10.3.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.4.9-1-NVHPC-21.5-GCC-10.3.0.eb
@@ -9,7 +9,7 @@ various batch systems for tighter process control.
 
 site_contacts = 'sc@fz-juelich.de'
 
-toolchain = {'name': 'NVHPC', 'version': '21.4-GCC-10.3.0'}
+toolchain = {'name': 'NVHPC', 'version': '21.5-GCC-10.3.0'}
 
 sources = ['%(version)s.tar.gz']
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-- 
GitLab