misc: Rebase fixes

Author: ZoeLeibowitz

.github/workflows/examples-mpi.yml

@@ -17,9 +17,11 @@ on:
   push:
     branches:
       - main
+      - master
   pull_request:
     branches:
       - main
+      - master
 
 jobs:
   build:

.github/workflows/examples.yml

@@ -10,9 +10,11 @@ on:
   push:
     branches:
       - main
+      - master
   pull_request:
     branches:
       - main
+      - master
 
 jobs:
   tutorials:

.github/workflows/flake8.yml

@@ -10,9 +10,11 @@ on:
    push:
      branches:
        - main
+       - master
    pull_request:
      branches:
        - main
+       - master
 
 jobs:
   flake8:

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

@@ -10,9 +10,11 @@ on:
   push:
     branches:
       - main
+      - master
   pull_request:
     branches:
       - main
+      - master
 
 jobs:
   test-mpi-basic:

.github/workflows/pytest-core-nompi.yml

@@ -10,9 +10,11 @@ on:
   push:
     branches:
       - main
+      - master
   pull_request:
     branches:
       - main
+      - master
 
 jobs:
   pytest:

.github/workflows/pytest-petsc.yml

@@ -9,9 +9,11 @@ on:
   # but only for the master branch
   push:
     branches:
+      - main
       - master
   pull_request:
     branches:
+      - main
       - master
 
 jobs:

.github/workflows/tutorials.yml

@@ -10,9 +10,11 @@ on:
   push:
     branches:
       - main
+      - master
   pull_request:
     branches:
       - main
+      - master
 
 jobs:
   tutorials:

devito/petsc/iet/routines.py

@@ -4,7 +4,7 @@
 from devito.ir.iet import (Call, FindSymbols, List, Uxreplace, CallableBody,
                            Dereference, DummyExpr, BlankLine, Callable, FindNodes,
                            retrieve_iteration_tree, filter_iterations, Iteration)
-from devito.symbolics import (Byref, FieldFromPointer, cast_mapper, VOIDP,
+from devito.symbolics import (Byref, FieldFromPointer, cast, VOID,
                               FieldFromComposite, IntDiv, Deref, Mod)
 from devito.symbolics.unevaluation import Mul
 from devito.types.basic import AbstractFunction
@@ -671,8 +671,10 @@ def _whole_formfunc_body(self):
             calls += (
                 petsc_call('VecGetSubVector', [X, field_ptr, Byref(sobjs[x_name])]),
                 petsc_call('VecGetSubVector', [F, field_ptr, Byref(sobjs[f_name])]),
-                petsc_call(self.formfuncs[i].name, [objs['snes'], sobjs[x_name],
-                           sobjs[f_name], VOIDP(objs['LocalSubdms'].indexed[i])]),
+                petsc_call(self.formfuncs[i].name, [
+                    objs['snes'], sobjs[x_name], sobjs[f_name],
+                    VOID(objs['LocalSubdms'].indexed[i], stars='*')
+                ]),
                 petsc_call('VecRestoreSubVector', [X, field_ptr, Byref(sobjs[x_name])]),
                 petsc_call('VecRestoreSubVector', [F, field_ptr, Byref(sobjs[f_name])]),
             )
@@ -992,7 +994,7 @@ def snes_ctx(self):
         The [optional] context for private data for the function evaluation routine.
         https://petsc.org/main/manualpages/SNES/SNESSetFunction/
         """
-        return VOIDP(self.solver_objs['dmda'])
+        return VOID(self.solver_objs['dmda'], stars='*')
 
     def _setup(self):
         objs = self.objs
@@ -1526,11 +1528,12 @@ def replace_array(self, target):
             xlocal = sobjs.get(f'xlocal{target.name}', sobjs['xlocal'])
             start_ptr = sobjs[f'{target.name}_ptr']
 
+            caster = cast(target.dtype, '*')
             return (
                 petsc_call('VecGetSize', [xlocal, Byref(sobjs['localsize'])]),
                 DummyExpr(
                     start_ptr,
-                    cast_mapper[(target.dtype, '*')](
+                    caster(
                         FieldFromPointer(target._C_field_data, target._C_symbol)
                     ) + Mul(target_time, sobjs['localsize']),
                     init=True

devito/petsc/types/object.py

@@ -2,7 +2,7 @@
 from devito.tools import CustomDtype, dtype_to_cstr, as_tuple, CustomIntType
 from devito.types import (LocalObject, LocalCompositeObject, ModuloDimension,
                           TimeDimension, ArrayObject, CustomDimension)
-from devito.symbolics import Byref, Cast
+from devito.symbolics import Byref, cast
 from devito.types.basic import DataSymbol
 from devito.petsc.iet.utils import petsc_call
 
@@ -42,8 +42,7 @@ def _C_free_priority(self):
         return 4
 
 
-class DMCast(Cast):
-    _base_typ = 'DM'
+DMCast = cast('DM')
 
 
 class CallbackMat(LocalObject):
@@ -232,8 +231,7 @@ def __init__(self, name='subctx', pname='SubMatrixCtx', fields=None,
     _C_modifier = None
 
 
-class JacobianStructCast(Cast):
-    _base_typ = 'struct JacobianCtx *'
+JacobianStructCast = cast('struct JacobianCtx *')
 
 
 class PETScArrayObject(ArrayObject):

devito/tools/dtypes_lowering.py

@@ -19,7 +19,6 @@
            'CustomIntType']
 
 
-
 # *** Custom np.dtypes
 
 # NOTE: the following is inspired by pyopencl.cltypes