A bit of cleaning and moving things around

stacks/pinot-noir/config.json

@@ -63,6 +63,7 @@
             "ca-certificates-mozilla",
             "check",
             "cmake",
+            "cuda",
             "diffutils",
             "expat",
             "findutils",

stacks/pinot-noir/packages_jed.yaml

@@ -2,19 +2,17 @@ packages:
   all:
     target: ["icelake"]
     require:
-      - spec: ^openmpi +cuda target=icelake
+      - spec: ^openmpi target=icelake
         when: '%gcc ^mpi'
 
       - spec: cuda_arch=90 target=icelake
         when: '+cuda'
 
-      - spec: "^cuda target=icelake"
-        when: '^cuda'
-
       - spec: '~cuda'
         when: '%oneapi'
 
-      - '+cuda'
+      - spec: '+cuda'
+        when: '%gcc'
 
   ucx:
     require:

stacks/pinot-noir/packages_stack.yaml

@@ -34,12 +34,6 @@ packages:
       - spec: ^nvhpc+lapack
         when: '%nvhpc ^lapack'
 
-      - spec: ^cuda %gcc@12.3.0
-        when: '%gcc@12.3.0 ^cuda'
-
-      - spec: ^cuda +allow-unsupported-compilers %oneapi
-        when: '%oneapi ^cuda'
-
       - spec: "+ipo"
         when: '%gcc'
 

stacks/pinot-noir/spack.yaml

@@ -10,12 +10,12 @@ spack:
     - mpi_gcc:
         - openmpi
     - mpi_oneapi:
-        - intel_oneapi_mpi
+        - intel-oneapi-mpi
 
     - blas_gcc:
         - openblas
     - blas_oneapi:
-        - intel_oneapi_mkl
+        - intel-oneapi-mkl
 
     # -------------------------------------------------------------------------
     # Core packages