api: fix xreplace for enrichedtuple

Author: mloubout

devito/symbolics/manipulation.py

@@ -16,7 +16,9 @@
 from devito.symbolics.unevaluation import Mul as UnevalMul
 from devito.symbolics.unevaluation import Pow as UnevalPow
 from devito.symbolics.unevaluation import UnevaluableMixin
-from devito.tools import as_list, as_tuple, flatten, split, transitive_closure
+from devito.tools import (
+    EnrichedTuple, as_list, as_tuple, flatten, split, transitive_closure
+)
 from devito.types.array import ComponentAccess
 from devito.types.basic import Basic, Indexed
 from devito.types.equation import Eq
@@ -130,6 +132,12 @@ def _(iterable, rule):
     return iterable.__class__(ret), changed
 
 
+@_uxreplace_dispatch.register(EnrichedTuple)
+def _(iterable, rule):
+    retval, changed = _uxreplace_dispatch(tuple(iterable), rule)
+    return iterable.__class__(*retval, getters=iterable.getters), changed
+
+
 @_uxreplace_dispatch.register(dict)
 def _(mapper, rule):
     ret = {}

devito/types/basic.py

@@ -762,7 +762,7 @@ def __new__(cls, *args, **kwargs):
         # Initialization. The following attributes must be available
         # when executing __init_finalize__
         newobj._name = name
-        newobj._dimensions = DimensionTuple(*dimensions, getters=dimensions)
+        newobj._dimensions = dimensions
         newobj._shape = cls.__shape_setup__(**kwargs)
         newobj._dtype = cls.__dtype_setup__(**kwargs)
 
@@ -971,7 +971,7 @@ def origin(self):
     @property
     def dimensions(self):
         """Tuple of Dimensions representing the object indices."""
-        return self._dimensions
+        return DimensionTuple(*self._dimensions, getters=self._dimensions)
 
     @cached_property
     def space_dimensions(self):