misc: Tidy up leftovers

Author: EdCaunt

devito/finite_differences/differentiable.py

@@ -650,8 +650,8 @@ class ComplexPart(Differentiable, sympy.core.function.Application):
 
     def __new__(cls, *args, **kwargs):
         if len(args) != 1:
-            raise ValueError(f"{cls.__name__} is constructed with exactly one arg;"
-                             f" {len(args)} were supplied.")
+            raise ValueError(f"{cls.__name__} expects exactly one arg;"
+                             f" {len(args)} were supplied instead.")
 
         return super().__new__(cls, *args, **kwargs)
 

devito/ir/clusters/cluster.py

@@ -304,13 +304,12 @@ def dtype(self):
         """
         dtypes = set()
         for i in self.exprs:
-            # try:
-            if np.issubdtype(i.dtype, np.generic):
-                dtypes.add(i.dtype)
-            # except TypeError:
-            #     print(i, type(i), i.dtype, np.issubdtype(i.dtype, np.generic))
-            #     # E.g. `i.dtype` is a ctypes pointer, which has no dtype equivalent
-            #     pass
+            try:
+                if np.issubdtype(i.dtype, np.generic):
+                    dtypes.add(i.dtype)
+            except TypeError:
+                # E.g. `i.dtype` is a ctypes pointer, which has no dtype equivalent
+                pass
 
         return infer_dtype(dtypes)
 

devito/ir/equations/equation.py

@@ -8,7 +8,7 @@
 from devito.ir.support import (GuardFactor, Interval, IntervalGroup, IterationSpace,
                                Stencil, detect_io, detect_accesses)
 from devito.symbolics import IntDiv, limits_mapper, uxreplace
-from devito.tools import Pickable, Tag, frozendict, infer_dtype
+from devito.tools import Pickable, Tag, frozendict
 from devito.types import Eq, Inc, ReduceMax, ReduceMin, relational_min
 
 __all__ = ['LoweredEq', 'ClusterizedEq', 'DummyEq', 'OpInc', 'OpMin', 'OpMax',
@@ -48,10 +48,7 @@ def directions(self):
 
     @property
     def dtype(self):
-        try:
-            return infer_dtype({self.lhs.dtype, self.rhs.dtype} - {None})
-        except AttributeError:
-            return self.lhs.dtype
+        return self.lhs.dtype
 
     @property
     def state(self):

devito/passes/clusters/aliases.py

@@ -888,6 +888,7 @@ def lower_schedule(schedule, meta, sregistry, ftemps, min_dtype):
         else:
             # 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/langbase.py

@@ -461,15 +461,15 @@ def _(iet):
                     List(body=[rank_decl, rank_init, call_ngpus, osdd_else]),
                 )]
 
-                header = c.Comment('Begin of %s+MPI setup' % self.langbb['name'])
+                header = c.Comment('Beginning 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.langbb['set-device']([deviceid] + devicetype)
                 )]
 
-                header = c.Comment('Begin of %s setup' % self.langbb['name'])
+                header = c.Comment('Beginning of %s setup' % self.langbb['name'])
                 footer = c.Comment('End of %s setup' % self.langbb['name'])
 
             init = List(header=header, body=body, footer=footer)

examples/performance/01_gpu.ipynb

@@ -97,9 +97,7 @@
     "OK, it's time to let Devito generate code for our solver!"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 6,
+  { "cell_type": "code", "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -271,7 +269,7 @@
       "\n",
       "int Kernel(const float c, struct dataobj *restrict u_vec, const float dt, const float h_x, const float h_y, const int time_M, const int time_m, const int x_M, const int x_m, const int y_M, const int y_m, const int deviceid, const int devicerm, struct profiler * timers)\n",
       "{\n",
-      "  /* Begin of OpenMP setup */\n",
+      "  /* Beginning of OpenMP setup */\n",
       "  if (deviceid != -1)\n",
       "  {\n",
       "    omp_set_default_device(deviceid);\n",