From 3518f4f3b5f327bb223fc1cab51b9e09aa2da0ab Mon Sep 17 00:00:00 2001
From: Nicolas Richart <networms@gmail.ch>
Date: Mon, 17 Jun 2024 19:02:48 +0200
Subject: [PATCH] More minor changes
---
.gitlab-ci.yml | 13 +++++--------
stacks/pinot-noir/packages.yaml | 8 +++++++-
stacks/pinot-noir/spack.yaml | 2 +-
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 749c818..6a8dc5d 100644
--- a/.gitlab-ci.yml
+++ b/.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:
diff --git a/stacks/pinot-noir/packages.yaml b/stacks/pinot-noir/packages.yaml
index 3db56e7..e64a0d0 100644
--- a/stacks/pinot-noir/packages.yaml
+++ b/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
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index 5b446d6..7e65af1 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/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:
--
GitLab