compiler: Patch unexpansion with double precision

devitocodes · Oct 2, 2023 · 7af8fa3 · 7af8fa3
1 parent 5d98ac0
commit 7af8fa3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/devito/ir/support/properties.py b/devito/ir/support/properties.py
@@ -209,9 +209,6 @@ def is_parallel(self, dims):
         return any(len(self[d] & {PARALLEL, PARALLEL_INDEP}) > 0
                    for d in as_tuple(dims))
 
-    def is_parallel_atomic(self, dims):
-        return any(len(self[d] & {PARALLEL_IF_ATOMIC}) > 0 for d in as_tuple(dims))
-
     def is_parallel_relaxed(self, dims):
         return any(len(self[d] & PARALLELS) > 0 for d in as_tuple(dims))
 

diff --git a/devito/passes/clusters/derivatives.py b/devito/passes/clusters/derivatives.py
@@ -74,7 +74,7 @@ def _core(expr, c, weights, mapper, sregistry):
     try:
         w = weights[k]
     except KeyError:
-        w = weights[k] = w0._rebuild(name=name)
+        w = weights[k] = w0._rebuild(name=name, dtype=expr.dtype)
     expr = uxreplace(expr, {w0.indexed: w.indexed})
 
     dims = retrieve_dimensions(expr, deep=True)

diff --git a/devito/passes/clusters/implicit.py b/devito/passes/clusters/implicit.py
@@ -146,17 +146,12 @@ def callback(self, clusters, prefix):
                     )
                     tip = nxt
 
-<<<<<<< HEAD
             if ispaceN:
-                ispace = IterationSpace.union(c.ispace, ispaceN)
+                ispace = IterationSpace.union(c.ispace, ispaceN, relations=relations)
                 processed.append(c.rebuild(ispace=ispace))
             else:
                 processed.append(c)
             seen.add(d)
-=======
-            ispace = IterationSpace.union(c.ispace, ispaceN, relations=relations)
-            processed.append(c.rebuild(ispace=ispace))
->>>>>>> 68b8b814a (compiler: Speedup codegen by minimizing relations)
 
         return processed
 

diff --git a/tests/test_unexpansion.py b/tests/test_unexpansion.py
@@ -280,6 +280,20 @@ def test_v1(self):
         op.cfunction
 
 
+class TestMisc(object):
+
+    def test_double_precision(self):
+        grid = Grid(shape=(10, 10, 10), dtype=np.float64)
+
+        u = TimeFunction(name='u', grid=grid, space_order=4)
+
+        eqns = Eq(u.forward, u.laplace + 1.)
+
+        op = Operator(eqns, opt=('advanced', {'expand': False}))
+
+        op.cfunction
+
+
 def tti_sa_eqns(grid):
     t = grid.stepping_dim
     x, y, z = grid.dimensions