Merge branch 'main' of gitlab.epfl.ch:SCITAS/software-stack/scitas-software-stacks

stacks/pinot-noir-gcc/spack.yaml

@@ -5,7 +5,7 @@ spack:
       - packages_stack.yaml
       - packages_env.yaml
 
-      - modules_stack.yaml
+      - modules_env.yaml
 
       - definitions_env.yaml
 
@@ -18,21 +18,12 @@ spack:
     - mpi_gcc:
         - openmpi@5.0.3
 
-    - mpi_oneapi:
-        - intel-oneapi-mpi@2021.12.1
-
     - blas_gcc:
         - openblas@0.3.26
 
-    - blas_oneapi:
-        - intel-oneapi-mkl@2024.1.0
-
     - python_gcc:
         - python@3.11.7
 
-    - python_oneapi:
-        - python@3.11.7
-
     # -------------------------------------------------------------------------
     # Core packages
     # -------------------------------------------------------------------------
@@ -74,30 +65,14 @@ spack:
 
     - cuda_serial_codes: []
 
-
-    # -------------------------------------------------------------------------
-    # Generic definitions
-    # -------------------------------------------------------------------------
-    - mpis:
-        - $mpi_oneapi
-        - $mpi_gcc
-
   specs:
     - matrix:
         - [$compilers_specs]
 
-    - matrix:
-        - [$blas_oneapi]
-        - [$%compiler_oneapi]
-
     - matrix:
         - [$blas_gcc]
         - [$%compiler_gcc]
 
-    - matrix:
-        - [$mpi_oneapi]
-        - [$%compiler_oneapi]
-
     - matrix:
         - [$mpi_gcc]
         - [$%compiler_gcc]
@@ -114,14 +89,6 @@ spack:
         - [$serial_codes]
         - [$%compilers]
 
-    - matrix:
-        - [$gcc_serial_codes]
-        - [$%compiler_gcc]
-
-    - matrix:
-        - [$oneapi_serial_codes]
-        - [$%compiler_oneapi]
-
     - matrix:
         - [$cuda_serial_codes]
         - [$%compiler_gcc]