compiler: rename lang to langbb throughout for clarity

Author: mloubout

devito/core/operator.py

@@ -71,7 +71,7 @@ class BasicOperator(Operator):
 
     SCALAR_MIN_TYPE = np.float16
     """
-    Minimum datatype for a scalar alias for a common sub-expression or CIRE temp.
+    Minimum datatype for a scalar arising from a common sub-expression or CIRE temp.
     """
 
     PAR_COLLAPSE_NCORES = 4

devito/operator/operator.py

@@ -261,7 +261,7 @@ def _lower(cls, expressions, **kwargs):
         # Create a symbol registry
         kwargs.setdefault('sregistry', SymbolRegistry())
         # Add lang-base kwargs
-        kwargs.setdefault('langbb', cls._Target.lang())
+        kwargs.setdefault('langbb', cls._Target.langbb())
         kwargs.setdefault('printer', cls._Target.Printer)
 
         expressions = as_tuple(expressions)

devito/passes/iet/definitions.py

@@ -70,7 +70,7 @@ def map(self, key, site, k, v):
 
 class DataManager:
 
-    lang = LangBB
+    langbb = LangBB
     """
     The language used to express data allocations, deletions, and host-device transfers.
     """
@@ -127,13 +127,13 @@ def _alloc_array_on_global_mem(self, site, obj, storage):
         name = self.sregistry.make_name(prefix='init_global')
         nbytes = SizeOf(obj._C_typedata)*obj.size
         body = [Definition(src),
-                self.lang['alloc-global-symbol'](obj.indexed, src.indexed, nbytes)]
+                self.langbb['alloc-global-symbol'](obj.indexed, src.indexed, nbytes)]
         efunc = make_callable(name, body)
         alloc = Call(name, efunc.parameters)
 
         storage.update(obj, site, allocs=alloc, efuncs=efunc)
 
