misc: fix typos and formatting

Author: mloubout

devito/arch/archinfo.py

@@ -383,6 +383,8 @@ def cbk(deviceid=0):
             def make_cbk(i):
                 def cbk(deviceid=0):
                     return None
+                return cbk
+
             gpu_info['mem.%s' % i] = make_cbk(i)
 
         gpu_infos['architecture'] = 'Intel'
@@ -452,7 +454,7 @@ def parse_product_arch():
         gpu_infos = []
         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:
+            if any(i in line for i in ('VGA', '3D', 'Display')):
                 gpu_info = {}
                 # Lines produced by lspci command are of the form:
                 #   xxxx:xx:xx.x Device Type: Name

devito/arch/compiler.py

@@ -606,12 +606,9 @@ class PGICompiler(Compiler):
 
     def __init_finalize__(self, **kwargs):
 
-        self.cflags.remove(f'-std={self.std}')
         self.cflags.remove('-O3')
         self.cflags.remove('-Wall')
 
-        self.cflags.append(f'-std={self.std}')
-
         language = kwargs.pop('language', configuration['language'])
         platform = kwargs.pop('platform', configuration['platform'])
 
@@ -659,10 +656,9 @@ class CudaCompiler(Compiler):
 
     def __init_finalize__(self, **kwargs):
 
-        self.cflags.remove(f'-std={self.std}')
         self.cflags.remove('-Wall')
         self.cflags.remove('-fPIC')
-        self.cflags.extend([f'-std={self.std}', '-Xcompiler', '-fPIC'])
+        self.cflags.append('-Xcompiler')
 
         if configuration['mpi']:
             # We rather use `nvcc` to compile MPI, but for this we have to
@@ -733,11 +729,6 @@ class HipCompiler(Compiler):
 
     def __init_finalize__(self, **kwargs):
 
-        self.cflags.remove(f'-std={self.std}')
-        self.cflags.remove('-Wall')
-        self.cflags.remove('-fPIC')
-        self.cflags.extend([f'-std={self.std}', '-fPIC'])
-
         if configuration['mpi']:
             # We rather use `hipcc` to compile MPI, but for this we have to
             # explicitly pass the flags that an `mpicc` would implicitly use
@@ -843,7 +834,7 @@ def __init_finalize__(self, **kwargs):
         language = kwargs.pop('language', configuration['language'])
 
         if language == 'sycl':
-            warning("Use SyclCompiler to jit-compile sycl")
+            warning(f"Use SyclCompiler (`sycl`) to jit-compile sycl, not {self.name}")
 
         elif language == 'openmp':
             # Earlier versions to OneAPI 2023.2.0 (clang17 underneath), have an
@@ -899,7 +890,7 @@ def __init_finalize__(self, **kwargs):
         language = kwargs.pop('language', configuration['language'])
 
         if language != 'sycl':
-            warning("Expected language sycl with SyclCompiler")
+            warning(f"Expected language sycl with SyclCompiler, not {language}")
 
         self.cflags.remove(f'-std={self.std}')
         self.cflags.append('-fsycl')

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 alias for a common sub-expression or CIRE temp.
     """
 
     PAR_COLLAPSE_NCORES = 4

devito/ir/cgen/printer.py

@@ -36,7 +36,8 @@ class BasePrinter(CodePrinter):
                          **CodePrinter._default_settings}
 
     _func_prefix = {}
-    _func_litterals = {}
+    _func_literals = {}
+    _prec_literals = {np.float32: 'F', np.complex64: 'F'}
 
     _qualifiers_mapper = {
         'is_const': 'const',
@@ -45,14 +46,10 @@ class BasePrinter(CodePrinter):
         '_mem_shared': '',
     }
 
-    _prec_litterals = {np.float32: 'F', np.complex64: 'F'}
-
     _restrict_keyword = 'restrict'
 
     _includes = []
-
     _namespaces = []
-
     _headers = [('_POSIX_C_SOURCE', '200809L')]
 
     @property
@@ -68,16 +65,13 @@ 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`.
+        The sympy code printer does a lot of extra things we do not need
+        as we handle all of it in the compiler so we directly default to `_print`.
         """
         return self._print(expr)
 
     def _prec(self, expr):
-        try:
-            dtype = sympy_dtype(expr, default=self.dtype)
-        except TypeError:
-            return self.dtype
+        dtype = sympy_dtype(expr, default=self.dtype)
         if dtype is None or np.issubdtype(dtype, np.integer):
             if any(isinstance(i, Float) for i in expr.atoms()):
                 try:
@@ -91,17 +85,19 @@ def _prec(self, expr):
             return dtype or self.dtype
 
     def prec_literal(self, expr):
