From e53ba73e81f9002cd0ca056f92a790a51c655ee4 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Tue, 30 Jul 2024 19:41:49 +0200
Subject: [PATCH] Noving configs around

---
 stacks/pinot-noir/definitions_cuda.yaml   | 1 +
 stacks/pinot-noir/packages_kuma-h100.yaml | 4 +++-
 stacks/pinot-noir/packages_stack.yaml     | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/stacks/pinot-noir/definitions_cuda.yaml b/stacks/pinot-noir/definitions_cuda.yaml
index 6cbc7ee..eac7dc9 100644
--- a/stacks/pinot-noir/definitions_cuda.yaml
+++ b/stacks/pinot-noir/definitions_cuda.yaml
@@ -5,6 +5,7 @@ definitions:
       - cuda
       - cudnn
       - nccl
+      - nccl-tests
 
   - cuda_mpi_codes:
       - nvshmem
diff --git a/stacks/pinot-noir/packages_kuma-h100.yaml b/stacks/pinot-noir/packages_kuma-h100.yaml
index 262d066..b02e641 100644
--- a/stacks/pinot-noir/packages_kuma-h100.yaml
+++ b/stacks/pinot-noir/packages_kuma-h100.yaml
@@ -18,6 +18,8 @@ packages:
       when: "%gcc"
     - spec: "%gcc@12.3.0 target=zen4"
       when: "%gcc"
+    require:
+    - '@12.4.0'
 
   hypre:
     require:
@@ -38,7 +40,7 @@ packages:
       - spec: '+cuda cuda_arch=90'
 
   papi:
-    require: ['+nvml', '+infiniband']
+    require: ['+nvml', '+infiniband', '+cuda']
 
   petsc:
     require:
diff --git a/stacks/pinot-noir/packages_stack.yaml b/stacks/pinot-noir/packages_stack.yaml
index 7b75807..48a4adc 100644
--- a/stacks/pinot-noir/packages_stack.yaml
+++ b/stacks/pinot-noir/packages_stack.yaml
@@ -34,7 +34,6 @@ packages:
 
   cuda:
     require:
-    - spec: '@12.4.0'
     - spec: '+allow-unsupported-compilers'
       when: '%oneapi'
 
-- 
GitLab