compiler: Tidy up Interval.expand()

devito/ir/clusters/cluster.py

@@ -255,7 +255,6 @@ def dspace(self):
  if f is None:
  continue
 
- #TODO OOOOOOOo
  intervals = [Interval(d,
  min([sdims_min(i) for i in offs]),
  max([sdims_max(i) for i in offs]))

devito/ir/support/space.py

@@ -6,10 +6,11 @@
 from cached_property import cached_property
 from sympy import Expr
 
+from devito.ir.support.utils import sdims_min, sdims_max
 from devito.ir.support.vector import Vector, vmin, vmax
 from devito.tools import (PartialOrderTuple, Stamp, as_list, as_tuple, filter_ordered,
  flatten, frozendict, is_integer, toposort)
-from devito.types import Dimension, ModuloDimension, StencilDimension
+from devito.types import Dimension, ModuloDimension
 
 __all__ = ['NullInterval', 'Interval', 'IntervalGroup', 'IterationSpace',
  'DataSpace', 'Forward', 'Backward', 'Any']
@@ -285,15 +286,8 @@ def promote(self, cond):
  return self
 
  def expand(self):
- lower = self.lower
- if isinstance(self.lower, Expr):
- for i in self.lower.find(StencilDimension):
- lower = lower.subs(i, i._min)
- upper = self.upper
- if isinstance(self.upper, Expr):
- for i in self.upper.find(StencilDimension):
- upper = upper.subs(i, i._max)
- return Interval(self.dim, lower, upper, self.stamp)
+ return Interval(self.dim, sdims_min(self.lower), sdims_max(self.upper),
+ self.stamp)
 
 
 class IntervalGroup(PartialOrderTuple):