-        return self._prec_litterals.get(self._prec(expr), '')
+        return self._prec_literals.get(self._prec(expr), '')
 
     def func_literal(self, expr):
-        return self._func_litterals.get(self._prec(expr), '')
+        return self._func_literals.get(self._prec(expr), '')
 
     def func_prefix(self, expr, mfunc=False):
         prefix = self._func_prefix.get(self._prec(expr), '')
         if mfunc:
             return prefix
+        elif prefix == 'f':
+            return ''
         else:
-            return '' if prefix == 'f' else prefix
+            return prefix
 
     def parenthesize(self, item, level, strict=False):
         if isinstance(item, BooleanFunction):
@@ -271,7 +267,7 @@ def _print_Abs(self, expr):
         arg = expr.args[0]
         # AOMPCC errors with abs, always use fabs
         if isinstance(self.compiler, AOMPCompiler) and \
-                not np.issubdtype(self._prec(expr), np.integer):
+           not np.issubdtype(self._prec(expr), np.integer):
             return f"fabs({self._print(arg)})"
         return self._print_fmath_func('abs', expr)
 

devito/ir/iet/visitors.py

@@ -208,7 +208,8 @@ def _gen_struct_decl(self, obj, masked=()):
             while issubclass(ctype, ctypes._Pointer):
                 ctype = ctype._type_
 
-            if not issubclass(ctype, ctypes.Structure) or issubclass(ctype, NoDeclStruct):
+            if not issubclass(ctype, ctypes.Structure) or \
+               issubclass(ctype, NoDeclStruct):
                 return None
         except TypeError:
             # E.g., `ctype` is of type `dtypes_lowering.CustomDtype`

devito/operator/operator.py

@@ -1431,7 +1431,9 @@ def parse_kwargs(**kwargs):
 
     # `allocator`
     kwargs['allocator'] = default_allocator(
-        f"{kwargs['compiler'].__class__.__name__}.{kwargs['language']}.{kwargs['platform']}"  # noqa
+        f"{kwargs['compiler'].__class__.__name__}"
+        f".{kwargs['language']}"
+        f".{kwargs['platform']}"
     )
 
     # Normalize `subs`, if any

devito/passes/clusters/aliases.py

@@ -113,7 +113,7 @@ def __init__(self, sregistry, options, platform):
         self.opt_rotate = options['cire-rotate']
         self.opt_ftemps = options['cire-ftemps']
         self.opt_mingain = options['cire-mingain']
-        self.opt_mindtype = options['scalar-min-type']
+        self.opt_min_dtype = options['scalar-min-type']
         self.opt_multisubdomain = True
 
     def _aliases_from_clusters(self, clusters, exclude, meta):
@@ -143,7 +143,7 @@ def _aliases_from_clusters(self, clusters, exclude, meta):
 
         # Schedule -> [Clusters]_k
         processed, subs = lower_schedule(schedule, meta, self.sregistry,
-                                         self.opt_ftemps, self.opt_mindtype)
+                                         self.opt_ftemps, self.opt_min_dtype)
 
         # [Clusters]_k -> [Clusters]_k (optimization)
         if self.opt_multisubdomain:
@@ -831,7 +831,7 @@ def optimize_schedule_rotations(schedule, sregistry):
     return schedule.rebuild(*processed, rmapper=rmapper)
 
 
-def lower_schedule(schedule, meta, sregistry, ftemps, mindtype):
+def lower_schedule(schedule, meta, sregistry, ftemps, min_dtype):
     """
     Turn a Schedule into a sequence of Clusters.
     """
@@ -849,8 +849,6 @@ def lower_schedule(schedule, meta, sregistry, ftemps, mindtype):
         # This prevents cases such as `floor(a*b)` with `a` and `b` floats
         # that would creat a temporary `int r = b` leading to erronous
         # numerical results
-        mindtype = None if writeto else mindtype
-        dtype = sympy_dtype(pivot, base=meta.dtype, smin=mindtype)
 
         if writeto:
             # The Dimensions defining the shape of Array
@@ -882,6 +880,7 @@ def lower_schedule(schedule, meta, sregistry, ftemps, mindtype):
                     # E.g., `z` -- a non-shifted Dimension
                     indices.append(i.dim - i.lower)
 
+            dtype = sympy_dtype(pivot, base=meta.dtype)
             obj = make(name=name, dimensions=dimensions, halo=halo, dtype=dtype)
             expression = Eq(obj[indices], uxreplace(pivot, subs))
 
@@ -890,6 +889,7 @@ def lower_schedule(schedule, meta, sregistry, ftemps, mindtype):
             # Degenerate case: scalar expression
             assert writeto.size == 0
 