-        return self.lang['header-memcpy']
+        return self.langbb['header-memcpy']
 
     def _alloc_scalar_on_low_lat_mem(self, site, expr, storage):
         """
@@ -150,9 +150,9 @@ def _alloc_host_array_on_high_bw_mem(self, site, obj, storage, *args):
         memptr = VOID(Byref(obj._C_symbol), '**')
         alignment = obj._data_alignment
         nbytes = SizeOf(obj._C_typedata)*obj.size
-        alloc = self.lang['host-alloc'](memptr, alignment, nbytes)
+        alloc = self.langbb['host-alloc'](memptr, alignment, nbytes)
 
-        free = self.lang['host-free'](obj._C_symbol)
+        free = self.langbb['host-free'](obj._C_symbol)
 
         storage.update(obj, site, allocs=(decl, alloc), frees=free)
 
@@ -172,24 +172,24 @@ def _alloc_mapped_array_on_high_bw_mem(self, site, obj, storage, *args):
         memptr = VOID(Byref(obj._C_symbol), '**')
         alignment = obj._data_alignment
         nbytes = SizeOf(obj._C_typedata)
-        allocs = [self.lang['host-alloc'](memptr, alignment, nbytes)]
+        allocs = [self.langbb['host-alloc'](memptr, alignment, nbytes)]
 
         nbytes_param = Symbol(name='nbytes', dtype=np.uint64, is_const=True)
         nbytes_arg = SizeOf(obj.indexed._C_typedata)*obj.size
 
         # Allocate the underlying host data
         ffp0 = FieldFromPointer(obj._C_field_data, obj._C_symbol)
         memptr = VOID(Byref(ffp0), '**')
-        allocs.append(self.lang['host-alloc-pin'](memptr, alignment, nbytes_param))
+        allocs.append(self.langbb['host-alloc-pin'](memptr, alignment, nbytes_param))
 
         # Initialize the Array struct
         ffp1 = FieldFromPointer(obj._C_field_nbytes, obj._C_symbol)
         init0 = DummyExpr(ffp1, nbytes_param)
         ffp2 = FieldFromPointer(obj._C_field_size, obj._C_symbol)
         init1 = DummyExpr(ffp2, 0)
 
-        frees = [self.lang['host-free-pin'](ffp0),
-                 self.lang['host-free'](obj._C_symbol)]
+        frees = [self.langbb['host-free-pin'](ffp0),
+                 self.langbb['host-free'](obj._C_symbol)]
 
         # Allocate the underlying device data, if required by the backend
         alloc, free = self._make_dmap_allocfree(obj, nbytes_param)
@@ -226,7 +226,7 @@ def _alloc_bundle_struct_on_high_bw_mem(self, site, obj, storage):
         memptr = VOID(Byref(obj._C_symbol), '**')
         alignment = obj._data_alignment
         nbytes = SizeOf(obj._C_typedata)
-        alloc = self.lang['host-alloc'](memptr, alignment, nbytes)
+        alloc = self.langbb['host-alloc'](memptr, alignment, nbytes)
 
         nbytes_param = Symbol(name='nbytes', dtype=np.uint64, is_const=True)
         nbytes_arg = SizeOf(obj.indexed._C_typedata)*obj.size
@@ -237,7 +237,7 @@ def _alloc_bundle_struct_on_high_bw_mem(self, site, obj, storage):
         ffp2 = FieldFromPointer(obj._C_field_size, obj._C_symbol)
         init1 = DummyExpr(ffp2, 0)
 
-        free = self.lang['host-free'](obj._C_symbol)
+        free = self.langbb['host-free'](obj._C_symbol)
 
         ret = Return(obj._C_symbol)
 
@@ -277,17 +277,17 @@ def _alloc_pointed_array_on_high_bw_mem(self, site, obj, storage):
         memptr = VOID(Byref(obj._C_symbol), '**')
         alignment = obj._data_alignment
         nbytes = SizeOf(obj._C_typedata, stars='*')*obj.dim.symbolic_size
-        alloc0 = self.lang['host-alloc'](memptr, alignment, nbytes)
+        alloc0 = self.langbb['host-alloc'](memptr, alignment, nbytes)
 
-        free0 = self.lang['host-free'](obj._C_symbol)
+        free0 = self.langbb['host-free'](obj._C_symbol)
 
         # The pointee Array
         pobj = IndexedPointer(obj._C_symbol, obj.dim)
         memptr = VOID(Byref(pobj), '**')
         nbytes = SizeOf(obj._C_typedata)*obj.array.size
-        alloc1 = self.lang['host-alloc'](memptr, alignment, nbytes)
+        alloc1 = self.langbb['host-alloc'](memptr, alignment, nbytes)
 
-        free1 = self.lang['host-free'](pobj)
+        free1 = self.langbb['host-free'](pobj)
 
         # Dump
         if obj.dim is self.sregistry.threadid:
@@ -322,15 +322,15 @@ def _inject_definitions(self, iet, storage):
             allocs = as_list(cbody.allocs) + flatten(v.allocs)
             stacks = as_list(cbody.stacks) + flatten(v.stacks)
             for tid, body in as_mapper(v.pallocs, itemgetter(0), itemgetter(1)).items():
-                header = self.lang.Region._make_header(tid.symbolic_size)
-                init = self.lang['thread-num'](retobj=tid)
+                header = self.langbb.Region._make_header(tid.symbolic_size)
+                init = self.langbb['thread-num'](retobj=tid)
                 allocs.append(Block(header=header, body=[init] + body))
 
             # frees/pfrees
             frees = []
             for tid, body in as_mapper(v.pfrees, itemgetter(0), itemgetter(1)).items():
-                header = self.lang.Region._make_header(tid.symbolic_size)
-                init = self.lang['thread-num'](retobj=tid)
+                header = self.langbb.Region._make_header(tid.symbolic_size)
+                init = self.langbb['thread-num'](retobj=tid)
                 frees.append(Block(header=header, body=[init] + body))
             frees.extend(as_list(cbody.frees) + flatten(v.frees))
 
@@ -455,7 +455,7 @@ def place_casts(self, iet, **kwargs):
         bases = [i for i in bases if i.name != i.function._C_name]
 
         # Create and attach the type casts
-        casts = tuple(self.lang.PointerCast(i.function, obj=i) for i in bases
+        casts = tuple(self.langbb.PointerCast(i.function, obj=i) for i in bases
                       if i not in defines)
         if casts:
             iet = iet._rebuild(body=iet.body._rebuild(casts=casts + iet.body.casts))
@@ -483,9 +483,9 @@ def _alloc_local_array_on_high_bw_mem(self, site, obj, storage):
         """
         Allocate a local Array in the device high bandwidth memory.
         """
-        deviceid = DefFunction(self.lang['device-get'].name)
-        doalloc = self.lang['device-alloc']
-        dofree = self.lang['device-free']
+        deviceid = DefFunction(self.langbb['device-get'].name)
+        doalloc = self.langbb['device-alloc']
+        dofree = self.langbb['device-free']
 
         nbytes = SizeOf(obj._C_typedata)*obj.size
         init = doalloc(nbytes, deviceid, retobj=obj)
@@ -503,8 +503,8 @@ def _map_array_on_high_bw_mem(self, site, obj, storage):
         if not obj._mem_mapped:
             return
 
-        mmap = self.lang._map_alloc(obj)
-        unmap = self.lang._map_delete(obj)
+        mmap = self.langbb._map_alloc(obj)
+        unmap = self.langbb._map_delete(obj)
 
         storage.update(obj, site, maps=mmap, unmaps=unmap)
 
@@ -521,22 +521,22 @@ def _map_function_on_high_bw_mem(self, site, obj, storage, devicerm, read_only=F
         """
         if read_only is False:
             if is_gpu_create(obj, self.gpu_create):
