Merge pull request #2169 from devitocodes/implicit-dim-no-eq

compiler: prevent Eq dims to be lost if only implicit

devito/ir/clusters/cluster.py

@@ -172,7 +172,8 @@ def used_dimensions(self):
         example, reduction or redundant (i.e., invariant) Dimensions won't
         appear in an expression.
         """
-        return {i for i in self.free_symbols if i.is_Dimension}
+        idims = set.union(*[set(e.implicit_dims) for e in self.exprs])
+        return {i for i in self.free_symbols if i.is_Dimension} | idims
 
     @cached_property
     def scope(self):

tests/test_dse.py

@@ -418,6 +418,19 @@ def test_contracted(self, exprs, expected, visit):
                 for j in trees] == expected
         assert "".join(mapper.get(i.dim.name, i.dim.name) for i in iters) == visit
 
+    def test_implicit_only(self):
+        grid = Grid(shape=(5, 5))
+        time = grid.time_dim
+        u = TimeFunction(name="u", grid=grid, time_order=1)
+        idimeq = Eq(Symbol('s'), 1, implicit_dims=time)
+
+        op = Operator([Eq(u.forward, u + 1.), idimeq])
+        trees = retrieve_iteration_tree(op)
+
+        assert len(trees) == 2
+        assert_structure(op, ['t,x,y', 't'], 'txy')
+        assert trees[1].dimensions == [time]
+
 
 class TestAliases(object):