Merge pull request #2731 from devitocodes/patch-border

dsl: Fix SubDomainSet auxiliary dimension name to avoid clashes

Author: mloubout

devito/types/grid.py

@@ -873,7 +873,7 @@ def __subdomain_finalize_core__(self, grid):
         # SubDomainSet ID to make them unique so they can be used to key a dictionary
         # of replacements without risking overwriting.
         i_dim = Dimension(f'n_{str(id(self))}')
-        d_dim = DefaultDimension(name='d', default_value=2*grid.dim)
+        d_dim = DefaultDimension(name='sds_dim', default_value=2*grid.dim)
         sd_func = Function(name=self.name, grid=self._grid,
                            shape=(self._n_domains, 2*grid.dim),
                            dimensions=(i_dim, d_dim), dtype=np.int32)

tests/test_subdomains.py

@@ -6,8 +6,8 @@
 
 from conftest import opts_tiling, assert_structure
 from devito import (ConditionalDimension, Constant, Grid, Function, TimeFunction,
-                    Eq, solve, Operator, SubDomain, SubDomainSet, Lt, SparseTimeFunction,
-                    VectorFunction, TensorFunction, Border)
+                    Eq, solve, Operator, SubDomain, SubDomainSet, Lt, SparseFunction,
+                    SparseTimeFunction, VectorFunction, TensorFunction, Border)
 from devito.ir import FindNodes, FindSymbols, Expression, Iteration, SymbolRegistry
 from devito.tools import timed_region
 
@@ -724,6 +724,23 @@ class Dummy(SubDomainSet):
         assert y.is_Parallel
         assert z.is_Parallel
 
+    def test_subdomainset_w_sparse(self):
+        grid = Grid(shape=(11, 11))
+        f = Function(name='f', grid=grid)
+        s = SparseFunction(name='s', grid=grid, npoint=1)
+
+        border = SubDomainSet(N=1, bounds=(2, 2, 2, 2), grid=grid)
+        op = Operator([Eq(f, 0, subdomain=border)] + s.inject(f, expr=1))
+
+        # There was an issue where a clash between auxiliary dimension
+        # names used for SparseFunction and SubDomainSet resulted in
+        # cryptic errors when applying the operator
+        op()
+
+        check = np.zeros((11, 11))
+        check[0, 0] = 1
+        assert np.all(np.isclose(f.data, check))
+
 
 class TestBorder:
     # Note: This class is partially covered by doctests