api: fix interpolate with complex dtype

Author: mloubout

devito/finite_differences/finite_difference.py

@@ -157,8 +157,6 @@ def first_derivative(expr, dim, fd_order, **kwargs):
 
 def make_derivative(expr, dim, fd_order, deriv_order, side, matvec, x0, coefficients,
                     expand, weights=None):
-    if deriv_order == 0 and not expr.is_Add:
-        print(expr, dim, fd_order)
     # Always expand time derivatives to avoid issue with buffering and streaming.
     # Time derivative are almost always short stencils and won't benefit from
     # unexpansion in the rare case the derivative is not evaluated for time stepping.

devito/ir/equations/equation.py

@@ -243,6 +243,19 @@ def __new__(cls, *args, **kwargs):
                 shift = 0
             expr = uxreplace(expr, {d: IntDiv(index, d.symbolic_factor) + shift})
 
+        # Merge conditionals when possible. E.g if we have an implicit_dim
+        # and there is a dimension with the same parent, we ca merged
+        # its condition
+        for d in input_expr.implicit_dims:
+            if d not in conditionals:
+                continue
+            for cd in dict(conditionals):
+                if cd.parent == d.parent and cd != d:
+                    cond = conditionals.pop(d)
+                    mode = cd.relation and d.relation
+                    conditionals[cd] = mode(cond, conditionals[cd])
+                    break
+
         conditionals = frozendict(conditionals)
 
         # Lower all Differentiable operations into SymPy operations

devito/passes/clusters/cse.py

@@ -103,9 +103,14 @@ def cse(cluster, sregistry=None, options=None, **kwargs):
     if cluster.is_fence:
         return cluster
 
+<<<<<<< HEAD
     def make(e):
         edtype = cse_dtype(e.dtype, dtype)
         return CTemp(name=sregistry.make_name(), dtype=edtype)
+=======
+    make_dtype = lambda e: cse_dtype(e.dtype, dtype)
+    make = lambda e: CTemp(name=sregistry.make_name(), dtype=make_dtype(e))
+>>>>>>> 54c5e49e2 (api: fix interpolate with complex dtype)
 
     exprs = _cse(cluster, make, min_cost=min_cost, mode=mode)