misc: f-string formatting

Author: mloubout

devito/arch/archinfo.py

@@ -330,7 +330,7 @@ def cbk(deviceid=0):
     except OSError:
         pass
 
-    # *** Third try: `sycl-ls`
+    # *** Third try: `sycl-ls`, clearly only works with Intel cards
     try:
         gpu_infos = {}
 
@@ -453,7 +453,6 @@ def parse_product_arch():
         for line in lines:
             # Graphics cards are listed as VGA or 3D controllers in lspci
             if 'VGA' in line or '3D' in line or 'Display' in line:
-                print(line)
                 gpu_info = {}
                 # Lines produced by lspci command are of the form:
                 #   xxxx:xx:xx.x Device Type: Name

devito/arch/compiler.py

@@ -180,7 +180,7 @@ def __init__(self):
     """
 
     fields = {'cc', 'ld'}
-    default_cpp = False
+    _default_cpp = False
     _cxxstd = 'c++14'
     _cstd = 'c99'
 
@@ -193,7 +193,7 @@ def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
         self.__lookup_cmds__()
-        self._cpp = kwargs.get('cpp', self.default_cpp)
+        self._cpp = kwargs.get('cpp', self._default_cpp)
 
         self.suffix = kwargs.get('suffix')
         if not kwargs.get('mpi'):
@@ -602,7 +602,7 @@ def __lookup_cmds__(self):
 
 class PGICompiler(Compiler):
 
-    default_cpp = True
+    _default_cpp = True
 
     def __init_finalize__(self, **kwargs):
 
@@ -655,7 +655,7 @@ def __lookup_cmds__(self):
 
 class CudaCompiler(Compiler):
 
-    default_cpp = True
+    _default_cpp = True
 
     def __init_finalize__(self, **kwargs):
 
@@ -729,7 +729,7 @@ def __lookup_cmds__(self):
 
 class HipCompiler(Compiler):
 
-    default_cpp = True
+    _default_cpp = True
 
     def __init_finalize__(self, **kwargs):
 
@@ -890,7 +890,7 @@ def __lookup_cmds__(self):
 
 class SyclCompiler(OneapiCompiler):
 
-    default_cpp = True
+    _default_cpp = True
 
     def __init_finalize__(self, **kwargs):
         IntelCompiler.__init_finalize__(self, **kwargs)
@@ -957,7 +957,6 @@ def __new__(cls, *args, **kwargs):
         obj = super().__new__(cls)
         # Keep base to initialize accordingly
         obj._base = kwargs.pop('base', _base)
-        obj.default_cpp = obj._base.default_cpp
 
         return obj
 
@@ -988,6 +987,10 @@ def __lookup_cmds__(self):
     def __new_with__(self, **kwargs):
         return super().__new_with__(base=self._base, **kwargs)
 
+    @property
+    def _default_cpp(self):
+        return self._base._default_cpp
+
 
 class CompilerRegistry(dict):
     """

devito/core/operator.py

@@ -138,6 +138,11 @@ class BasicOperator(Operator):
     (default) or `int64`.
     """
 
+    LINEARIZE = False
+    """
+    Linearize n-dimensional Indexeds.
+    """
+
     ERRCTL = None
     """
     Runtime error checking. If this option is enabled, the generated code will
@@ -150,11 +155,6 @@ class BasicOperator(Operator):
     The target language constructor, to be specified by subclasses.
     """
 
-    LINEARIZE = False
-    """
-    Linearize n-dimensional Indexeds.
-    """
-
     @classmethod
     def _normalize_kwargs(cls, **kwargs):
         # Will be populated with dummy values; this method is actually overriden

devito/ir/cgen/printer.py

@@ -65,7 +65,7 @@ def compiler(self):
     def doprint(self, expr, assign_to=None):
         """
         The sympy code printer does a lot of extra we do not need as we handle all of
-        it in the compiler so we directly defaults to `_print`
+        it in the compiler so we directly defaults to `_print`.
         """
         return self._print(expr)
 
@@ -75,8 +75,7 @@ def _prec(self, expr):
         except TypeError:
             return self.dtype
         if dtype is None or np.issubdtype(dtype, np.integer):
-            real = any(isinstance(i, Float) for i in expr.atoms())
-            if real:
+            if any(isinstance(i, Float) for i in expr.atoms()):
                 try:
                     return np.promote_types(self.dtype, np.float32).type
                 except np.exceptions.DTypePromotionError:

devito/ir/iet/visitors.py

@@ -736,7 +736,6 @@ def visit_Operator(self, o, mode='all'):
                 # Plain string
                 headers.append(c.Line(h))
         headers = headers + [blankline]
-        # headers = [c.Define(*i) for i in o._headers] + [blankline]
 
         # Header files
         includes = self._operator_includes(o) + [blankline]
@@ -1406,8 +1405,7 @@ def __init__(self, name, arguments, is_expr=False, is_indirect=False,
 
     def generate(self):
         if self.templates:
-            ctemplates = ", ".join(str(i) for i in self.templates)
-            tip = f"{self.name}<{ctemplates}>"
+            tip = f"{self.name}<{', '.join(str(i) for i in self.templates)}>"
         else:
             tip = self.name
         if not self.is_indirect:

devito/mpi/routines.py

@@ -15,7 +15,7 @@
                            Transformer, ElementalCall, CommCallable)
 from devito.mpi import MPI
 from devito.symbolics import (Byref, CondNe, FieldFromPointer, FieldFromComposite,
-                              IndexedPointer, Macro, cast_mapper, subs_op_args)
+                              IndexedPointer, Macro, cast, subs_op_args)
 from devito.tools import (as_mapper, dtype_to_mpitype, dtype_len, infer_datasize,
                           flatten, generator, is_integer, split)
 from devito.types import (Array, Bag, Dimension, Eq, Symbol, LocalObject,
@@ -306,7 +306,7 @@ def _make_bundles(self, hs):
             except ValueError:
                 for i in candidates:
                     name = "bag_%s" % i.name
-                    bag = Bag(name=name, components=(i,))
+                    bag = Bag(name=name, components=i)
                     halo_scheme = halo_scheme.add(bag, hse)
 
         hs = hs._rebuild(halo_scheme=halo_scheme)
@@ -605,7 +605,7 @@ def _make_msg(self, f, hse, key):
         return MPIMsg('msg%d' % key, f, halos)
 
     def _make_sendrecv(self, f, hse, key, msg=None):
-        cast = cast_mapper((f.c0.dtype, '*'))
+        fcast = cast(f.c0.dtype, '*')
         comm = f.grid.distributor._obj_comm
 
         bufg = FieldFromPointer(msg._C_field_bufg, msg)
@@ -619,7 +619,7 @@ def _make_sendrecv(self, f, hse, key, msg=None):
         sizes = [FieldFromPointer('%s[%d]' % (msg._C_field_sizes, i), msg)
                  for i in range(len(f._dist_dimensions))]
 
-        arguments = [cast(bufg)] + sizes + list(f.handles) + ofsg
+        arguments = [fcast(bufg)] + sizes + list(f.handles) + ofsg
         gather = Gather('gather%s' % key, arguments)
         # The `gather` is unnecessary if sending to MPI.PROC_NULL
         gather = Conditional(CondNe(torank, Macro('MPI_PROC_NULL')), gather)
@@ -671,7 +671,7 @@ def _call_compute(self, hs, compute, *args):
             return compute.make_call(dynamic_args_mapper=hs.omapper.core)
 
     def _make_wait(self, f, hse, key, msg=None):
-        cast = cast_mapper((f.c0.dtype, '*'))
+        fcast = cast(f.c0.dtype, '*')
 
         bufs = FieldFromPointer(msg._C_field_bufs, msg)
 
@@ -681,7 +681,7 @@ def _make_wait(self, f, hse, key, msg=None):
 
         sizes = [FieldFromPointer('%s[%d]' % (msg._C_field_sizes, i), msg)
                  for i in range(len(f._dist_dimensions))]
-        arguments = [cast(bufs)] + sizes + list(f.handles) + ofss
+        arguments = [fcast(bufs)] + sizes + list(f.handles) + ofss
         scatter = Scatter('scatter%s' % key, arguments)
 
         # The `scatter` must be guarded as we must not alter the halo values along
@@ -772,7 +772,7 @@ def _call_sendrecv(self, *args):
         return
 
     def _make_haloupdate(self, f, hse, key, *args, msg=None):
-        cast = cast_mapper((f.c0.dtype, '*'))
+        fcast = cast(f.c0.dtype, '*')
         comm = f.grid.distributor._obj_comm
 
         fixed = {d: Symbol(name="o%s" % d.root) for d in hse.loc_indices}
@@ -794,7 +794,7 @@ def _make_haloupdate(self, f, hse, key, *args, msg=None):
         ofsg = [fixed.get(d) or ofsg.pop(0) for d in f.dimensions]
 
         # The `gather` is unnecessary if sending to MPI.PROC_NULL
-        arguments = [cast(bufg)] + sizes + list(f.handles) + ofsg
+        arguments = [fcast(bufg)] + sizes + list(f.handles) + ofsg
         gather = Gather('gather%s' % key, arguments)
         gather = Conditional(CondNe(torank, Macro('MPI_PROC_NULL')), gather)
 
@@ -819,7 +819,7 @@ def _call_haloupdate(self, name, f, hse, msg):
         return HaloUpdateCall(name, args)
 
     def _make_halowait(self, f, hse, key, *args, msg=None):
-        cast = cast_mapper((f.c0.dtype, '*'))
+        fcast = cast(f.c0.dtype, '*')
 
         fixed = {d: Symbol(name="o%s" % d.root) for d in hse.loc_indices}
 
@@ -839,7 +839,7 @@ def _make_halowait(self, f, hse, key, *args, msg=None):
 
         # The `scatter` must be guarded as we must not alter the halo values along
         # the domain boundary, where the sender is actually MPI.PROC_NULL
-        arguments = [cast(bufs)] + sizes + list(f.handles) + ofss
+        arguments = [fcast(bufs)] + sizes + list(f.handles) + ofss
         scatter = Scatter('scatter%s' % key, arguments)
         scatter = Conditional(CondNe(fromrank, Macro('MPI_PROC_NULL')), scatter)