ci: Test new actions in the MPI workflow

Author: JDBetteridge

.github/workflows/pytest-core-mpi.yaml

@@ -12,10 +12,10 @@ on:
   # but only for the main branch
   push:
     branches:
-      - main
+    - main
   pull_request:
     branches:
-      - main
+    - main
 
 jobs:
   test-mpi-basic:
@@ -63,86 +63,75 @@ jobs:
         name: pytest-mpi
 
   test-mpi-docker:
-      name: pytest-mpi
-      runs-on: ${{ matrix.os }}
-      outputs:
-        unique : ${{ steps.uniquetag.outputs.unique }}
-      strategy:
-        matrix:
-          name: [gcc, gcc-arm, icx]
-          include:
-            - name: gcc
-              arch: gcc
-              os: ubuntu-latest
-              mpiflag: ""
-
-            - name: gcc-arm
-              arch: gcc
-              os: ubuntu-24.04-arm
-              mpiflag: ""
-
-            - name: icx
-              arch: icx
-              os: ubuntu-latest
-              # Need safe math for icx due to inaccuracy with mpi+sinc interpolation
-              mpiflag: "-e DEVITO_SAFE_MATH=1"
-
-      steps:
-      - name: Checkout devito
-        uses: actions/checkout@v6
-
-      - name: Generate unique CI tag
-        id: uniquetag
-        run: |
-          UNIQUE=$(echo "${GITHUB_RUN_ID}_${GITHUB_RUN_ATTEMPT}" | cksum | cut -f 1 -d " ")
-          echo "Unique ID: ${UNIQUE}"
-          echo "unique=${UNIQUE}" >> "$GITHUB_OUTPUT"
-
-      - name: Build docker image
-        env:
-          UNIQUE: ${{ steps.uniquetag.outputs.unique }}
-        run: |
-          docker build \
-            --file docker/Dockerfile.devito \
-            --tag "devito_img${UNIQUE}" \
-            --build-arg base=devitocodes/bases:cpu-${{ matrix.arch }} \
-            .
-
-      - name: Test with pytest
-        env:
-          UNIQUE: ${{ steps.uniquetag.outputs.unique }}
-        run: |
-          docker run \
-            --init -t --rm \
-            --env CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }} \
-            --env OMP_NUM_THREADS=1 \
-            --name testrun \
-            "devito_img${UNIQUE}" \
-            pytest tests/test_mpi.py
-
-      - name: Test examples with MPI
-        env:
-          UNIQUE: ${{ steps.uniquetag.outputs.unique }}
-        run: |
-          docker run \
-            --init -t --rm \
-            ${{ matrix.mpiflag }} \
-            --env DEVITO_MPI=1 \
-            --env OMP_NUM_THREADS=1 \
-            --name examplerun \
-            "devito_img${UNIQUE}" \
-            mpiexec -n 2 pytest examples/seismic/acoustic
-          #
-          docker run \
-            --init -t --rm \
-            --env DEVITO_MPI=1 \
-            --env OMP_NUM_THREADS=1 \
-            --name examplerun \
-            "devito_img${UNIQUE}" \
-            mpiexec -n 2 pytest examples/seismic/tti
-
-      - name: Cleanup
-        env:
-          UNIQUE: ${{ steps.uniquetag.outputs.unique }}
-        run: |
-            docker image rm -f "devito_img${UNIQUE}"
+    name: pytest-mpi
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        name: [gcc, gcc-arm, icx]
+        include:
+        - name: gcc
+          arch: gcc
+          os: ubuntu-latest
+          mpiflag: ""
+
+        - name: gcc-arm
+          arch: gcc
+          os: ubuntu-24.04-arm
+          mpiflag: ""
+
+        - name: icx
+          arch: icx
+          os: ubuntu-latest
+          # Need safe math for icx due to inaccuracy with mpi+sinc interpolation
+          mpiflag: "-e DEVITO_SAFE_MATH=1"
+
+    steps:
+    - name: Checkout devito
+      uses: actions/checkout@v6
+
+    - id: build
+      name: Build docker image
+      uses: ./.github/actions/docker-build
+      with:
+        file: docker/Dockerfile.devito
+        tag: devito_img
+        base: devitocodes/bases:cpu-${{ matrix.arch }}
+
+    - name: Test with pytest
+      uses: ./.github/actions/docker-run
+      with:
+        id: ${{ steps.build.outputs.unique }}
+        env: |
+          CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }}
+          OMP_NUM_THREADS=1
+        tag: devito_img
+        command: "pytest tests/test_mpi.py"
+
+    - name: Test acoustic example with MPI
+      uses: ./.github/actions/docker-run
+      with:
+        id: ${{ steps.build.outputs.unique }}
+        args: ${{ matrix.mpiflag }}
+        env: |
+          DEVITO_MPI=1
+          OMP_NUM_THREADS=1
+        tag: devito_img
+        command: "mpiexec -n 2 pytest examples/seismic/acoustic"
+
+    - name: Test tti example with MPI
+      uses: ./.github/actions/docker-run
+      with:
+        # --name examplerun
+        id: ${{ steps.build.outputs.unique }}
+        args: ${{ matrix.mpiflag }}
+        env: |
+          DEVITO_MPI=1
+          OMP_NUM_THREADS=1
+        tag: devito_img
+        command: "mpiexec -n 2 pytest examples/seismic/tti"
+
+    - name: Cleanup docker image
+      uses: ./.github/actions/docker-clean
+      with:
+        id: ${{ steps.build.outputs.unique }}
+        tag: devito_img