compiler: misc fixes from lowering multiple sparse operations with mixd prec

Author: mloubout

devito/ir/clusters/algorithms.py

@@ -484,7 +484,8 @@ def callback(self, clusters, prefix, seen=None):
             # `c` is scheduled
             index = 0
             for i in reversed(range(n)):
-                if not processed[i].ispace.is_subset(c.ispace):
+                if not processed[i].ispace.is_subset(c.ispace) and \
+                   not processed[i].is_sparse:
                     index = i + 1
                     break
             processed.insert(index, halo_touch)

devito/operations/interpolators.py

@@ -425,7 +425,7 @@ def _interpolate(self, expr, increment=False, self_subs=None, implicit_dims=None
                                            subdomain=subdomain)
 
         # Accumulate point-wise contributions into a temporary
-        rhs = Symbol(name='sum', dtype=self.sfunction.dtype)
+        rhs = Symbol(name=f'sum{self.sfunction.name}', dtype=self.sfunction.dtype)
         summands = [Eq(rhs, 0., implicit_dims=implicit_dims)]
         # Substitute coordinate base symbols into the interpolation coefficients
         weights = self._weights(subdomain=subdomain)

devito/symbolics/inspection.py

@@ -316,11 +316,14 @@ def sympy_dtype(expr, base=None, default=None, smin=None):
     if expr is None:
         return default
 
-    dtypes = {base} - {None}
+    dtypes = set()
     for i in expr.free_symbols:
         with suppress(AttributeError):
             dtypes.add(i.dtype)
 
+    if not dtypes:
+        dtypes = {base} - {None}
+
     dtype = infer_dtype(dtypes)
 
     # Promote if we missed complex number, i.e f + I

devito/tools/dtypes_lowering.py

@@ -371,4 +371,5 @@ def extract_dtype(expr):
     """Extract the "winning" dtype from an expression"""
     dtypes = {getattr(e, 'dtype', None)
               for e in expr.free_symbols}
+
     return infer_dtype(dtypes - {None})