-                mmap = self.lang._map_alloc(obj)
+                mmap = self.langbb._map_alloc(obj)
 
                 efuncs, init = make_zero_init(obj, self.rcompile, self.sregistry)
 
                 mmap = (mmap, init)
             else:
-                mmap = self.lang._map_to(obj)
+                mmap = self.langbb._map_to(obj)
                 efuncs = ()
 
             # Copy back to host memory, release device memory
-            unmap = (self.lang._map_update(obj),
-                     self.lang._map_release(obj, devicerm=devicerm))
+            unmap = (self.langbb._map_update(obj),
+                     self.langbb._map_release(obj, devicerm=devicerm))
         else:
-            mmap = self.lang._map_to(obj)
+            mmap = self.langbb._map_to(obj)
             efuncs = ()
-            unmap = self.lang._map_delete(obj, devicerm=devicerm)
+            unmap = self.langbb._map_delete(obj, devicerm=devicerm)
 
         storage.update(obj, site, maps=mmap, unmaps=unmap, efuncs=efuncs)
 
@@ -587,7 +587,7 @@ def place_devptr(self, iet, **kwargs):
         dmaps = [i for i in FindSymbols('basics').visit(iet)
                  if isinstance(i, DeviceMap) and i not in defines]
 
-        maps = [self.lang.PointerCast(i.function, obj=i) for i in dmaps]
+        maps = [self.langbb.PointerCast(i.function, obj=i) for i in dmaps]
         body = iet.body._rebuild(maps=iet.body.maps + tuple(maps))
         iet = iet._rebuild(body=body)
 

devito/passes/iet/langbase.py

