More minor changes

.gitlab-ci.yml

@@ -98,9 +98,6 @@ 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-compilers.xml ]; then
-        echo "{}" > ${MOUNT_POINT}/spack-install-compilers.xml
-      fi
     - tar cvzf artifacts_${stack}_${environment}.tgz $stack/environment
   artifacts:
     paths:
@@ -146,20 +143,20 @@ spack:install:
       fi
   script:
     - source ci/stack_env.sh
+    - echo "{}" > spack-install-${environment}.xml
+
     - ${STACK_LOCATION}/spack/bin/spack -e ${SPACK_SYSTEM_CONFIG_PATH} install
-      --log-file spack-install.xml
+      --log-file spack-install-${environment}.xml
       --log-format junit
       --only-concrete
       --fail-fast
       --show-log-on-error
+
     - ${STACK_LOCATION}/spack/bin/spack -e ${SPACK_SYSTEM_CONFIG_PATH} buildcache create
       --update-index
       --key EDC904DCE3D2E84E
       /buildcache
   after_script:
-    - if [ ! -e spack-install.xml ]; then
-        echo "{}" > spack-install.xml
-      fi
     - tar cvzf artifacts_${stack}_${environment}.tgz $stack/environment
   needs:
     - job: spack:concretize
@@ -167,7 +164,7 @@ spack:install:
     paths:
       - artifacts_${stack}_${environment}.tgz
     reports:
-      junit: spack-install.xml
+      junit: spack-install-*.xml
   timeout: 10h
 
 spack:mksquashfs:

stacks/pinot-noir/packages.yaml

@@ -10,6 +10,12 @@ packages:
       - spec: ^openmpi
         when: '%gcc ^mpi'
 
+      - spec: ^openmpi
+        when: '%aocc ^mpi'
+
+      - spec: ^nvhpc+mpi
+        when: '%nvhpc ^mpi'
+
       - spec: "+ipo"
         when: '%gcc'
 
@@ -61,4 +67,4 @@ packages:
 
   libfabric:
     require:
-    - spec: fabrics=mlx,mrail,psm2,psm3,verbs,udp,tcp,sockets,shm
+    - spec: fabrics=mlx,mrail,psm3,verbs,udp,tcp,sockets,shm

stacks/pinot-noir/spack.yaml

@@ -8,7 +8,7 @@ spack:
     # PE definition
     # -------------------------------------------------------------------------
     - mpi_codes:
-        - osu-micro-benchmarks
+        - osu-micro-benchmarks +graphing
         - hdf5 +mpi
 
     - mpi_oneapi: