misc: Clean up and flake8

Author: ZoeLeibowitz

.github/workflows/docker-petsc.yml

@@ -6,7 +6,8 @@ permissions:
 on:
   push:
     branches:
-      - petsc         # Push events on petsc branch
+      # NOTE: specific to this branch, to be updated
+      - petscsection         # Push events on petscsection branch
 
 jobs:
   build-and-push:
@@ -39,7 +40,7 @@ jobs:
           file: docker/Dockerfile.petsc
           push: true
           tags: |
-            devitocodes/devito-petsc:latest
+            devitocodes/devito-petsc:petscsection
           build-args: base=devitocodes/devito:gcc-dev-amd64
           platforms: linux/amd64
 

.github/workflows/pytest-petsc.yml

@@ -5,8 +5,6 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  # Trigger the workflow on push or pull request,
-  # but only for the master branch
   push:
     branches:
       - main

devito/petsc/equations.py

@@ -81,16 +81,13 @@ def constrain_essential_bcs(expressions, **kwargs):
             new_exprs.append(e)
             continue
 
-        # new_e = uxreplace(e, mapper)
-        new_e = e.subs(mapper)
-        
+        new_e = uxreplace(e, mapper)
 
         if e.implicit_dims:
             new_e = new_e._rebuild(
                 implicit_dims=tuple(mapper.get(d, d) for d in e.implicit_dims)
             )
         new_exprs.append(new_e)
-
     return new_exprs
 
 

devito/petsc/iet/builder.py

@@ -88,7 +88,7 @@ def _setup(self):
         snes_get_ksp = petsc_call('SNESGetKSP',
                                   [sobjs['snes'], Byref(sobjs['ksp'])])
 
-        matvec = self.callback_builder.main_matvec_callback
+        matvec = self.callback_builder.main_matvec_efunc
         matvec_operation = petsc_call(
             'MatShellSetOperation',
             [sobjs['Jac'], 'MATOP_MULT', MatShellSetOp(matvec.name, void, void)]
@@ -147,7 +147,7 @@ def _create_dmda_calls(self, dmda):
         mainctx = self.solver_objs['userctx']
 
         call_struct_callback = petsc_call(
-            self.callback_builder.user_struct_callback.name, [Byref(mainctx)]
+            self.callback_builder.user_struct_efunc.name, [Byref(mainctx)]
         )
 
         calls_set_app_ctx = petsc_call('DMSetApplicationContext', [dmda, Byref(mainctx)])
@@ -238,7 +238,7 @@ def _setup(self):
         snes_get_ksp = petsc_call('SNESGetKSP',
                                   [sobjs['snes'], Byref(sobjs['ksp'])])
 
-        matvec = self.callback_builder.main_matvec_callback
+        matvec = self.callback_builder.main_matvec_efunc
         matvec_operation = petsc_call(
             'MatShellSetOperation',
             [sobjs['Jac'], 'MATOP_MULT', MatShellSetOp(matvec.name, void, void)]
@@ -259,7 +259,7 @@ def _setup(self):
         mainctx = sobjs['userctx']
 
         call_struct_callback = petsc_call(
-            self.callback_builder.user_struct_callback.name, [Byref(mainctx)]
+            self.callback_builder.user_struct_efunc.name, [Byref(mainctx)]
         )
 
         # TODO: maybe don't need to explictly set this
@@ -345,7 +345,7 @@ def _setup(self):
             create_submats) + \
             tuple(deref_dms) + tuple(xglobals) + tuple(xlocals) + (BlankLine,)
         return coupled_setup
-    
+
 
 class ConstrainedBCMixin:
     """
@@ -359,7 +359,9 @@ def _create_dmda_calls(self, dmda):
         dmda_create = self._create_dmda(dmda)
         # TODO: probs need to set the dm options prefix the same as snes?
         # don't hardcode this probs? - the dm needs to be specific to the solver as well
-        da_create_section = petsc_call('PetscOptionsSetValue', [Null, String("-da_use_section"), Null])
+        da_create_section = petsc_call(
+            'PetscOptionsSetValue', [Null, String("-da_use_section"), Null]
+        )
         dm_set_from_opts = petsc_call('DMSetFromOptions', [dmda])
         dm_setup = petsc_call('DMSetUp', [dmda])
         dm_mat_type = petsc_call('DMSetMatType', [dmda, 'MATSHELL'])
@@ -372,24 +374,31 @@ def _create_dmda_calls(self, dmda):
             self.callback_builder._point_bc_efunc.name, [dmda, sobjs['numBC']]
         )
 
-        get_local_section = petsc_call('DMGetLocalSection', [dmda, Byref(sobjs['lsection'])])
+        get_local_section = petsc_call(
+            'DMGetLocalSection', [dmda, Byref(sobjs['lsection'])]
+        )
 
         import cgen as c
         tmp = c.Line("PetscCall(PetscSectionView(lsection0, NULL));")
 
         get_point_sf = petsc_call('DMGetPointSF', [dmda, Byref(sobjs['sf'])])
 
         create_global_section = petsc_call(
-            'PetscSectionCreateGlobalSection', [sobjs['lsection'], sobjs['sf'], 'PETSC_TRUE', 'PETSC_FALSE', 'PETSC_FALSE', Byref(sobjs['gsection'])]
+            'PetscSectionCreateGlobalSection',
+            [sobjs['lsection'], sobjs['sf'], 'PETSC_TRUE', 'PETSC_FALSE', 'PETSC_FALSE',
+             Byref(sobjs['gsection'])]
         )
 
-        dm_set_global_section = petsc_call('DMSetGlobalSection', [dmda, sobjs['gsection']])
-
-        dm_create_section_sf = petsc_call('DMCreateSectionSF', [dmda, sobjs['lsection'], sobjs['gsection']])
+        dm_set_global_section = petsc_call(
+            'DMSetGlobalSection', [dmda, sobjs['gsection']]
+        )
 
+        dm_create_section_sf = petsc_call(
+            'DMCreateSectionSF', [dmda, sobjs['lsection'], sobjs['gsection']]
+        )
 
         call_struct_callback = petsc_call(
-            self.callback_builder.user_struct_callback.name, [Byref(mainctx)]
+            self.callback_builder.user_struct_efunc.name, [Byref(mainctx)]
         )
 
         calls_set_app_ctx = petsc_call('DMSetApplicationContext', [dmda, Byref(mainctx)])
@@ -411,7 +420,7 @@ def _create_dmda_calls(self, dmda):
             dm_set_global_section,
             dm_create_section_sf
         )
-    
+
 
 class ConstrainedBCBuilder(ConstrainedBCMixin, BuilderBase):
     pass