@@ -154,7 +154,7 @@ class LangTransformer(ABC):
     an IET for a certain target language (e.g., C, C+OpenMP).
     """
 
-    lang = LangBB
+    langbb = LangBB
     """
     The constructs of the target language. To be specialized by a subclass.
     """
@@ -205,19 +205,19 @@ def initialize(self, iet, options=None):
 
     @property
     def Region(self):
-        return self.lang.Region
+        return self.langbb.Region
 
     @property
     def HostIteration(self):
-        return self.lang.HostIteration
+        return self.langbb.HostIteration
 
     @property
     def DeviceIteration(self):
-        return self.lang.DeviceIteration
+        return self.langbb.DeviceIteration
 
     @property
     def Prodder(self):
-        return self.lang.Prodder
+        return self.langbb.Prodder
 
 
 class ShmTransformer(LangTransformer):
@@ -436,11 +436,11 @@ def _(iet):
                     except AttributeError:
                         pass
 
-            devicetype = as_list(self.lang[self.platform])
+            devicetype = as_list(self.langbb[self.platform])
             deviceid = self.deviceid
 
             try:
-                lang_init = [self.lang['init'](devicetype)]
+                lang_init = [self.langbb['init'](devicetype)]
             except TypeError:
                 # Not all target languages need to be explicitly initialized
                 lang_init = []
@@ -450,27 +450,27 @@ def _(iet):
                 rank_decl = DummyExpr(rank, 0)
                 rank_init = Call('MPI_Comm_rank', [objcomm, Byref(rank)])
 
-                ngpus, call_ngpus = self.lang._get_num_devices(self.platform)
+                ngpus, call_ngpus = self.langbb._get_num_devices(self.platform)
 
-                osdd_then = self.lang['set-device']([deviceid] + devicetype)
-                osdd_else = self.lang['set-device']([rank % ngpus] + devicetype)
+                osdd_then = self.langbb['set-device']([deviceid] + devicetype)
+                osdd_else = self.langbb['set-device']([rank % ngpus] + devicetype)
 
                 body = lang_init + [Conditional(
                     CondNe(deviceid, -1),
                     osdd_then,
                     List(body=[rank_decl, rank_init, call_ngpus, osdd_else]),
                 )]
 
-                header = c.Comment('Begin of %s+MPI setup' % self.lang['name'])
-                footer = c.Comment('End of %s+MPI setup' % self.lang['name'])
+                header = c.Comment('Begin of %s+MPI setup' % self.langbb['name'])
+                footer = c.Comment('End of %s+MPI setup' % self.langbb['name'])
             else:
                 body = lang_init + [Conditional(
                     CondNe(deviceid, -1),
-                    self.lang['set-device']([deviceid] + devicetype)
+                    self.langbb['set-device']([deviceid] + devicetype)
                 )]
 
-                header = c.Comment('Begin of %s setup' % self.lang['name'])
-                footer = c.Comment('End of %s setup' % self.lang['name'])
+                header = c.Comment('Begin of %s setup' % self.langbb['name'])
+                footer = c.Comment('End of %s setup' % self.langbb['name'])
 
             init = List(header=header, body=body, footer=footer)
             iet = iet._rebuild(body=iet.body._rebuild(init=init))
@@ -479,12 +479,12 @@ def _(iet):
 
         @_initialize.register(AsyncCallable)
         def _(iet):
-            devicetype = as_list(self.lang[self.platform])
+            devicetype = as_list(self.langbb[self.platform])
             deviceid = self.deviceid
 
             init = Conditional(
                 CondNe(deviceid, -1),
-                self.lang['set-device']([deviceid] + devicetype)
+                self.langbb['set-device']([deviceid] + devicetype)
             )
             iet = iet._rebuild(body=iet.body._rebuild(init=init))
 

devito/passes/iet/languages/C.py

@@ -31,11 +31,11 @@ class CBB(LangBB):
 
 
 class CDataManager(DataManager):
-    lang = CBB
+    langbb = CBB
 
 
 class COrchestrator(Orchestrator):
-    lang = CBB
+    langbb = CBB
 
 
 class CPrinter(BasePrinter, C99CodePrinter):

devito/passes/iet/languages/CXX.py

@@ -71,7 +71,7 @@ class CXXBB(LangBB):
         'def-complex': std_arith(),
         # Allocs
         'header-memcpy': 'string.h',
-        'header-algorithm': 'algorithm',
+        'header-math': 'algorithm',
         'host-alloc': lambda i, j, k:
             Call('posix_memalign', (i, j, k)),
         'host-alloc-pin': lambda i, j, k:

devito/passes/iet/languages/openacc.py

@@ -162,7 +162,7 @@ def _map_update_device_async(cls, f, imask=None, qid=None):
 
 class DeviceAccizer(PragmaDeviceAwareTransformer):
 
-    lang = AccBB
+    langbb = AccBB
 
     def _make_partree(self, candidates, nthreads=None):
         assert candidates
@@ -187,7 +187,7 @@ def _make_partree(self, candidates, nthreads=None):
 
 class DeviceAccDataManager(DeviceAwareDataManager):
 
-    lang = AccBB
+    langbb = AccBB
 
     @iet_pass
     def place_devptr(self, iet, **kwargs):
@@ -235,7 +235,7 @@ def place_devptr(self, iet, **kwargs):
             init = DummyExpr(tdp, 0, init=True)
 
             dpf = List(body=[
-                self.lang.mapper['map-serial-present'](hp, tdp),
+                self.langbb.mapper['map-serial-present'](hp, tdp),
                 Block(body=DummyExpr(tdp, cast(tdp.dtype)(hp, reinterpret=True)))
             ])
 
@@ -262,7 +262,7 @@ def place_devptr(self, iet, **kwargs):
 
 
 class AccOrchestrator(Orchestrator):
-    lang = AccBB
+    langbb = AccBB
 
 
 class AccPrinter(CXXPrinter):