compiler: Tweaks for memory estimation

Author: EdCaunt

devito/operator/operator.py

@@ -1371,28 +1371,27 @@ def get_nbytes(obj):
 
         # Filter out arrays, aliases and non-AbstractFunction objects
         op_symbols = [i for i in op_symbols if i.is_AbstractFunction
-                      and not i.is_Array and not i.alias]
+                      and not i.is_ArrayBasic and not i.alias]
 
         for i in op_symbols:
             # FIXME: Probably wrong for streamed functions
+            # TODO: Need a hook for PRO here
             # Will overreport memory usage currently
             try:
                 # TODO: is _obj even needed?
                 v = get_nbytes(self[i.name]._obj)
             except AttributeError:
                 v = get_nbytes(self.get(i.name, i))
 
-            if i._mem_host:
+            if i._mem_host or i._mem_mapped:
+                # No need to add to device , as it will be counted
+                # by nbytes_consumed_memmapped
                 host += v
             elif i._mem_local:
                 if isinstance(self.platform, Device):
                     device += v
                 else:
                     host += v
-            elif i._mem_mapped:
-                # No need to add to device, as it will be counted
-                # by nbytes_consumed_memmapped
-                host += v
 
         return {disk_layer: 0, host_layer: host, device_layer: device}