misc: More clean up

Author: ZoeLeibowitz

devito/petsc/types/metadata.py

@@ -722,7 +722,7 @@ def _make_initial_guess(self, expr):
             )
         else:
             return None
-        
+
 
 class ConstrainBC:
     """
@@ -769,7 +769,7 @@ def _make_increment_expr(self, expr):
             )
         else:
             return None
-        
+
     def _make_point_bc_exprs(self, exprs):
         """
         Return a list of symbolic expressions
@@ -801,7 +801,7 @@ def _make_point_bc_expr(self, expr):
             )
         else:
             return None
-        
+
 
 def targets_to_arrays(array, targets):
     """
@@ -825,4 +825,3 @@ def targets_to_arrays(array, targets):
         array.subs(dict(zip(array.indices, i))) for i in space_indices
     ]
     return frozendict(zip(targets, array_targets))
-

devito/petsc/types/object.py

@@ -1,5 +1,4 @@
 from ctypes import POINTER, c_char
-from functools import cached_property
 
 from devito.tools import CustomDtype, dtype_to_ctype, as_tuple, CustomIntType
 from devito.types import (
@@ -12,7 +11,8 @@
 from devito.petsc.iet.nodes import petsc_call
 
 
-# TODO: unnecessary use of "CALLBACK" types - just create a simple way of destroying or not destroying a certain type
+# TODO: unnecessary use of "CALLBACK" types - just create a simple
+# way of destroying or not destroying a certain type
 
 
 class PetscMixin:
@@ -212,12 +212,6 @@ class SingleIS(PetscObject):
     dtype = CustomDtype('IS')
 
 
-# class SingleISDestroy(SingleIS):
-#     @property
-#     def _C_free(self):
-#         return petsc_call('ISDestroy', [Byref(self.function)])
- 
-
 class PetscSectionGlobal(PetscObject):
     dtype = CustomDtype('PetscSection')
 
@@ -328,7 +322,7 @@ class CallbackPointerIS(PETScArrayObject):
     @property
     def dtype(self):
         return CustomDtype('IS', modifier=' *')
-    
+
 
 class CallbackPointerPetscInt(PETScArrayObject):
     """
@@ -384,7 +378,8 @@ class NofSubMats(Scalar, LocalType):
     pass
 
 
-# Can this be attached to the consrain bc object in metadata maybe? probs shoulnd't be here
+# Can this be attached to the consrain bc object in metadata maybe? probs
+# shoulnd't be here
 Counter = PetscInt(name='count')
 
 

devito/types/dimension.py

@@ -822,70 +822,6 @@ def __init_finalize__(self, name, parent, thickness, functions=None,
     @cached_property
     def bound_symbols(self):
         return self.parent.bound_symbols
-    
-
-# class CustomBoundSubDimension(SubDimension):
-
-#     # have is_CustomSub = True ... here?
-
-#     __rargs__ = SubDimension.__rargs__ + ('custom_left', 'custom_right')
-
-#     def __init_finalize__(self, name, parent, thickness, local,
-#                           custom_left=0, custom_right=0, **kwargs):
-#         self._custom_left = custom_left
-#         self._custom_right = custom_right
-#         super().__init_finalize__(name, parent, thickness, local)
-
-#     @property
-#     def custom_left(self):
-#         return self._custom_left
-
-#     @property
-#     def custom_right(self):
-#         return self._custom_right
-
-#     @cached_property
-#     def _interval(self):
-#         left = self.custom_left
-#         right = self.custom_right
-#         return sympy.Interval(left, right)
-
-
-# class CustomBoundSpaceDimension(SpaceDimension):
-
-#     # have is_CustomSub = True ... here?
-
-#     __rargs__ = SpaceDimension.__rargs__ + ('custom_left', 'custom_right')
-
-#     def __init_finalize__(self, name,
-#                           custom_left=0, custom_right=0, **kwargs):
-#         self._custom_left = custom_left
-#         self._custom_right = custom_right
-#         super().__init_finalize__(name, **kwargs)
-
-#     @property
-#     def custom_left(self):
-#         return self._custom_left
-
-#     @property
-#     def custom_right(self):
-#         return self._custom_right
-
-#     @cached_property
-#     def _interval(self):
-#         left = self.custom_left
-#         right = self.custom_right
-#         return sympy.Interval(left, right)
-    
-#     @cached_property
-#     def symbolic_min(self):
-#         """Symbol defining the minimum point of the Dimension."""
-#         return Scalar(name=self.max_name, dtype=np.int32, is_const=True)
-
-#     @cached_property
-#     def symbolic_max(self):
-#         """Symbol defining the maximum point of the Dimension."""
-#         return Scalar(name=self.max_name, dtype=np.int32, is_const=True)
 
 
 class SubsamplingFactor(Scalar):

devito/types/misc.py

@@ -8,8 +8,8 @@
     # Moved in 1.13
     from sympy.core.basic import ordering_of_classes
 
-from devito.types import Array, CompositeObject, Indexed, Symbol, LocalObject, ArrayObject
-from devito.types.basic import IndexedData, DataSymbol
+from devito.types import Array, CompositeObject, Indexed, Symbol, LocalObject
+from devito.types.basic import IndexedData
 from devito.tools import CustomDtype, Pickable, as_tuple, frozendict
 
 __all__ = ['Timer', 'Pointer', 'VolatileInt', 'FIndexed', 'Wildcard', 'Fence',
@@ -149,7 +149,6 @@ def bind(self, pname):
         findexed = self.func(accessor=accessor)
 
         return ((define, expr), findexed)
-    
 
     @property
     def linear_index(self):
@@ -162,7 +161,7 @@ def linear_index(self):
             for idx, d in zip(indices, f.dimensions[1:])
         ]
         items.append(indices[-1])
-        
+
         return sympy.Add(*items, evaluate=False)
 
     func = Pickable._rebuild