+            dtype = sympy_dtype(pivot, base=meta.dtype, smin=min_dtype)
             obj = Temp(name=name, dtype=dtype)
             expression = Eq(obj, uxreplace(pivot, subs))
 

devito/passes/iet/languages/C.py

@@ -42,7 +42,7 @@ class CPrinter(BasePrinter, C99CodePrinter):
 
     _default_settings = {**BasePrinter._default_settings,
                          **C99CodePrinter._default_settings}
-    _func_litterals = {np.float32: 'f', np.complex64: 'f'}
+    _func_literals = {np.float32: 'f', np.complex64: 'f'}
     _func_prefix = {np.float32: 'f', np.float64: 'f',
                     np.complex64: 'c', np.complex128: 'c'}
     _includes = ['stdlib.h', 'math.h', 'sys/time.h']

devito/passes/iet/languages/CXX.py

@@ -8,52 +8,54 @@
 __all__ = ['CXXBB']
 
 
-def std_arith(qualifier=None):
-    if qualifier:
-        qual = qualifier if qualifier.endswith(" ") else f"{qualifier} "
+def std_arith(prefix=None):
+    if prefix:
+        # Method definition prefix, e.g. "__host__"
+        # Make sure there is a space between the prefix and the method name
+        prefix = prefix if prefix.endswith(" ") else f"{prefix} "
     else:
-        qual = ""
+        prefix = ""
     return f"""
 #include <complex>
 
 template<typename _Tp, typename _Ti>
-{qual}std::complex<_Tp> operator * (const _Ti & a, const std::complex<_Tp> & b){{
+{prefix}std::complex<_Tp> operator * (const _Ti & a, const std::complex<_Tp> & b){{
   return std::complex<_Tp>(b.real() * a, b.imag() * a);
 }}
 
 template<typename _Tp, typename _Ti>
-{qual}std::complex<_Tp> operator * (const std::complex<_Tp> & b, const _Ti & a){{
+{prefix}std::complex<_Tp> operator * (const std::complex<_Tp> & b, const _Ti & a){{
   return std::complex<_Tp>(b.real() * a, b.imag() * a);
 }}
 
 template<typename _Tp, typename _Ti>
-{qual}std::complex<_Tp> operator / (const _Ti & a, const std::complex<_Tp> & b){{
+{prefix}std::complex<_Tp> operator / (const _Ti & a, const std::complex<_Tp> & b){{
   _Tp denom = b.real() * b.real () + b.imag() * b.imag();
   return std::complex<_Tp>(b.real() * a / denom, - b.imag() * a / denom);
 }}
 
 template<typename _Tp, typename _Ti>
-{qual}std::complex<_Tp> operator / (const std::complex<_Tp> & b, const _Ti & a){{
+{prefix}std::complex<_Tp> operator / (const std::complex<_Tp> & b, const _Ti & a){{
   return std::complex<_Tp>(b.real() / a, b.imag() / a);
 }}
 
 template<typename _Tp, typename _Ti>
-{qual}std::complex<_Tp> operator + (const _Ti & a, const std::complex<_Tp> & b){{
+{prefix}std::complex<_Tp> operator + (const _Ti & a, const std::complex<_Tp> & b){{
   return std::complex<_Tp>(b.real() + a, b.imag());
 }}
 
 template<typename _Tp, typename _Ti>
-{qual}std::complex<_Tp> operator + (const std::complex<_Tp> & b, const _Ti & a){{
+{prefix}std::complex<_Tp> operator + (const std::complex<_Tp> & b, const _Ti & a){{
   return std::complex<_Tp>(b.real() + a, b.imag());
 }}
 
 template<typename _Tp, typename _Ti>
-{qual}std::complex<_Tp> operator - (const _Ti & a, const std::complex<_Tp> & b){{
+{prefix}std::complex<_Tp> operator - (const _Ti & a, const std::complex<_Tp> & b){{
   return std::complex<_Tp>(a = b.real(), b.imag());
 }}
 
 template<typename _Tp, typename _Ti>
-{qual}std::complex<_Tp> operator - (const std::complex<_Tp> & b, const _Ti & a){{
+{prefix}std::complex<_Tp> operator - (const std::complex<_Tp> & b, const _Ti & a){{
   return std::complex<_Tp>(b.real() - a, b.imag());
 }}
 
@@ -88,7 +90,7 @@ class CXXPrinter(BasePrinter, CXX11CodePrinter):
     _default_settings = {**BasePrinter._default_settings,
                          **CXX11CodePrinter._default_settings}
     _ns = "std::"
-    _func_litterals = {}
+    _func_literals = {}
     _func_prefix = {np.float32: 'f', np.float64: 'f'}
     _restrict_keyword = '__restrict'
     _includes = ['stdlib.h', 'cmath', 'sys/time.h']