Reformating

stacks/pinot-noir/packages_stack.yaml

@@ -16,16 +16,16 @@ packages:
       - spec: ^nvhpc+mpi
         when: '%nvhpc ^mpi'
 
-      - spec: '^openblas %gcc@12.3.0'
-        when: '%gcc@12.3.0 ^blas'
+      - spec: ^openblas
+        when: '%gcc ^blas'
 
-      - spec: '^openblas %gcc@12.3.0'
-        when: '%gcc@12.3.0 ^lapack'
+      - spec: ^openblas
+        when: '%gcc ^lapack'
 
-      - spec: '^intel-oneapi-mkl'
+      - spec: ^intel-oneapi-mkl
         when: '%oneapi ^blas'
 
-      - spec: '^intel-oneapi-mkl'
+      - spec: ^intel-oneapi-mkl
         when: '%oneapi ^lapack'
 
       - spec: ^nvhpc+blas
@@ -34,10 +34,10 @@ packages:
       - spec: ^nvhpc+lapack
         when: '%nvhpc ^lapack'
 
-      - spec: '^cuda %gcc@12.3.0'
+      - spec: ^cuda %gcc@12.3.0
         when: '%gcc@12.3.0 ^cuda'
 
-      - spec: '^cuda +allow-unsupported-compilers %oneapi'
+      - spec: ^cuda +allow-unsupported-compilers %oneapi
         when: '%oneapi ^cuda'
 
       - spec: "+ipo"
@@ -57,14 +57,14 @@ packages:
     - spec: '@5.4.10'
 
   hdf5:
-    variants: +hl +threadsafe +szip +cxx +fortran
+    require: ['+hl', '+threadsafe', '+szip', '+cxx', '+fortran']
 
   intel-oneapi-mkl:
     prefer: ['+cluster']
 
   libfabric:
     require:
-    - spec: fabrics=mlx,mrail,psm3,verbs,udp,tcp,sockets,shm
+    - spec: 'fabrics=mlx,mrail,psm3,verbs,udp,tcp,sockets,shm'
 
   llvm:
     prefer: ['~clang']

stacks/pinot-noir/spack.yaml

@@ -7,13 +7,15 @@ spack:
     # -------------------------------------------------------------------------
     # PE definition
     # -------------------------------------------------------------------------
-    - mpi_codes:
-        - osu-micro-benchmarks +graphing
-        - hdf5 +mpi
-        - petsc +mpi
+    - mpi_gcc_stable:
+        - openmpi
+    - mpi_oneapi_stable:
+        - intel_oneapi_mpi
 
-    - mpi_oneapi:
-        - intel-oneapi-mpi
+    - blas_gcc_stable:
+        - openblas
+    - blas_oneapi_stable:
+        - intel_oneapi_mkl
 
     # -------------------------------------------------------------------------
     # Core packages
@@ -30,22 +32,18 @@ spack:
         - 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
+    # Parallel codes
+    # -------------------------------------------------------------------------
+    - mpi_codes:
+        - osu-micro-benchmarks +graphing
+        - hdf5 +mpi
+        - petsc +mpi
 
     # -------------------------------------------------------------------------
     # Generic definitions
     # -------------------------------------------------------------------------
     - mpis:
-        - $mpi_oneapi
+        - $mpi_oneapi_stable
         - $mpi_gcc_stable