compiler: patch multi-subdim isapce handling

Author: mloubout

devito/passes/clusters/implicit.py

@@ -175,13 +175,17 @@ def callback(self, clusters, prefix):
 
             # Make sure the "implicit expressions" are scheduled in
             # the innermost loop such that the thicknesses can be computed
-            edims = set(retrieve_dimensions(mapper.values(), deep=True))
-            if dim not in edims or not edims.issubset(prefix.dimensions):
+            def key(tkn):
+                edims = set(retrieve_dimensions(tkn, deep=True))
+                return dim._defines & edims and edims.issubset(prefix.dimensions)
+
+            mapper = {k: v for k, v in mapper.items() if key(v)}
+            if not mapper:
                 continue
 
             found[d.functions].clusters.append(c)
             found[d.functions].mapper = reduce(found[d.functions].mapper,
-                                               mapper, edims, prefix)
+                                               mapper, {dim}, prefix)
 
         # Turn the reduced mapper into a list of equations
         processed = []
@@ -262,7 +266,7 @@ def reduce(m0, m1, edims, prefix):
     def key(i):
         try:
             return i.indices[d]
-        except AttributeError:
+        except (KeyError, AttributeError):
             return i
 
     mapper = {}

devito/symbolics/inspection.py

@@ -13,7 +13,7 @@
 from devito.symbolics.extended_sympy import (CallFromPointer, Cast,
                                              DefFunction, ReservedWord)
 from devito.symbolics.queries import q_routine
-from devito.tools import as_tuple, prod
+from devito.tools import as_tuple, prod, is_integer
 from devito.tools.dtypes_lowering import infer_dtype
 
 __all__ = ['compare_ops', 'estimate_cost', 'has_integer_args', 'sympy_dtype']
@@ -287,13 +287,17 @@ def has_integer_args(*args):
         try:
             return np.issubdtype(args[0].dtype, np.integer)
         except AttributeError:
-            return args[0].is_integer
+            return is_integer(args[0])
 
     res = True
     for a in args:
         try:
             if isinstance(a, INT):
                 res = res and True
+            elif is_integer(a):
+                res = res and True
+            elif has_integer_args(a):
+                res = res and True
             elif len(a.args) > 0:
                 res = res and has_integer_args(*a.args)
             else: