port mappers away from deprecated CachingMapperMixin

Author: alexfikl

pymbolic/geometric_algebra/mapper.py

@@ -31,7 +31,7 @@
         Collector as CollectorBase,
         IdentityMapper as IdentityMapperBase,
         WalkMapper as WalkMapperBase,
-        CachingMapperMixin
+        CachedMapper,
         )
 from pymbolic.mapper.constant_folder import (
         ConstantFoldingMapper as ConstantFoldingMapperBase)
@@ -170,7 +170,11 @@ def map_derivative_source(self, expr):
 
 # {{{ derivative binder
 
-class DerivativeSourceAndNablaComponentCollector(CachingMapperMixin, Collector):
+class DerivativeSourceAndNablaComponentCollector(CachedMapper, Collector):
+    def __init__(self) -> None:
+        Collector.__init__(self)
+        CachedMapper.__init__(self)
+
     def map_nabla(self, expr):
         raise RuntimeError("DerivativeOccurrenceMapper must be invoked after "
                 "Dimensionalizer--Nabla found, not allowed")

pymbolic/mapper/flop_counter.py

@@ -20,7 +20,7 @@
 THE SOFTWARE.
 """
 
-from pymbolic.mapper import CombineMapper, CachingMapperMixin
+from pymbolic.mapper import CombineMapper, CachedMapper
 
 
 class FlopCounterBase(CombineMapper):
@@ -55,9 +55,10 @@ def map_if_positive(self, expr):
                 self.rec(expr.else_))
 
 
-class FlopCounter(FlopCounterBase, CachingMapperMixin):
-    def map_common_subexpression_uncached(self, expr):
-        return self.rec(expr.child)
+class FlopCounter(CachedMapper, FlopCounterBase):
+    def __init__(self) -> None:
+        FlopCounterBase.__init__(self)
+        CachedMapper.__init__(self)
 
 
 class CSEAwareFlopCounter(FlopCounterBase):
@@ -70,6 +71,7 @@ class CSEAwareFlopCounter(FlopCounterBase):
         reuse may take place.
     """
     def __init__(self):
+        super().__init__()
         self.cse_seen_set = set()
 
     def map_common_subexpression(self, expr):