compiler: Make DataSpace intervals get the upper limit available of time_dims

Author: georgebisbas

devito/ir/clusters/cluster.py

@@ -362,12 +362,11 @@ def dspace(self):
         intervals = intervals.promote(lambda d: not d.is_Sub)
         intervals = intervals.zero(set(intervals.dimensions) - oobs)
 
-        # Buffered TimeDimensions should inherit the higher upper bound
-        # of the involved parts
+        # DataSpace intervals should derive their upper bound from
+        # the higher upper bound available in the involved parts
         for f, v in parts.items():
             try:
-                if f.save:
-                    intervals = intervals.ceil(v[f.time_dim])
+                intervals = intervals.ceil(v[f.time_dim])
             except:
                 pass
 

devito/ir/support/space.py

@@ -399,9 +399,7 @@ def generate(cls, op, *interval_groups, relations=None):
         relations.update(set().union(*[ig.relations for ig in interval_groups]))
 
         modes = set(ig.mode for ig in interval_groups)
-
         assert len(modes) <= 1
-
         try:
             mode = modes.pop()
         except KeyError:

devito/types/dimension.py

@@ -340,7 +340,7 @@ def _arg_check(self, args, size, interval):
                 # Autopadding causes non-integer upper limit
                 from devito.symbolics import normalize_args
                 upper = interval.upper.subs(normalize_args(args))
-            if args[self.max_name] + upper >= size:
+            if args[self.max_name] + upper > size:
                 raise InvalidArgument("OOB detected due to %s=%d" % (self.max_name,
                                                                      args[self.max_name]))
 

tests/test_operator.py

@@ -2011,8 +2011,8 @@ def test_indirection(self):
         op = Operator(eqns)
 
         assert op._dspace[time].lower == 0
-        assert op._dspace[time].upper == 1
-        assert op.arguments()['time_M'] == nt - 2
+        assert op._dspace[time].upper == 0
+        assert op.arguments()['time_M'] == nt - 1
 
         op.apply()