compiler: always use long for alloc sizes

Author: mloubout

devito/passes/iet/definitions.py

@@ -90,17 +90,13 @@ def __init__(self, rcompile=None, sregistry=None, platform=None, **kwargs):
         self.rcompile = rcompile
         self.sregistry = sregistry
         self.platform = platform
-        self.index_mode = kwargs.get('options', {'index-mode': 'int32'})['index-mode']
 
     def intm(self, nbytes):
-        if self.index_mode == 'int64':
-            try:
-                syms = retrieve_symbols(nbytes)
-                return nbytes.subs({s: LONG(s) for s in syms})
-            except AttributeError:
-                return LONG(nbytes)
-        else:
-            return nbytes
+        try:
+            syms = retrieve_symbols(nbytes)
+            return nbytes.subs({s: LONG(s) for s in syms})
+        except AttributeError:
+            return LONG(nbytes)
 
     def _alloc_object_on_low_lat_mem(self, site, obj, storage):
         """
@@ -562,10 +558,10 @@ def process(self, graph):
 
 class DeviceAwareDataManager(DataManager):
 
-    def __init__(self, **kwargs):
-        self.gpu_fit = kwargs['options']['gpu-fit']
-        self.gpu_create = kwargs['options']['gpu-create']
-        self.pmode = kwargs['options'].get('place-transfers')
+    def __init__(self, options=None, **kwargs):
+        self.gpu_fit = options['gpu-fit']
+        self.gpu_create = options['gpu-create']
+        self.pmode = options.get('place-transfers')
 
         super().__init__(**kwargs)