misc: Change name from function_list to query_functions

Author: ZoeLeibowitz

devito/petsc/iet/logging.py

@@ -15,7 +15,7 @@ class PetscLogger:
     """
     def __init__(self, level, get_info=[], **kwargs):
 
-        self.function_list = get_info
+        self.query_functions = get_info
         self.sobjs = kwargs.get('solver_objs')
         self.sreg = kwargs.get('sregistry')
         self.section_mapper = kwargs.get('section_mapper', {})
@@ -32,8 +32,8 @@ def __init__(self, level, get_info=[], **kwargs):
                 # SNES specific
                 'snesgetiterationnumber',
             ]
-            self.function_list.extend(
-                [f for f in funcs if f not in self.function_list]
+            self.query_functions.extend(
+                [f for f in funcs if f not in self.query_functions]
             )
 
         # TODO: To be extended with if level <= DEBUG: ...
@@ -44,19 +44,19 @@ def __init__(self, level, get_info=[], **kwargs):
         self.statstruct = PetscInfo(
             name, pname, self.petsc_option_mapper, self.sobjs,
             self.section_mapper, self.inject_solve,
-            self.function_list
+            self.query_functions
         )
 
     @cached_property
     def petsc_option_mapper(self):
         """
-        For each function in `self.function_list`, look up its metadata in
+        For each function in `self.query_functions`, look up its metadata in
         `petsc_return_variable_dict` and instantiate the corresponding PETSc logging
         variables with names from the symbol registry.
 
         Example:
         --------
-        >>> self.function_list
+        >>> self.query_functions
         ['kspgetiterationnumber', 'snesgetiterationnumber', 'kspgettolerances']
 
         >>> self.petsc_option_mapper
@@ -66,7 +66,7 @@ def petsc_option_mapper(self):
         }
         """
         opts = {}
-        for func_name in self.function_list:
+        for func_name in self.query_functions:
             info = petsc_return_variable_dict[func_name]
             opts[info.name] = {}
             for vtype, out in zip(info.variable_type, info.output_param, strict=True):
@@ -81,7 +81,7 @@ def calls(self):
         """
         struct = self.statstruct
         calls = []
-        for func_name in self.function_list:
+        for func_name in self.query_functions:
             return_variable = petsc_return_variable_dict[func_name]
 
             input = self.sobjs[return_variable.input_params]

devito/petsc/logging.py

@@ -43,7 +43,7 @@ def __init__(self, params, *args, **kwargs):
         self._functions = list(dict.fromkeys(
             petsc_return_variable_dict[key].name
             for struct in self.petscinfos
-            for key in struct.function_list
+            for key in struct.query_functions
         ))
         self._property_name_map = {}
         # Dynamically create a property on this class for each PETSc function
@@ -71,7 +71,7 @@ def petsc_entry(self, petscinfo):
         # Collect the function names associated with this PetscInfo
         # instance (i.e., for a single PETScSolve).
         funcs = [
-            petsc_return_variable_dict[f].name for f in petscinfo.function_list
+            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)})
@@ -130,16 +130,16 @@ def __getitem__(self, key):
 class PetscInfo(CompositeObject):
 
     __rargs__ = ('name', 'pname', 'petsc_option_mapper', 'sobjs', 'section_mapper',
-                 'inject_solve', 'function_list')
+                 'inject_solve', 'query_functions')
 
     def __init__(self, name, pname, petsc_option_mapper, sobjs, section_mapper,
-                 inject_solve, function_list):
+                 inject_solve, query_functions):
 
         self.petsc_option_mapper = petsc_option_mapper
         self.sobjs = sobjs
         self.section_mapper = section_mapper
         self.inject_solve = inject_solve
-        self.function_list = function_list
+        self.query_functions = query_functions
         self.solve_expr = inject_solve.expr.rhs
 
         pfields = []