misc: Apply review suggestions

Co-authored-by: Ed Caunt <ed@devitocodes.com>

Author: JDBetteridge

benchmarks/user/benchmark.py

@@ -71,7 +71,7 @@ def run_op(solver, operator, **options):
     """
     Initialize any necessary input and run the operator associated with the solver.
     """
-    # Get the operator if exist
+    # Get the operator if it exists
     try:
         op = getattr(solver, operator)
     except AttributeError as e:

devito/core/operator.py

@@ -196,7 +196,7 @@ def _check_kwargs(cls, **kwargs):
         oo = kwargs['options']
 
         if oo['mpi'] and oo['mpi'] not in cls.MPI_MODES:
-            raise InvalidOperator("Unsupported MPI mode `{}`".format(oo['mpi']))
+            raise InvalidOperator(f"Unsupported MPI mode `{oo['mpi']}`")
 
         if oo['cse-algo'] not in ('basic', 'smartsort', 'advanced'):
             raise InvalidOperator("Illegal `cse-algo` value")

devito/finite_differences/derivative.py

@@ -491,7 +491,7 @@ def _eval_at(self, func):
         x0 = func.indices_ref.getters
         psubs = {}
         nx0 = x0.copy()
-        for d, _ in x0.items():
+        for d in x0:
             if d in self.dims:
                 # d is a valid Derivative dimension
                 continue

devito/ir/clusters/visitors.py

@@ -141,7 +141,9 @@ def __new__(cls, *args, mode='dense'):
             elif len(args) == 2:
                 func, mode = args
             else:
-                raise AssertionError('Too many args')
+                raise ValueError(
+                    f"Either 1 or 2 arguments permitted, {len(args)} provided"
+                )
             obj = object.__new__(cls)
             obj.__init__(func, mode)
             return obj

devito/ir/iet/nodes.py

@@ -1513,7 +1513,7 @@ def __init__(self, sync_ops, body=None):
         self.sync_ops = sync_ops
 
     def __repr__(self):
-        return "<SyncSpot ({})>".format(",".join(str(i) for i in self.sync_ops))
+        return f"<SyncSpot ({','.join(str(i) for i in self.sync_ops)})>"
 
     @property
     def is_async_op(self):
@@ -1590,7 +1590,7 @@ def __init__(self, body, halo_scheme):
         self._halo_scheme = halo_scheme
 
     def __repr__(self):
-        functions = "({})".format(",".join(i.name for i in self.functions))
+        functions = f"({','.join(i.name for i in self.functions)})"
         return f"<{self.__class__.__name__}{functions}>"
 
     @property

devito/ir/iet/visitors.py

@@ -479,7 +479,7 @@ def visit_PointerCast(self, o):
             elif isinstance(o.obj, IndexedData):
                 v = f._C_name
             else:
-                raise AssertionError('rvalue is not a recognised type')
+                raise TypeError('rvalue is not a recognised type')
             rvalue = f'({cstr}**) {v}'
 
         else:
@@ -508,7 +508,7 @@ def visit_PointerCast(self, o):
                 elif isinstance(o.obj, DeviceMap):
                     v = f._C_field_dmap
                 else:
-                    raise AssertionError('rvalue is not a recognised type')
+                    raise TypeError('rvalue is not a recognised type')
 
                 rvalue = f'({cstr} {rshape}) {f._C_name}->{v}'
             else:

devito/ir/stree/algorithms.py

@@ -228,11 +228,8 @@ def preprocess(clusters, options=None, **kwargs):
                 processed.append(c)
 
     # Sanity check!
-    try:
-        assert not queue
-    except AssertionError as e:
-        if options['mpi']:
-            raise RuntimeError("Unsupported MPI for the given equations") from e
+    if not queue and options['mpi']:
+        raise RuntimeError("Unsupported MPI for the given equations")
 
     return processed