compiler: Fix abstract_object(Array)

Author: FabioLuporini

devito/passes/iet/engine.py

@@ -17,9 +17,9 @@
 from devito.symbolics import FieldFromComposite, FieldFromPointer, IndexedPointer, search
 from devito.tools import DAG, as_tuple, filter_ordered, sorted_priority, timed_pass
 from devito.types import (
-    Array, Bundle, ComponentAccess, CompositeObject, IncrDimension, Indirection, Lock,
-    ModuloDimension, NPThreads, NThreadsBase, Pointer, SharedData, Symbol, Temp,
-    ThreadArray, Wildcard
+    Array, Bundle, ComponentAccess, CompositeObject, FunctionMap, IncrDimension,
+    Indirection, ModuloDimension, NPThreads, NThreadsBase, Pointer, SharedData,
+    Symbol, Temp, ThreadArray, Wildcard
 )
 from devito.types.args import ArgProvider
 from devito.types.dense import DiscreteFunction
@@ -550,12 +550,19 @@ def _(i, mapper, sregistry):
 
 @abstract_object.register(Array)
 def _(i, mapper, sregistry):
-    if isinstance(i, Lock):
-        name = sregistry.make_name(prefix='lock')
+    name = sregistry.make_name(prefix=i._symbol_prefix)
+
+    if i.initvalue is not None:
+        initvalue = []
+        for v in i.initvalue:
+            try:
+                initvalue.append(v.xreplace(mapper))
+            except AttributeError:
+                initvalue.append(v)
     else:
-        name = sregistry.make_name(prefix='a')
+        initvalue = None
 
-    v = i._rebuild(name=name, alias=True)
+    v = i._rebuild(name=name, initvalue=initvalue, alias=True)
 
     mapper.update({
         i: v,
@@ -662,6 +669,16 @@ def _(i, mapper, sregistry):
     mapper[i] = i._rebuild(name=sregistry.make_name(prefix='ptr'))
 
 
+@abstract_object.register(FunctionMap)
+def _(i, mapper, sregistry):
+    name = sregistry.make_name(prefix=i._symbol_prefix)
+    tensor = mapper.get(i.tensor, i.tensor)
+
+    v = i._rebuild(name, tensor)
+
+    mapper[i] = v
+
+
 @abstract_object.register(NPThreads)
 def _(i, mapper, sregistry):
     mapper[i] = i._rebuild(name=sregistry.make_name(prefix='npthreads'))

devito/types/array.py

@@ -134,6 +134,8 @@ class Array(ArrayBasic):
 
     is_Array = True
 
+    _symbol_prefix = 'a'
+
     __rkwargs__ = (ArrayBasic.__rkwargs__ +
                    ('dimensions', 'scope', 'initvalue'))
 

devito/types/misc.py

@@ -19,6 +19,7 @@
     'CriticalRegion',
     'FIndexed',
     'Fence',
+    'FunctionMap',
     'Global',
     'Hyperplane',
     'Indirection',

devito/types/parallel.py

@@ -245,6 +245,8 @@ class Lock(Array):
 
     is_volatile = True
 
+    _symbol_prefix = 'lock'
+
     # Not a performance-sensitive object
     _data_alignment = False