From d12140d26fcca9397e87f7f386c77bffc1a94f8a Mon Sep 17 00:00:00 2001
From: Sebastian Achilles <s.achilles@fz-juelich.de>
Date: Wed, 6 Oct 2021 08:51:42 +0200
Subject: [PATCH] add toolchain iomkl/2021b
---
Golden_Repo/i/iomkl/iomkl-2021b.eb | 5 ++---
Golden_Repo/i/iompi/iompi-2021b.eb | 6 ++----
...-11.2.0.eb => OpenMPI-4.1.1-intel-compilers-2021.4.0.eb} | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
rename Golden_Repo/o/OpenMPI/{OpenMPI-4.1.1-intel-compilers-2021.4.0-GCC-11.2.0.eb => OpenMPI-4.1.1-intel-compilers-2021.4.0.eb} (96%)
diff --git a/Golden_Repo/i/iomkl/iomkl-2021b.eb b/Golden_Repo/i/iomkl/iomkl-2021b.eb
index e32424be3..6979a5df8 100644
--- a/Golden_Repo/i/iomkl/iomkl-2021b.eb
+++ b/Golden_Repo/i/iomkl/iomkl-2021b.eb
@@ -5,7 +5,6 @@ version = '2021b'
versionsuffix = ''
local_intelversion = '2021.4.0'
-local_intelsuffix = '-GCC-11.2.0'
homepage = ''
description = """iomkl provides Intel C/C++ and Fortran compilers, ParaStationMPI & Intel MKL.
@@ -14,9 +13,9 @@ description = """iomkl provides Intel C/C++ and Fortran compilers, ParaStationMP
toolchain = SYSTEM
dependencies = [
- ('intel-compilers', local_intelversion, local_intelsuffix),
+ ('intel-compilers', local_intelversion),
('OpenMPI', '4.1.1', versionsuffix,
- ('intel-compilers', local_intelversion + local_intelsuffix)),
+ ('intel-compilers', local_intelversion)),
('imkl', local_intelversion, versionsuffix, ('iompi', version)),
]
diff --git a/Golden_Repo/i/iompi/iompi-2021b.eb b/Golden_Repo/i/iompi/iompi-2021b.eb
index a4d619aa0..f5aae5c97 100644
--- a/Golden_Repo/i/iompi/iompi-2021b.eb
+++ b/Golden_Repo/i/iompi/iompi-2021b.eb
@@ -10,11 +10,9 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
toolchain = SYSTEM
local_compver = '2021.4.0'
-local_gccsuffix = '-GCC-11.2.0'
dependencies = [
- ('intel-compilers', '%s%s' % (local_compver, local_gccsuffix)),
- ('OpenMPI', '4.1.1', '', ('intel-compilers', '%s%s' %
- (local_compver, local_gccsuffix))),
+ ('intel-compilers', local_comp_ver),
+ ('OpenMPI', '4.1.1', '', ('intel-compilers', local_compver)),
]
moduleclass = 'toolchain'
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0-GCC-11.2.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
similarity index 96%
rename from Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0-GCC-11.2.0.eb
rename to Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
index efd0e0566..6d4a8f88a 100644
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0-GCC-11.2.0.eb
+++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
@@ -6,7 +6,7 @@ version = '4.1.1'
homepage = 'https://www.open-mpi.org/'
description = """The Open MPI Project is an open source MPI-3 implementation."""
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0-GCC-11.2.0'}
+toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
toolchainopts = {'pic': True}
source_urls = [
--
GitLab