From 54e485a3bf789a78d0b6bf6a95a48f3fe7f11f5f Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Wed, 12 Jun 2024 14:33:25 +0200
Subject: [PATCH] Changing cuda version

---
 stacks/pinot-noir/packages.yaml |  5 +----
 stacks/pinot-noir/spack.yaml    | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/stacks/pinot-noir/packages.yaml b/stacks/pinot-noir/packages.yaml
index bccb26d..e7c391a 100644
--- a/stacks/pinot-noir/packages.yaml
+++ b/stacks/pinot-noir/packages.yaml
@@ -42,10 +42,7 @@ packages:
 
   cuda:
     require:
-    - spec: '@12.4.0'
-
-  # cuda:
-  #   variants: "+allow-unsupported-compilers"
+    - spec: '@12.3.2'
 
   hdf5:
     variants: +hl +threadsafe +szip +cxx +fortran
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index 0ef75a9..e38b9df 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -12,12 +12,6 @@ spack:
 
     - mpi_oneapi:
         - intel-oneapi-mpi
-    - when: env['environment'] in ['helvetios']
-      mpi_gcc_stable:
-        - openmpi
-    - when: env['environment'] in ['izar', 'jed']
-      mpi_gcc_stable:
-        - openmpi +cuda
 
     # -------------------------------------------------------------------------
     # Serial codes
@@ -26,6 +20,18 @@ spack:
         - python
         - hdf5 ~mpi
 
+    # -------------------------------------------------------------------------
+    # Environment specific
+    - when: env['environment'] in ['helvetios']
+      mpi_gcc_stable:
+        - openmpi
+    - when: env['environment'] in ['izar', 'jed']
+      mpi_gcc_stable:
+        - openmpi +cuda
+    - when: env['environment'] in ['izar', 'jed']
+      serial_codes:
+        - cuda
+
     # -------------------------------------------------------------------------
     # Generic definitions
     # -------------------------------------------------------------------------
@@ -33,6 +39,7 @@ spack:
         - $mpi_oneapi
         - $mpi_gcc_stable
 
+
   specs:
     - matrix:
         - [$compilers_specs]
-- 
GitLab