Vantage reactions coupling/docker image shorten tests

.github/workflows/build_docker_VANTAGE_dependencies_image.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: UKAEA-Edge-Code/hermes-3
+  IMAGE_NAME: UKAEA-Edge-Code/hermes-3-vantage-deps
   DOCKERFILE: VANTAGE-docker/hermes-3-VANTAGE-dependencies.dockerfile
 
 permissions:

.github/workflows/docker_VANTAGE_tests.yml

@@ -12,9 +12,9 @@ jobs:
   docker_spack_install_tests:
     runs-on: ubuntu-latest
     # timeout to avoid running tests which do unexpected spack installation
-    timeout-minutes: 45
+    timeout-minutes: 35
     container:
-      image: ghcr.io/ukaea-edge-code/hermes-3:edge
+      image: ghcr.io/ukaea-edge-code/hermes-3-vantage-deps:edge
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}
@@ -28,27 +28,17 @@ jobs:
         uses: actions/checkout@v6
         with:
           submodules: recursive
-      - name: Check download
-        run: source /opt/spack/share/spack/setup-env.sh &&
-             spack env activate . -v gcc &&
-             spack concretize -f &&
-             spack env view regenerate &&
-             spack find && which python3 &&
-             chmod +x 2D-production-download.py &&
-             mkdir download-dir && cp 2D-production-download.py download-dir/ &&
-             cd download-dir && ./2D-production-download.py && ls
-             # python3 2D-production-download.py &&
       - name: Install
-        run: source /opt/spack/share/spack/setup-env.sh &&
-             spack env activate . -v gcc &&
-             spack concretize -f &&
-             spack install -j 4
+        run: |
+          source /opt/spack/share/spack/setup-env.sh &&
+          sed -i 's/^[[:space:]]*granularity:[[:space:]]*microarchitectures/      granularity: generic/' spack.yaml &&
+          sed -i '/^[[:space:]]*providers:/i\      require: "target=x86_64_v3"' spack.yaml &&
+          spack env activate . -v gcc &&
+          spack concretize -f &&
+          spack install -j 4 --only-concrete
       - name : Run tests
-        run: source /opt/spack/share/spack/setup-env.sh &&
-             spack env activate . -v gcc &&
-             chmod +x 2D-production-download.py &&
-             cp 2D-production-download.py $(spack location -b hermes-3)/tests/integrated/2D-production/ &&
-             spack cd -b hermes-3 &&
-             ./tests/integrated/2D-production/./2D-production-download.py &&
-             ls ./tests/integrated/2D-production/ &&
-             ctest -j 1 --output-on-failure --timeout 300 -VV
+        run: |
+          source /opt/spack/share/spack/setup-env.sh &&
+          spack env activate . -v gcc &&
+          spack cd -b hermes-3 &&
+          ctest -j 1 --output-on-failure --timeout 300

VANTAGE-docker/hermes-3-VANTAGE-dependencies.dockerfile

@@ -24,7 +24,19 @@ WORKDIR /root/hermes-3
 
 # Install hermes-3 dependencies via spack
 # Activate the hermes-3 environment, install dependencies
-RUN <<EOF 
+RUN <<EOF
+# use generic microarchitectures to avoid conflicts between runners using zen2, icelake, etc
+sed -i 's/^[[:space:]]*granularity:[[:space:]]*microarchitectures/      granularity: generic/' spack.yaml
+# demand target=x86_64_v3, assume that spack.yaml has unique block
+# all:
+#   providers:
+#     mpi: [mpich, openmpi ]
+# which we mutate to
+# all:
+#   providers:
+#     require: "target=x86_64_v3"
+#     mpi: [mpich, openmpi ]
+sed -i '/^[[:space:]]*providers:/i\      require: "target=x86_64_v3"' spack.yaml
 spack env activate . -v gcc
 # Install the dependencies
 spack install -j 4 --only dependencies

spack.yaml

@@ -21,6 +21,8 @@ spack:
       link_type: symlink
   concretizer:
     unify: when_possible
+    targets:
+      granularity: microarchitectures
   repos:
     - ./external/BOUT-spack/spack_repo/bout
     - ./external/Reactions/VANTAGE-repo

tests/integrated/2D-production/data/BOUT.inp

@@ -1,7 +1,7 @@
 
 # Run one RHS
 nout = 1                  
-timestep = 0.1        
+timestep = 0.0001        
 
 MZ = 1
 NXPE = 1