misc: Clean up

Author: ZoeLeibowitz

.github/workflows/docker-petsc.yml

@@ -17,6 +17,9 @@ jobs:
       # Use buildkit
       DOCKER_BUILDKIT: "1"
 
+      PETSC_REPO: https://gitlab.com/ZoeLeibowitz/petsc.git
+      PETSC_BRANCH: zoe/feature-da-section-sf
+
     steps:
       - name: Checkout devito
         uses: actions/checkout@v5
@@ -39,10 +42,13 @@ jobs:
           context: .
           file: docker/Dockerfile.petsc
           push: true
+          platforms: linux/amd64
           tags: |
             devitocodes/devito-petsc:petscsection
-          build-args: base=devitocodes/devito:gcc-dev-amd64
-          platforms: linux/amd64
+          build-args: |
+            base=devitocodes/devito:gcc-dev-amd64
+            PETSC_REPO=${{ env.PETSC_REPO }}
+            PETSC_BRANCH=${{ env.PETSC_BRANCH }}
 
       - name: Remove dangling layers
         run: docker system prune -f

.github/workflows/pytest-petsc.yml

@@ -48,7 +48,11 @@ jobs:
 
     - name: Build docker image
       run: |
-          docker build -f docker/Dockerfile.petsc --tag devito_petsc_image:test .
+          docker build \
+            -f docker/Dockerfile.petsc \
+            --build-arg PETSC_REPO=https://gitlab.com/ZoeLeibowitz/petsc.git \
+            --build-arg PETSC_BRANCH=zoe/feature-da-section-sf \
+            --tag devito_petsc_image:test .
 
     - name: Set run prefix
       run: |

devito/petsc/equations.py

@@ -11,7 +11,7 @@
 
 def lower_exprs_petsc(expressions, **kwargs):
 
-    # Process `ConstrainBC` equations 
+    # Process `ConstrainBC` equations
     expressions = constrain_essential_bcs(expressions, **kwargs)
 
     return expressions

docker/Dockerfile.petsc

@@ -3,15 +3,20 @@
 ##############################################################
 
 ARG base=devitocodes/devito:gcc-dev-amd64
+ARG PETSC_REPO=https://gitlab.com/petsc/petsc.git
+ARG PETSC_BRANCH=v3.24.0
 
 FROM $base
 
+ARG PETSC_REPO
+ARG PETSC_BRANCH
+
 USER root
 
 RUN python3 -m venv /venv && \
     mkdir -p /opt/petsc && \
     cd /opt/petsc && \
-    git clone -b v3.24.0 https://gitlab.com/petsc/petsc.git petsc && \
+    git clone -b ${PETSC_BRANCH} ${PETSC_REPO} petsc && \
     cd petsc && \
     ./configure --with-fortran-bindings=0 --with-mpi-dir=/opt/openmpi \
                 --with-openblas-include=$(pkg-config --variable=includedir openblas) \

tests/test_petsc.py

@@ -2264,8 +2264,8 @@ def _get_loop_bounds(self, shape, so, subdomain):
 
         bounds = []
         for _, dim in enumerate(grid.dimensions):
-            ub = max(args[f'i{dim.name}_min0'], args[f'{dim.name}_m'] - so)
-            lb = min(args[f'i{dim.name}_max0'], args[f'{dim.name}_M'] + so)
+            lb = max(args[f'i{dim.name}_min0'], args[f'{dim.name}_m'] - so)
+            ub = min(args[f'i{dim.name}_max0'], args[f'{dim.name}_M'] + so)
             bounds.append((lb, ub))
 
         return rank, tuple(bounds)