From 3b700aa777b9ade1032e4c61fffe2285fcf3c2c3 Mon Sep 17 00:00:00 2001
From: Damian Alvarez <d.alvarez@fz-juelich.de>
Date: Fri, 23 Sep 2022 10:33:25 +0200
Subject: [PATCH] To pull up all the packages that made it to GCCcore after
pulling up also pscom
---
Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb | 2 +-
Golden_Repo/n/NCCL/NCCL-default-GCCcore-11.3.0-CUDA-11.7.eb | 4 ++--
Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb | 4 ++--
Golden_Repo/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb | 4 ++--
Golden_Repo/u/UCC/UCC-default-GCCcore-11.3.0.eb | 4 ++--
Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb | 4 ++--
Overlays/hdfml_overlay/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb b/Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb
index b0427412f..bd30b42db 100644
--- a/Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb
+++ b/Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb
@@ -27,7 +27,7 @@ builddependencies = [
]
dependencies = [
- ('numactl', '2.0.15', '', SYSTEM),
+ ('numactl', '2.0.15'),
('libxml2', '2.9.13'),
('libpciaccess', '0.16'),
]
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 00fc8cb66..c4d737940 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,8 +24,8 @@ checksums = ['8108e00bcf995666330484cf24a5cc52c3a392acaa5aeabf88e2e168e07c291d']
builddependencies = [('binutils', '2.38')]
dependencies = [
- ('CUDA', '11.7', '', True),
- ('UCX', 'default', '', SYSTEM),
+ ('CUDA', '11.7'),
+ ('UCX', 'default'),
]
moduleclass = 'lib'
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 0a60cc3de..cd874fab1 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
@@ -34,8 +34,8 @@ builddependencies = [
dependencies = [
('zlib', '1.2.12'),
('hwloc', '2.7.1'),
- ('UCX', 'default', '', SYSTEM),
- ('CUDA', '11.7', '', SYSTEM),
+ ('UCX', 'default'),
+ ('CUDA', '11.7'),
('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/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 4ce432c49..a76f7c52e 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
@@ -20,11 +20,11 @@ checksums = [
]
dependencies = [
- ('pscom', '5.6-default', '', SYSTEM),
+ ('pscom', '5.6-default'),
# 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.0', '', SYSTEM)
+ ('CUDA', '11.7')
]
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 66990644f..a7520f1a5 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
@@ -30,8 +30,8 @@ builddependencies = [
]
dependencies = [
- ('UCX', 'default', '', SYSTEM),
- ('CUDA', '11.7', '', SYSTEM),
+ ('UCX', 'default'),
+ ('CUDA', '11.7'),
('NCCL', 'default', '-CUDA-%(cudashortver)s'),
]
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 f02498ff1..02760fa46 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
@@ -34,8 +34,8 @@ builddependencies = [
dependencies = [
('zlib', '1.2.12'),
('hwloc', '2.7.1'),
- ('UCX', 'default', '', SYSTEM),
- ('CUDA', '11.7', '', SYSTEM),
+ ('UCX', 'default'),
+ ('CUDA', '11.7'),
('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 8802bddf1..d8f50653d 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
@@ -18,11 +18,11 @@ checksums = [
]
dependencies = [
- ('pscom', '5.6-default', '', SYSTEM),
+ ('pscom', '5.6-default'),
# 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.0', '', SYSTEM)
+ ('CUDA', '11.7')
]
patches = [
--
GitLab