From 77d83065f85c68da96037e576b13f76acefc4535 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Tue, 13 Aug 2024 10:22:42 +0200
Subject: [PATCH] Correcting hcoll on izar
---
ci/fuse-overlayfs.sh | 15 +++++++--------
ci/squashfuse_ll.sh | 4 ++--
stacks/pinot-noir/packages_acc_cuda.yaml | 2 +-
stacks/pinot-noir/packages_kuma-h100.yaml | 3 +++
stacks/pinot-noir/packages_kuma-l40s.yaml | 3 +++
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/ci/fuse-overlayfs.sh b/ci/fuse-overlayfs.sh
index 5206e93..29ebc1a 100755
--- a/ci/fuse-overlayfs.sh
+++ b/ci/fuse-overlayfs.sh
@@ -3,14 +3,13 @@
suffix=$1
mount_point=$2
-
-echo "fuse-overlayfs"
-echo " -o squash_to_uid=$(id -u)"
-echo " -o squash_to_gid=$(id -g)"
-echo " -o lowerdir=/overlayfs/lower-${suffix}"
-echo " -o upperdir=/overlayfs/upper-${suffix}"
-echo " -o workdir=/overlayfs/wd-${suffix}"
-echo " $mount_point"
+#echo "fuse-overlayfs"
+#echo " -o squash_to_uid=$(id -u)"
+#echo " -o squash_to_gid=$(id -g)"
+#echo " -o lowerdir=/overlayfs/lower-${suffix}"
+#echo " -o upperdir=/overlayfs/upper-${suffix}"
+#echo " -o workdir=/overlayfs/wd-${suffix}"
+#echo " $mount_point"
#/usr/libexec/apptainer/bin/fuse-overlayfs \
fuse-overlayfs \
diff --git a/ci/squashfuse_ll.sh b/ci/squashfuse_ll.sh
index df95975..518ad07 100755
--- a/ci/squashfuse_ll.sh
+++ b/ci/squashfuse_ll.sh
@@ -17,7 +17,7 @@ do
mkdir -p ${CI_DATA}/overlayfs/$i-${suffix}
done
-echo "Preparing overlay fs at ${CI_DATA}/overlayfs"
-echo "squashfuse_ll $sqfs_image $mount_point"
+#echo "Preparing overlay fs at ${CI_DATA}/overlayfs"
+#echo "squashfuse_ll $sqfs_image $mount_point"
/usr/libexec/apptainer/bin/squashfuse_ll $sqfs_image $mount_point
diff --git a/stacks/pinot-noir/packages_acc_cuda.yaml b/stacks/pinot-noir/packages_acc_cuda.yaml
index ae5b5aa..4d632b9 100644
--- a/stacks/pinot-noir/packages_acc_cuda.yaml
+++ b/stacks/pinot-noir/packages_acc_cuda.yaml
@@ -40,7 +40,7 @@ packages:
- spec: '+cuda cuda_arch={cuda_arch} +ibgda +nccl +ucx +mpi'
openmpi:
- require: ['+cuda', 'cuda_arch={cuda_arch}', 'fabrics=hcoll']
+ require: ['+cuda', 'cuda_arch={cuda_arch}']
papi:
require: ['+nvml', '+infiniband', '+cuda']
diff --git a/stacks/pinot-noir/packages_kuma-h100.yaml b/stacks/pinot-noir/packages_kuma-h100.yaml
index fb57649..0c5dc3c 100644
--- a/stacks/pinot-noir/packages_kuma-h100.yaml
+++ b/stacks/pinot-noir/packages_kuma-h100.yaml
@@ -2,6 +2,9 @@ packages:
cp2k:
require: ['+cuda', 'cuda_arch=90']
+ openmpi:
+ require: ['fabrics=hcoll']
+
# ---------------------------------------------------------------------------
# Externals
# ---------------------------------------------------------------------------
diff --git a/stacks/pinot-noir/packages_kuma-l40s.yaml b/stacks/pinot-noir/packages_kuma-l40s.yaml
index 31774ed..bdcfdcf 100644
--- a/stacks/pinot-noir/packages_kuma-l40s.yaml
+++ b/stacks/pinot-noir/packages_kuma-l40s.yaml
@@ -6,6 +6,9 @@ packages:
dbcsr:
require: ['~cuda']
+ openmpi:
+ require: ['fabrics=hcoll']
+
# ---------------------------------------------------------------------------
# Externals
# ---------------------------------------------------------------------------
--
GitLab