From d0888dcd62e906e0b32f3f200da8ffebf3b8d037 Mon Sep 17 00:00:00 2001
From: Damian Alvarez <swmanage@jwlogin07.juwels>
Date: Fri, 23 Sep 2022 17:55:04 +0200
Subject: [PATCH] To push CUDA down again and align with upstream
---
.../c/CUDA/{CUDA-11.7-GCCcore-11.3.0.eb => CUDA-11.7.eb} | 2 +-
Golden_Repo/n/NCCL/NCCL-default-GCCcore-11.3.0-CUDA-11.7.eb | 2 +-
Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb | 2 +-
Golden_Repo/p/pscom/pscom-5.6-default-GCCcore-11.3.0.eb | 2 +-
Golden_Repo/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb | 2 +-
Golden_Repo/u/UCC/UCC-default-GCCcore-11.3.0.eb | 2 +-
Golden_Repo/u/UCX/UCX-default-GCCcore-11.3.0.eb | 2 +-
Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb | 2 +-
Overlays/hdfml_overlay/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
rename Golden_Repo/c/CUDA/{CUDA-11.7-GCCcore-11.3.0.eb => CUDA-11.7.eb} (95%)
diff --git a/Golden_Repo/c/CUDA/CUDA-11.7-GCCcore-11.3.0.eb b/Golden_Repo/c/CUDA/CUDA-11.7.eb
similarity index 95%
rename from Golden_Repo/c/CUDA/CUDA-11.7-GCCcore-11.3.0.eb
rename to Golden_Repo/c/CUDA/CUDA-11.7.eb
index 71bcc4a7f..cfe1d35e9 100644
--- a/Golden_Repo/c/CUDA/CUDA-11.7-GCCcore-11.3.0.eb
+++ b/Golden_Repo/c/CUDA/CUDA-11.7.eb
@@ -8,7 +8,7 @@ description = """CUDA (formerly Compute Unified Device Architecture) is a parall
graphics processing units (GPUs) that they produce. CUDA gives developers access
to the virtual instruction set and memory of the parallel computational elements in CUDA GPUs."""
-toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
+toolchain = SYSTEM
source_urls = ['https://developer.download.nvidia.com/compute/cuda/%(version)s.0/local_installers/']
sources = ['cuda_%%(version)s.0_%s_linux%%(cudaarch)s.run' % local_nv_version]
diff --git a/Golden_Repo/n/NCCL/NCCL-default-GCCcore-11.3.0-CUDA-11.7.eb b/Golden_Repo/n/NCCL/NCCL-default-GCCcore-11.3.0-CUDA-11.7.eb
index c4d737940..24917e56d 100644
--- a/Golden_Repo/n/NCCL/NCCL-default-GCCcore-11.3.0-CUDA-11.7.eb
+++ b/Golden_Repo/n/NCCL/NCCL-default-GCCcore-11.3.0-CUDA-11.7.eb
@@ -24,7 +24,7 @@ checksums = ['8108e00bcf995666330484cf24a5cc52c3a392acaa5aeabf88e2e168e07c291d']
builddependencies = [('binutils', '2.38')]
dependencies = [
- ('CUDA', '11.7'),
+ ('CUDA', '11.7', '', SYSTEM),
('UCX', 'default'),
]
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
index cd874fab1..6b2112842 100644
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
+++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
@@ -35,7 +35,7 @@ dependencies = [
('zlib', '1.2.12'),
('hwloc', '2.7.1'),
('UCX', 'default'),
- ('CUDA', '11.7'),
+ ('CUDA', '11.7', '', SYSTEM),
('libevent', '2.1.12'),
('PMIx', '3.2.3'), # We rely on this version since it is the newest supported by psmgmt
('UCC', 'default'),
diff --git a/Golden_Repo/p/pscom/pscom-5.6-default-GCCcore-11.3.0.eb b/Golden_Repo/p/pscom/pscom-5.6-default-GCCcore-11.3.0.eb
index 0ae6c96fc..1c6469d2b 100644
--- a/Golden_Repo/p/pscom/pscom-5.6-default-GCCcore-11.3.0.eb
+++ b/Golden_Repo/p/pscom/pscom-5.6-default-GCCcore-11.3.0.eb
@@ -18,7 +18,7 @@ checksums = ['b7c12b434c777e49c62ce0edbae830176f5627fe6f50170774669125d1940272']
builddependencies = [
('binutils', '2.38'),
('popt', '1.18'),
- ('CUDA', '11.7'),
+ ('CUDA', '11.7', '', SYSTEM),
('CMake', '3.23.1'),
]
diff --git a/Golden_Repo/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb b/Golden_Repo/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
index a76f7c52e..26f4f9221 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
@@ -24,7 +24,7 @@ dependencies = [
# needed due to the inclusion of hwloc
('libxml2', '2.9.13'),
# Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
- ('CUDA', '11.7')
+ ('CUDA', '11.7', '', SYSTEM)
]
patches = [
diff --git a/Golden_Repo/u/UCC/UCC-default-GCCcore-11.3.0.eb b/Golden_Repo/u/UCC/UCC-default-GCCcore-11.3.0.eb
index a7520f1a5..83800c1be 100644
--- a/Golden_Repo/u/UCC/UCC-default-GCCcore-11.3.0.eb
+++ b/Golden_Repo/u/UCC/UCC-default-GCCcore-11.3.0.eb
@@ -31,7 +31,7 @@ builddependencies = [
dependencies = [
('UCX', 'default'),
- ('CUDA', '11.7'),
+ ('CUDA', '11.7', '', SYSTEM),
('NCCL', 'default', '-CUDA-%(cudashortver)s'),
]
diff --git a/Golden_Repo/u/UCX/UCX-default-GCCcore-11.3.0.eb b/Golden_Repo/u/UCX/UCX-default-GCCcore-11.3.0.eb
index 4912e2ab2..f1965353e 100644
--- a/Golden_Repo/u/UCX/UCX-default-GCCcore-11.3.0.eb
+++ b/Golden_Repo/u/UCX/UCX-default-GCCcore-11.3.0.eb
@@ -28,7 +28,7 @@ osdependencies = [OS_PKG_IBVERBS_DEV]
dependencies = [
('zlib', '1.2.12'),
('numactl', '2.0.15'),
- ('CUDA', '11.7'),
+ ('CUDA', '11.7', '', SYSTEM),
]
configopts = '--with-verbs ' # Build OpenFabrics support
diff --git a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
index 02760fa46..39982bce8 100644
--- a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
+++ b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
@@ -35,7 +35,7 @@ dependencies = [
('zlib', '1.2.12'),
('hwloc', '2.7.1'),
('UCX', 'default'),
- ('CUDA', '11.7'),
+ ('CUDA', '11.7', '', SYSTEM),
('libevent', '2.1.12'),
('PMIx', '3.2.3'), # We rely on this version since it is the newest supported by psmgmt
('UCC', 'default'),
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
index d8f50653d..341924da8 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
@@ -22,7 +22,7 @@ dependencies = [
# needed due to the inclusion of hwloc
('libxml2', '2.9.13'),
# Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
- ('CUDA', '11.7')
+ ('CUDA', '11.7', '', SYSTEM)
]
patches = [
--
GitLab