Merge pull request #2704 from devitocodes/fix-inf-dir

compiler: prevent directions from non indexed

Author: mloubout

devito/ir/support/basic.py

@@ -61,9 +61,9 @@ class IterationInstance(LabeledVector):
         x, y, z : findices
         w : a generic Dimension
 
-           | x+1 |           |  x  |          |  x  |          | w |          | x+y |
-    obj1 = | y+2 | ,  obj2 = |  4  | , obj3 = |  x  | , obj4 = | y | , obj5 = |  y  |
-           | z-3 |           | z+1 |          |  y  |          | z |          |  z  |
+         | x+1 |          |  x  |         |  x  |         | w |         | x+y |
+    obj1 | y+2 |,  obj2 = |  4  |, obj3 = |  x  |, obj4 = | y |, obj5 = |  y  |
+         | z-3 |          | z+1 |         |  y  |         | z |         |  z  |
 
     We have that:
 
@@ -371,7 +371,8 @@ def distance(self, other):
                     # symbolic Lt or Gt operations,
                     # Note: Boolean is split to make the conditional short
                     # circuit more frequently for mild speedup.
-                    if smart_lt(v, sit.symbolic_min) or smart_gt(v, sit.symbolic_max):
+                    if smart_lt(v, sit.symbolic_min) or \
+                       smart_gt(v, sit.symbolic_max):
                         return Vector(S.ImaginaryUnit)
 
                 # Case 2: `sit` is an IterationInterval over a local SubDimension
@@ -403,19 +404,24 @@ def distance(self, other):
                     ret.append(other[n] - self[n])
                 else:
                     ret.append(self[n] - other[n])
+            elif sai in self.ispace and oai in other.ispace:
+                # E.g., `self=R<f,[x, y]>`, `sai=time`,
+                #       `self.itintervals=(time, x, y)`, `n=0`
+                continue
             elif not sai and not oai:
-                # E.g., `self=R<a,[3]>` and `other=W<a,[4]>`
                 if self[n] - other[n] == 0:
+                    # E.g., `self=R<a,[4]>` and `other=W<a,[4]>`
                     ret.append(S.Zero)
                 else:
+                    # E.g., `self=R<a,[3]>` and `other=W<a,[4]>`
                     break
-            elif sai in self.ispace and oai in other.ispace:
-                # E.g., `self=R<f,[x, y]>`, `sai=time`,
-                #       `self.itintervals=(time, x, y)`, `n=0`
-                continue
+            elif any(i is S.Infinity for i in (self[n], other[n])):
+                # E.g., `self=R<f,[oo, oo]>` (due to `self.access=f_vec->size[1]`)
+                # and `other=W<f,[t - 1, x + 1]>`
+                ret.append(S.Zero)
             else:
-                # E.g., `self=R<u,[t+1, ii_src_0+1, ii_src_1+2]>`, `fi=p_src`,
-                # and `n=1`
+                # E.g., `self=R<u,[t+1, ii_src_0+1]>`, `fi=p_src`, `n=1`
+                # E.g., `self=R<a,[time,x]>`, `other=W<a,[time,4]>`, `n=1`
                 return vinf(ret)
 
         n = len(ret)

devito/passes/iet/mpi.py

@@ -530,8 +530,11 @@ def _semantical_eq_loc_indices(hsf0, hsf1):
 
         # Special case: they might be syntactically different, but semantically
         # equivalent, e.g., `t0` and `t1` with same modulus
-        if v0.modulo == v1.modulo == 1:
-            continue
+        try:
+            if v0.modulo == v1.modulo == 1:
+                continue
+        except AttributeError:
+            return False
 
         return False
 

devito/types/dense.py

@@ -16,7 +16,7 @@
 from devito.logger import debug, warning
 from devito.mpi import MPI
 from devito.parameters import configuration
-from devito.symbolics import FieldFromPointer, normalize_args
+from devito.symbolics import FieldFromPointer, normalize_args, IndexedPointer
 from devito.finite_differences import Differentiable, generate_fd_shortcuts
 from devito.finite_differences.tools import fd_weights_registry
 from devito.tools import (ReducerMap, as_tuple, c_restrict_void_p, flatten,
@@ -719,7 +719,7 @@ def _C_make_index(self, dim, side=None):
     @memoized_meth
     def _C_get_field(self, region, dim, side=None):
         """Symbolic representation of a given data region."""
-        ffp = lambda f, i: FieldFromPointer("%s[%d]" % (f, i), self._C_symbol)
+        ffp = lambda f, i: IndexedPointer(FieldFromPointer(f"{f}", self._C_symbol), i)
         if region is DOMAIN:
             offset = ffp(self._C_field_owned_ofs, self._C_make_index(dim, LEFT))
             size = ffp(self._C_field_domain_size, self._C_make_index(dim))

tests/test_operator.py

@@ -35,7 +35,9 @@
 from devito.passes.iet.languages.C import CDataManager
 from devito.symbolics import ListInitializer, indexify, retrieve_indexed
 from devito.tools import flatten, powerset, timed_region
-from devito.types import Array, Barrier, CustomDimension, Indirection, Scalar, Symbol
+from devito.types import (
+    Array, Barrier, CustomDimension, Indirection, Scalar, Symbol, ConditionalDimension
+)
 
 
 def dimify(dimensions):
@@ -2034,6 +2036,23 @@ def test_2194_v2(self, eqns, expected, exp_trees, exp_iters):
         op.apply()
         assert(np.all(u.data[:] == expected[:]))
 
+    def test_pseudo_time_dep(self):
+        """
+        Test that a data dependency through a field is correctly
+        ignored when not direction dependent
+        """
+        grid = Grid((11, 11))
+        ct = ConditionalDimension(name='ct', parent=grid.time_dim, factor=2)
+        f = TimeFunction(name='f', grid=grid, time_order=1)
+        g = Function(name='g', grid=grid)
+
+        eq = [Eq(f.backward, div(f) + 1),
+              Eq(g, g + f.symbolic_shape[1], implicit_dims=ct),
+              Eq(g, g + 1, implicit_dims=ct)]
+        op = Operator(eq)
+
+        assert_structure(op, ['t,x,y', 't', 't,x,y'], 't,x,y,x,y')
+
 
 class TestInternals: