Trying to refine the PE definition

.gitlab-ci.yml

@@ -85,12 +85,14 @@ spack:install_compilers:
     - source ci/stack_env.sh
     - ${STACK_LOCATION}/spack/bin/spack -e ${SPACK_SYSTEM_CONFIG_PATH} config blame compilers
   after_script:
-    - if [ ! -e spack-install.xml ]; then
-        echo "{}" > spack-install.xml
+    - if [ ! -e spack-install-compilers.xml ]; then
+        echo "{}" > ${MOUNT_POINT}/spack-install-compilers.xml
       fi
   artifacts:
+    paths:
+      - ${stack}/environement
     reports:
-      junit: spack-install.xml
+      junit: spack-install-*.xml
   needs:
     - job: spack:setup
   timeout: 5h
@@ -108,7 +110,7 @@ spack:concretize:
     - job: spack:install_compilers
   artifacts:
     paths:
-      - stacks/${stack}/spack.lock
+      - ${stack}/environement
   timeout: 2h
 
 spack:install:
@@ -135,6 +137,8 @@ spack:install:
   needs:
     - job: spack:concretize
   artifacts:
+    paths:
+      - ${stack}/environement
     reports:
       junit: spack-install.xml
   timeout: 10h

ci/install_compilers.sh

@@ -33,7 +33,7 @@ for c in  "core_compilers" "compilers"; do
             ${_specs} > compilers_spec.json
 
         ${STACK_LOCATION}/spack/bin/spack install \
-            --log-file spack-install.xml \
+            --log-file ${MOUNT_POINT}/spack-install-${c}.xml \
             --log-format junit \
             --fail-fast \
             --show-log-on-error \
@@ -89,6 +89,15 @@ jq -Mrc '
 | .[]
 '  ${STACK_CONFIG} >> ${SPACK_SYSTEM_CONFIG_PATH}/compiler_definitions.yaml
 
+jq -Mrc '
+.stack
+| .system_arch as $arch
+| .compilers
+| to_entries
+| map(" - compiler_\(.key): [\(.value.compiler)@\(.value.version)]")
+| .[]
+'  ${STACK_CONFIG} >> ${SPACK_SYSTEM_CONFIG_PATH}/compiler_definitions.yaml
+
 cat ${SPACK_SYSTEM_CONFIG_PATH}/compiler_definitions.yaml
 #yq -y -s  ".[0].spack.definitions = .[1].definitions + .[0].spack.definitions | .[0]" ${SPACK_SYSTEM_CONFIG_PATH}/spack.yaml ${SPACK_SYSTEM_CONFIG_PATH}/compiler_definitions.yaml > ${SPACK_SYSTEM_CONFIG_PATH}/spack.yaml.new
 

stacks/pinot-noir/config.json

@@ -23,14 +23,14 @@
             }
         },
         "core_compilers": {
-            "gcc@12": {
+            "gcc_extra_core": {
                 "compiler": "gcc",
                 "spec": "gcc@12.2.0 %gcc@11.4.1",
                 "version": "12.2.0"
             }
         },
         "compilers": {
-            "gcc@13": {
+            "gcc_stable": {
                 "compiler": "gcc",
                 "spec": "gcc@13.2.0 %gcc@11.4.1",
                 "version": "13.2.0"

stacks/pinot-noir/packages.yaml

@@ -69,7 +69,7 @@ packages:
     require:
     - spec: +rdmacm +rc +dc +ud +cma +mlx5_dv +parameter_checking +thread_multiple
         +verbs
-    - spec: cuda_arch=70 +gdrcopy
+    - spec: +gdrcopy
       when: +cuda
 
   binutils:

stacks/pinot-noir/spack.yaml

@@ -3,36 +3,50 @@ spack:
       - compiler_definitions.yaml
 
   definitions:
-    - serial_codes_per_cluster:
-        - python
-        - hdf5 ~mpi
-
+    # -------------------------------------------------------------------------
+    # PE definition
+    # -------------------------------------------------------------------------
     - mpi_codes:
         - osu-micro-benchmarks
         - hdf5 +mpi
 
-    - mpis:
+    - mpi_oneapi:
         - intel-oneapi-mpi
-
     - when: env['environment'] in ['helvetios']
-      mpis:
+      mpi_gcc_stable:
         - openmpi
     - when: env['environment'] in ['izar', 'jed']
-      mpis:
+      mpi_gcc_stable:
         - openmpi +cuda
 
-    - all_serial_codes:
-        - $serial_codes_per_cluster
-        - $mpis
+    # -------------------------------------------------------------------------
+    # Serial codes
+    # -------------------------------------------------------------------------
+    - serial_codes:
+        - python
+        - hdf5 ~mpi
+
+    # -------------------------------------------------------------------------
+    # Generic definitions
+    # -------------------------------------------------------------------------
+    - mpis:
+        - $mpi_oneapi
+        - $mpi_gcc_stable
 
   specs:
     - matrix:
         - [$compilers_specs]
     - matrix:
-        - [$all_serial_codes]
-        - [$%compilers]
+        - [$mpi_oneapi]
+        - [$%compiler_oneapi]
     - matrix:
-        - [$mpis]
+        - [$mpi_gcc_stable]
+        - [$%compiler_gcc_stable]
+
+    - matrix:
+        - [$serial_codes]
+        - [$%compilers]
+
     - matrix:
         - [$mpi_codes]
         - [$^mpis]