misc: Lint petsc branch

ZoeLeibowitz · ZoeLeibowitz · commit e44313eacef5 · 2026-05-28T13:42:40.000+01:00
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -11,9 +11,11 @@ on:
    push:
      branches:
        - main
+       - petsc
    pull_request:
      branches:
        - main
+       - petsc
 
 jobs:
   codelint:
diff --git a/devito/petsc/config.py b/devito/petsc/config.py
@@ -78,7 +78,7 @@ def get_petsc_type_mappings():
         petsc_type_to_ctype = {v: k for k, v in printer_mapper.items()}
         # Add other PETSc types
         petsc_type_to_ctype.update({
-            # Store a copy so it doens't segfault after SNESDestroy
+            # Store a copy so it doesn't segfault after SNESDestroy
             'KSPType': ctypes.c_char * KSPTYPE_MAX_LEN,
             'KSPConvergedReason': petsc_type_to_ctype['PetscInt'],
             'KSPNormType': petsc_type_to_ctype['PetscInt'],
diff --git a/devito/petsc/iet/builder.py b/devito/petsc/iet/builder.py
@@ -68,7 +68,8 @@ def _setup(self):
         )
 
         local_size = math.prod(
-            v for v, dim in zip(target.shape_allocated, target.dimensions) if dim.is_Space
+            v for v, dim in zip(target.shape_allocated, target.dimensions, strict=True)
+            if dim.is_Space
         )
         # TODO: Check - VecCreateSeqWithArray vs VecCreateMPIWithArray
         local_x = petsc_call('VecCreateSeqWithArray',
@@ -104,7 +105,7 @@ def _setup(self):
 
         dmda_calls = self._create_dmda_calls(dmda)
 
-        # TODO: maybe don't need to explictly set this
+        # TODO: maybe don't need to explicitly set this
         mat_set_dm = petsc_call('MatSetDM', [sobjs['Jac'], dmda])
 
         base_setup = dmda_calls + (
@@ -252,7 +253,7 @@ def _setup(self):
 
         dmda_calls = self._create_dmda_calls(dmda)
 
-        # TODO: maybe don't need to explictly set this
+        # TODO: maybe don't need to explicitly set this
         mat_set_dm = petsc_call('MatSetDM', [sobjs['Jac'], dmda])
 
         create_field_decomp = petsc_call(
@@ -299,7 +300,8 @@ def _setup(self):
         for t in targets:
             target_xloc = sobjs[f'xlocal{t.name}']
             local_size = math.prod(
-                v for v, dim in zip(t.shape_allocated, t.dimensions) if dim.is_Space
+                v for v, dim in zip(t.shape_allocated, t.dimensions, strict=True)
+                if dim.is_Space
             )
             field_from_ptr = FieldFromPointer(
                 t.function._C_field_data, t.function._C_symbol
diff --git a/devito/petsc/iet/callbacks.py b/devito/petsc/iet/callbacks.py
@@ -28,8 +28,8 @@ class BaseCallbackBuilder:
     """
     def __init__(self, **kwargs):
 
-        self.rcompile = kwargs.get('rcompile', None)
-        self.sregistry = kwargs.get('sregistry', None)
+        self.rcompile = kwargs.get('rcompile')
+        self.sregistry = kwargs.get('sregistry')
         self.options = kwargs.get('options', {})
         self.concretize_mapper = kwargs.get('concretize_mapper', {})
         self.time_dependence = kwargs.get('time_dependence')
@@ -148,7 +148,7 @@ def _make_options_callback(self):
         """
         Create two callbacks: one to set PETSc options and one
         to clear them.
-        Options are only set/cleared if they were not specifed via
+        Options are only set/cleared if they were not specified via
         command line arguments.
         """
         params = self.solver_parameters
@@ -574,7 +574,7 @@ def _make_initial_guess(self):
         sobjs = self.solver_objs
         objs = self.objs
 
-        # Compile initital guess `eqns` into an IET via recursive compilation
+        # Compile initial guess `eqns` into an IET via recursive compilation
         irs, _ = self.rcompile(
             exprs, options={'mpi': False}, sregistry=self.sregistry,
             concretize_mapper=self.concretize_mapper
@@ -1335,7 +1335,7 @@ def residual_bundle(self, body, bundles):
 
 
 def populate_matrix_context(efuncs):
-    if not objs['dummyefunc'] in efuncs.values():
+    if objs['dummyefunc'] not in efuncs.values():
         return
 
     subdms_expr = DummyExpr(
diff --git a/devito/petsc/iet/logging.py b/devito/petsc/iet/logging.py
@@ -20,7 +20,7 @@ def __init__(self, level, **kwargs):
         self.sobjs = kwargs.get('solver_objs')
         self.sreg = kwargs.get('sregistry')
         self.section_mapper = kwargs.get('section_mapper', {})
-        self.inject_solve = kwargs.get('inject_solve', None)
+        self.inject_solve = kwargs.get('inject_solve')
 
         if level <= PERF:
             funcs = [
diff --git a/devito/petsc/iet/nodes.py b/devito/petsc/iet/nodes.py
@@ -18,13 +18,13 @@ class MatShellSetOp(Callback):
     @property
     def callback_form(self):
         param_types_str = ', '.join([str(t) for t in self.param_types])
-        return "(%s (*)(%s))%s" % (self.retval, param_types_str, self.name)
+        return f"({self.retval} (*)({param_types_str})){self.name}"
 
 
 class FormFunctionCallback(Callback):
     @property
     def callback_form(self):
-        return "%s" % self.name
+        return f'{self.name}'
 
 
 class PETScCall(Call):
diff --git a/devito/petsc/iet/passes.py b/devito/petsc/iet/passes.py
@@ -168,10 +168,7 @@ def linear_indices(iet, **kwargs):
     if not iet.name.startswith("SetPointBCs"):
         return iet, {}
 
-    if kwargs['options']['index-mode'] == 'int32':
-        dtype = np.int32
-    else:
-        dtype = np.int64
+    dtype = np.int32 if kwargs['options']['index-mode'] == 'int32' else np.int64
 
     tracker = Tracker('basic', dtype, kwargs['sregistry'])
 
diff --git a/devito/petsc/iet/time_dependence.py b/devito/petsc/iet/time_dependence.py
@@ -80,7 +80,7 @@ def is_target_time(self, target):
 
     def target_time(self, target):
         target_time = [
-            i for i, d in zip(target.indices, target.dimensions)
+            i for i, d in zip(target.indices, target.dimensions, strict=True)
             if d.is_Time
         ]
         assert len(target_time) == 1
diff --git a/devito/petsc/iet/type_builder.py b/devito/petsc/iet/type_builder.py
@@ -149,7 +149,7 @@ def _extend_build(self, base_dict):
         )
 
         # Build the bundle mapper
-        for f_arr, x_arr in zip(f_components, x_components):
+        for f_arr, x_arr in zip(f_components, x_components, strict=True):
             bundle_mapper[f_arr.base] = fbundle
             bundle_mapper[x_arr.base] = xbundle
 
diff --git a/devito/petsc/logging.py b/devito/petsc/logging.py
@@ -77,7 +77,7 @@ def petsc_entry(self, petscinfo):
             petsc_return_variable_dict[f].name for f in petscinfo.query_functions
         ]
         values = [getattr(petscinfo, c) for c in funcs]
-        return PetscEntry(**{k: v for k, v in zip(funcs, values)})
+        return PetscEntry(**{k: v for k, v in zip(funcs, values, strict=True)})
 
     def _add_properties(self):
         """
@@ -174,7 +174,7 @@ def _C_typedecl(self):
         entries = []
         for field in self._fields:
             if str(field.dtype) == 'KSPType':
-                entries.append(Value('char', '%s[%d]' % (field.name, KSPTYPE_MAX_LEN)))
+                entries.append(Value('char', f'{field.name}[{KSPTYPE_MAX_LEN}]'))
             else:
                 entries.append(Value(str(field.dtype), field.name))
         return Struct(self.dtype._type_.__name__, entries)
diff --git a/devito/petsc/solve.py b/devito/petsc/solve.py
@@ -13,7 +13,7 @@
 
 
 def petscsolve(target_exprs, target=None, solver_parameters=None,
-               options_prefix=None, get_info=[], constrain_bcs=False):
+               options_prefix=None, get_info=None, constrain_bcs=False):
     """
     Returns a symbolic expression representing a linear PETSc solver,
     enriched with all the necessary metadata for execution within an `Operator`.
@@ -97,14 +97,14 @@ def petscsolve(target_exprs, target=None, solver_parameters=None,
 
 class InjectSolve:
     def __init__(self, solver_parameters=None, target_exprs=None, options_prefix=None,
-                 get_info=[], constrain_bcs=False):
+                 get_info=None, constrain_bcs=False):
         self.solver_parameters = linear_solver_parameters(solver_parameters)
         self.time_mapper = None
         self.target_exprs = target_exprs
         # The original options prefix provided by the user
         self.user_prefix = options_prefix
         self.formatted_prefix = format_options_prefix(options_prefix)
-        self.get_info = [f.lower() for f in get_info]
+        self.get_info = [f.lower() for f in (get_info or [])]
         self.constrain_bcs = constrain_bcs
 
     def build_expr(self):
@@ -152,7 +152,8 @@ def linear_solve_args(self):
             if not (
                 f.function is target.function and
                 any(dim.is_Time and i == j
-                    for dim, i, j in zip(f.dimensions, f.indices, target.indices))
+                    for dim, i, j in
+                    zip(f.dimensions, f.indices, target.indices, strict=True))
             )
         )
         self.time_mapper = generate_time_mapper(exprs)
@@ -264,13 +265,13 @@ def _out_of_domain_bc(target):
         return None
     grid = target.grid
     grid_dim_set = set(grid.dimensions)
-    staggered_dims = [d for d, s in zip(target.dimensions, target.staggered)
+    staggered_dims = [d for d, s in zip(target.dimensions, target.staggered, strict=True)
                       if s != 0 and d in grid_dim_set]
     if not staggered_dims:
         return None
     dims = {d: 'right' for d in staggered_dims}
     border = Border(grid, border=1, dims=dims,
-                    name='_stagger_border_%s' % target.name,
+                    name=f'_stagger_border_{target.name}',
                     corners='nooverlap')
     rhs = Constant(name='zero', dtype=target.dtype)
     return EssentialBC(target, rhs, subdomain=border, constrain=True)
@@ -314,11 +315,11 @@ def generate_time_mapper(exprs):
     time_indices.extend(list({
         i if isinstance(d, SteppingDimension) else d
         for f in funcs
-        for i, d in zip(f.indices, f.dimensions)
+        for i, d in zip(f.indices, f.dimensions, strict=True)
         if d.is_Time
     }))
-    tau_symbs = [Symbol('tau%d' % i) for i in range(len(time_indices))]
-    return dict(zip(time_indices, tau_symbs))
+    tau_symbs = [Symbol(f'tau{i}') for i in range(len(time_indices))]
+    return dict(zip(time_indices, tau_symbs, strict=True))
 
 
 localinfo = DMDALocalInfo(name='info', liveness='eager')
diff --git a/devito/petsc/types/array.py b/devito/petsc/types/array.py
@@ -40,7 +40,7 @@ def __init_finalize__(self, *args, **kwargs):
         self._dimensions = kwargs['dimensions'] = self._target.space_dimensions
         super().__init_finalize__(*args, **kwargs)
         self._coefficients = self._target.coefficients
-        self._localinfo = kwargs.get('localinfo', None)
+        self._localinfo = kwargs.get('localinfo')
 
     @property
     def ndim(self):
@@ -55,10 +55,7 @@ def __indices_setup__(cls, *args, **kwargs):
         target = kwargs['target']
         dimensions = tuple(target.space_dimensions)
         target_indices = tuple(target.indices[d] for d in target.space_dimensions)
-        if args:
-            indices = args
-        else:
-            indices = target_indices
+        indices = args or target_indices
         return as_tuple(dimensions), as_tuple(indices)
 
     def __halo_setup__(self, **kwargs):
@@ -122,7 +119,7 @@ def _fd_priority(self):
     @property
     def symbolic_shape(self):
         field_from_composites = [
-            FieldFromComposite('g%sm' % d.name, self.localinfo) for d in self.dimensions]
+            FieldFromComposite(f'g{d.name}m', self.localinfo) for d in self.dimensions]
         # Reverse it since DMDA is setup backwards to Devito dimensions.
         return DimensionTuple(*field_from_composites[::-1], getters=self.dimensions)
 
diff --git a/devito/petsc/types/metadata.py b/devito/petsc/types/metadata.py
@@ -818,6 +818,6 @@ def targets_to_arrays(array, targets):
         tuple(f.indices[d] for d in f.space_dimensions) for f in targets
     ]
     array_targets = [
-        array.subs(dict(zip(array.indices, i))) for i in space_indices
+        array.subs(dict(zip(array.indices, i, strict=True))) for i in space_indices
     ]
-    return frozendict(zip(targets, array_targets))
+    return frozendict(zip(targets, array_targets, strict=True))
diff --git a/devito/symbolics/extended_sympy.py b/devito/symbolics/extended_sympy.py
@@ -176,7 +176,7 @@ def __new__(cls, lhs, rhs, params=None):
         return obj
 
     def __str__(self):
-        return "Mod(%s, %s)" % (self.lhs, self.rhs)
+        return f"Mod({self.lhs}, {self.rhs})"
 
     __repr__ = __str__
 
diff --git a/devito/symbolics/extraction.py b/devito/symbolics/extraction.py
@@ -7,7 +7,7 @@
 from devito.symbolics import retrieve_functions
 from devito.types.equation import Eq
 
-__all__ = ['separate_eqn', 'generate_targets', 'centre_stencil']
+__all__ = ['centre_stencil', 'generate_targets', 'separate_eqn']
 
 
 def separate_eqn(eqn, target):
@@ -53,7 +53,7 @@ def _(expr, targets):
     if not any(expr.has(t) for t in targets):
         return (expr, 0)
 
-    args_b, args_F = zip(*(remove_targets(a, targets) for a in expr.args))
+    args_b, args_F = zip(*(remove_targets(a, targets) for a in expr.args), strict=True)
     return (expr.func(*args_b, evaluate=False), expr.func(*args_F, evaluate=False))
 
 
@@ -63,7 +63,7 @@ def _(expr, targets):
         return (expr, 0)
 
     args_b, args_F = zip(*[remove_targets(a, targets) if any(a.has(t) for t in targets)
-                           else (a, a) for a in expr.args])
+                           else (a, a) for a in expr.args], strict=True)
     return (expr.func(*args_b, evaluate=False), expr.func(*args_F, evaluate=False))
 
 
diff --git a/devito/types/misc.py b/devito/types/misc.py
@@ -180,7 +180,7 @@ def linear_index(self):
         """
         f = self.function
         strides_map = self.strides_map
-        spatial = [(d, idx) for d, idx in zip(f.dimensions, self.indices)
+        spatial = [(d, idx) for d, idx in zip(f.dimensions, self.indices, strict=True)
                    if not d.is_Time]
         items = [idx * strides_map[spatial[i + 1][0]]
                  for i, (_, idx) in enumerate(spatial[:-1])]
diff --git a/examples/petsc/cfd/01_navierstokes.py b/examples/petsc/cfd/01_navierstokes.py
@@ -133,9 +133,8 @@ def neumann_bottom(eq, subdomain):
     for f in funcs:
         # Get the y index
         yind = f.indices[-1]
-        if (yind - y).as_coeff_Mul()[0] < 0:
-            if f.name == 'pn1':
-                mapper.update({f: f.subs({yind: INT(abs(yind))})})
+        if (yind - y).as_coeff_Mul()[0] < 0 and f.name == 'pn1':
+            mapper.update({f: f.subs({yind: INT(abs(yind))})})
 
     return Eq(lhs.subs(mapper), rhs.subs(mapper), subdomain=subdomain)
 
@@ -177,12 +176,11 @@ def neumann_left(eq, subdomain):
     for f in funcs:
         # Get the x index
         xind = f.indices[-2]
-        if (xind - x).as_coeff_Mul()[0] < 0:
+        if (xind - x).as_coeff_Mul()[0] < 0 and f.name == 'pn1':
             # Symmetric mirror
             # Substitute where index is negative for +ve
             # where index is positive
-            if f.name == 'pn1':
-                mapper.update({f: f.subs({xind: INT(abs(xind))})})
+            mapper.update({f: f.subs({xind: INT(abs(xind))})})
 
     return Eq(lhs.subs(mapper), rhs.subs(mapper), subdomain=subdomain)
 
diff --git a/tests/test_iet.py b/tests/test_iet.py
@@ -140,7 +140,7 @@ class FunctionPtr(Callback):
         def callback_form(self):
             param_types = ', '.join([str(t) for t in
                                      self.param_types])
-            return "(%s (*)(%s))%s" % (self.retval, param_types, self.name)
+            return f"({self.retval} (*)({param_types})){self.name}"
 
     a = Symbol('a')
     b = Symbol('b')
diff --git a/tests/test_petsc.py b/tests/test_petsc.py

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ def is_target_time(self, target):`
`80`	`80`
`81`	`81`	`def target_time(self, target):`
`82`	`82`	`target_time = [`
`83`		`- i for i, d in zip(target.indices, target.dimensions)`
	`83`	`+ i for i, d in zip(target.indices, target.dimensions, strict=True)`
`84`	`84`	`if d.is_Time`
`85`	`85`	`]`
`86`	`86`	`assert len(target_time) == 1`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ def _extend_build(self, base_dict):`
`149`	`149`	`)`
`150`	`150`
`151`	`151`	`# Build the bundle mapper`
`152`		`- for f_arr, x_arr in zip(f_components, x_components):`
	`152`	`+ for f_arr, x_arr in zip(f_components, x_components, strict=True):`
`153`	`153`	`bundle_mapper[f_arr.base] = fbundle`
`154`	`154`	`bundle_mapper[x_arr.base] = xbundle`
`155`	`155`