misc: Tidy up leftovers

Author: EdCaunt

devito/ir/clusters/cluster.py

@@ -304,13 +304,12 @@ def dtype(self):
         """
         dtypes = set()
         for i in self.exprs:
-            # try:
-            if np.issubdtype(i.dtype, np.generic):
-                dtypes.add(i.dtype)
-            # except TypeError:
-            #     print(i, type(i), i.dtype, np.issubdtype(i.dtype, np.generic))
-            #     # E.g. `i.dtype` is a ctypes pointer, which has no dtype equivalent
-            #     pass
+            try:
+                if np.issubdtype(i.dtype, np.generic):
+                    dtypes.add(i.dtype)
+            except TypeError:
+                # E.g. `i.dtype` is a ctypes pointer, which has no dtype equivalent
+                pass
 
         return infer_dtype(dtypes)
 

devito/ir/equations/equation.py

@@ -8,7 +8,7 @@
 from devito.ir.support import (GuardFactor, Interval, IntervalGroup, IterationSpace,
                                Stencil, detect_io, detect_accesses)
 from devito.symbolics import IntDiv, limits_mapper, uxreplace
-from devito.tools import Pickable, Tag, frozendict, infer_dtype
+from devito.tools import Pickable, Tag, frozendict
 from devito.types import Eq, Inc, ReduceMax, ReduceMin, relational_min
 
 __all__ = ['LoweredEq', 'ClusterizedEq', 'DummyEq', 'OpInc', 'OpMin', 'OpMax',
@@ -48,10 +48,7 @@ def directions(self):
 
     @property
     def dtype(self):
-        try:
-            return infer_dtype({self.lhs.dtype, self.rhs.dtype} - {None})
-        except AttributeError:
-            return self.lhs.dtype
+        return self.lhs.dtype
 
     @property
     def state(self):

devito/passes/clusters/aliases.py

@@ -888,6 +888,7 @@ def lower_schedule(schedule, meta, sregistry, ftemps, min_dtype):
         else:
             # Degenerate case: scalar expression
             assert writeto.size == 0
+
             dtype = sympy_dtype(pivot, base=meta.dtype, smin=min_dtype)
             obj = Temp(name=name, dtype=dtype)
             expression = Eq(obj, uxreplace(pivot, subs))