WIP WIP WIP

Author: FabioLuporini

devito/passes/iet/definitions.py

@@ -169,7 +169,6 @@ def _alloc_mapped_array_on_high_bw_mem(self, site, obj, storage, *args):
         decl = Definition(obj)
 
         # Symbols/pointers
-        size = Symbol(name='size', dtype=np.uint64, is_const=True)
         ffp0 = FieldFromPointer(obj._C_field_data, obj._C_symbol)
         ffp1 = FieldFromPointer(obj._C_field_shape, obj._C_symbol)
         ffp2 = FieldFromPointer(obj._C_field_size, obj._C_symbol)
@@ -188,10 +187,9 @@ def _alloc_mapped_array_on_high_bw_mem(self, site, obj, storage, *args):
 
         # Initialize the Array struct
         init = [*[DummyExpr(IndexedPointer(ffp1, i), s)
-                  for i, s in enumerate(obj.symbolic_shape)],
-                DummyExpr(size, obj.size, init=True),
-                DummyExpr(ffp2, size),
-                DummyExpr(ffp3, size*SizeOf(obj.indexed._C_typedata))]
+                  for i, s in enumerate(obj.c0.symbolic_shape)],
+                DummyExpr(ffp2, obj.size),
+                DummyExpr(ffp3, ffp2*SizeOf(obj.indexed._C_typedata))]
 
         # Allocate the underlying host data
         memptr = VOID(Byref(ffp0), '**')

devito/types/array.py

@@ -4,6 +4,7 @@
 import numpy as np
 from sympy import Expr, cacheit
 
+from devito.data import FULL
 from devito.tools import (Pickable, as_tuple, c_restrict_void_p,
                           dtype_to_ctype, dtypes_vector_mapper, is_integer)
 from devito.types.basic import AbstractFunction, LocalType
@@ -60,6 +61,13 @@ def shape_allocated(self):
     def is_const(self):
         return self._is_const
 
+    @property
+    def c0(self):
+        # ArrayBasic can be used as a base class for tensorial objects (that is,
+        # arrays whose components are AbstractFunctions). This property enables
+        # treating the two cases uniformly in some lowering passes
+        return self
+
 
 class Array(ArrayBasic):
 
@@ -425,7 +433,6 @@ def __halo_setup__(self, components=(), **kwargs):
 
     @property
     def c0(self):
-        # Shortcut for self.components[0]
         return self.components[0]
 
     # Class attributes overrides
@@ -464,18 +471,26 @@ def ncomp(self):
     def initvalue(self):
         return None
 
-    # Overrides defaulting to self.c0's behaviour
-
+    # Defaulting to self.c0's behaviour
     for i in ('_mem_internal_eager', '_mem_internal_lazy', '_mem_local',
               '_mem_mapped', '_mem_host', '_mem_stack', '_mem_constant',
               '_mem_shared', '_mem_shared_remote', '__padding_dtype__',
               '_size_domain', '_size_halo', '_size_owned', '_size_padding',
-              '_size_nopad', '_size_nodomain', '_offset_domain',
-              '_offset_halo', '_offset_owned', '_dist_dimensions',
-              '_C_get_field', 'grid', 'symbolic_shape',
+              '_size_nopad', '_size_nodomain', '_offset_domain', '_offset_halo',
+              '_offset_owned', '_dist_dimensions', '_C_get_field', 'grid',
               *AbstractFunction.__properties__):
         locals()[i] = property(lambda self, v=i: getattr(self.c0, v))
 
+    # Other overrides
+
+    @cached_property
+    def symbolic_shape(self):
+        from devito.symbolics import FieldFromPointer, IndexedPointer  # noqa
+        ffp = FieldFromPointer(self._C_field_shape, self._C_symbol)
+        ret = [s if is_integer(s) else IndexedPointer(ffp, i)
+               for i, s in enumerate(self.shape)]
+        return tuple(ret)
+
     @property
     def _mem_heap(self):
         return not any([self._mem_stack, self._mem_shared, self._mem_shared_remote])