misc: Minor edits and clean up

Author: ZoeLeibowitz

devito/operator/profiling.py

@@ -213,7 +213,7 @@ def summary(self, args, dtype, params, reduce_over=None):
             else:
                 summary.add(name, None, time)
 
-        # Add the language specific summary if necessary
+        # Add the language-specific summary if necessary
         mapper_func = language_summary_mapper.get(self.language)
         if mapper_func:
             summary.add_language_summary(self.language, mapper_func(params))
@@ -347,7 +347,7 @@ def summary(self, args, dtype, params, reduce_over=None):
                     # data transfers)
                     summary.add_glb_fdlike('fdlike-nosetup', points, reduce_over_nosetup)
 
-        # Add the language specific summary if necessary
+        # Add the language-specific summary if necessary
         mapper_func = language_summary_mapper.get(self.language)
         if mapper_func:
             summary.add_language_summary(self.language, mapper_func(params))

devito/petsc/iet/logging.py

@@ -3,6 +3,7 @@
 from devito.symbolics import Byref, FieldFromPointer
 from devito.ir.iet import DummyExpr
 from devito.logger import PERF
+from devito.tools import frozendict
 
 from devito.petsc.iet.utils import petsc_call
 from devito.petsc.logging import petsc_return_variable_dict, PetscInfo
@@ -31,9 +32,9 @@ def __init__(self, level, get_info=[], **kwargs):
                 # SNES specific
                 'snesgetiterationnumber',
             ]
-            for f in funcs:
-                if f not in self.function_list:
-                    self.function_list.append(f)
+            self.function_list.extend(
+                [f for f in funcs if f not in self.function_list]
+            )
 
         # TODO: To be extended with if level <= DEBUG: ...
 
@@ -70,7 +71,7 @@ def petsc_option_mapper(self):
             opts[info.name] = {}
             for vtype, out in zip(info.variable_type, info.output_param, strict=True):
                 opts[info.name][out] = vtype(self.sreg.make_name(prefix=out))
-        return opts
+        return frozendict(opts)
 
     @cached_property
     def calls(self):

devito/petsc/iet/routines.py

@@ -37,7 +37,7 @@ def __init__(self, **kwargs):
         self.objs = kwargs.get('objs')
         self.solver_objs = kwargs.get('solver_objs')
         self.inject_solve = kwargs.get('inject_solve')
-        self.solver_parameters = self.inject_solve.expr.rhs.solver_parameters
+        self.solve_expr = self.inject_solve.expr.rhs
 
         self._efuncs = OrderedDict()
         self._struct_params = []
@@ -95,9 +95,17 @@ def initial_guesses(self):
     def user_struct_callback(self):
         return self._user_struct_callback
 
+    @property
+    def solver_parameters(self):
+        return self.solve_expr.solver_parameters
+
     @property
     def field_data(self):
-        return self.inject_solve.expr.rhs.field_data
+        return self.solve_expr.field_data
+
+    @property
+    def formatted_prefix(self):
+        return self.solve_expr.formatted_prefix
 
     @property
     def arrays(self):
@@ -142,7 +150,7 @@ def _make_options_callback(self):
         command line arguments.
         """
         params = self.solver_parameters
-        prefix = self.inject_solve.expr.rhs.formatted_prefix
+        prefix = self.formatted_prefix
 
         set_body, clear_body = [], []
 

devito/petsc/initialize.py

@@ -23,7 +23,7 @@ def PetscInitialize(clargs=sys.argv):
         dummy = Symbol(name='d')
 
         if clargs is not sys.argv:
-            clargs = [sys.argv[0], *clargs]
+            clargs = (sys.argv[0], *clargs)
 
         _petsc_clargs = clargs
 

devito/petsc/logging.py

@@ -73,7 +73,7 @@ def petsc_entry(self, petscinfo):
         funcs = [
             petsc_return_variable_dict[f].name for f in petscinfo.function_list
         ]
-        values = tuple(getattr(petscinfo, c) for c in funcs)
+        values = [getattr(petscinfo, c) for c in funcs]
         return PetscEntry(**{k: v for k, v in zip(funcs, values)})
 
     def _add_properties(self):
@@ -140,7 +140,7 @@ def __init__(self, name, pname, petsc_option_mapper, sobjs, section_mapper,
         self.section_mapper = section_mapper
         self.inject_solve = inject_solve
         self.function_list = function_list
-        self.formatted_prefix = inject_solve.expr.rhs.formatted_prefix
+        self.solve_expr = inject_solve.expr.rhs
 
         pfields = []
 
@@ -160,19 +160,20 @@ def __init__(self, name, pname, petsc_option_mapper, sobjs, section_mapper,
     def fields(self):
         return self._fields
 
+    @property
+    def prefix(self):
+        # If users provide an options prefix, use it in the summary;
+        # otherwise, use the default one generated by Devito
+        return self.solve_expr.user_prefix or self.solve_expr.formatted_prefix
+
     @property
     def section(self):
         section = self.section_mapper.items()
         return next((k[0].name for k, v in section if self.inject_solve in v), None)
 
     @property
     def summary_key(self):
-        # If users provide an options prefix, use it in the summary;
-        # otherwise, use the default one generated by Devito
-        user_prefix = self.inject_solve.expr.rhs.user_prefix
-        if user_prefix is None:
-            user_prefix = self.formatted_prefix
-        return (self.section, user_prefix)
+        return (self.section, self.prefix)
 
     def __getattr__(self, attr):
         if attr not in self.petsc_option_mapper:
@@ -181,10 +182,10 @@ def __getattr__(self, attr):
         # Maps the petsc_option to its generated variable name e.g {'its': its0}
         obj_mapper = self.petsc_option_mapper[attr]
 
-        # Decode the value if it is a bytes object
-        def decode_if_bytes(val):
+        def get_val(val):
+            val = getattr(self.value._obj, val.name)
+            # Decode the val if it is a bytes object
             return str(os.fsdecode(val)) if isinstance(val, bytes) else val
-        get_val = lambda v: decode_if_bytes(getattr(self.value._obj, v.name))
 
         # - If the function returns a single value (e.g., KSPGetIterationNumber),
         #   return that value directly.

devito/petsc/solver_parameters.py

@@ -34,8 +34,8 @@ def linear_solver_parameters(solver_parameters):
 def format_options_prefix(options_prefix):
     # NOTE: Modified from the `OptionsManager` inside petsctools
     if not options_prefix:
-        options_prefix = f"devito_{next(_options_prefix_counter)}_"
-    else:
-        if not options_prefix.endswith("_"):
-            options_prefix += "_"
-    return options_prefix
+        return f"devito_{next(_options_prefix_counter)}_"
+
+    if options_prefix.endswith("_"):
+        return options_prefix
+    return options_prefix + "_"