api: enforce pow_to_mul to be un-evaluable

Author: mloubout

devito/core/cpu.py

@@ -32,9 +32,6 @@ def _normalize_kwargs(cls, **kwargs):
         o['mpi'] = oo.pop('mpi')
         o['parallel'] = o['openmp']  # Backwards compatibility
 
-        # Minimum scalar type
-        o['scalar-min-type'] = oo.pop('scalar-min-type', cls.SCALAR_MIN_TYPE)
-
         # Buffering
         o['buf-async-degree'] = oo.pop('buf-async-degree', None)
 
@@ -87,6 +84,7 @@ def _normalize_kwargs(cls, **kwargs):
         o['index-mode'] = oo.pop('index-mode', cls.INDEX_MODE)
         o['place-transfers'] = oo.pop('place-transfers', True)
         o['errctl'] = oo.pop('errctl', cls.ERRCTL)
+        o['scalar-min-type'] = oo.pop('scalar-min-type', cls.SCALAR_MIN_TYPE)
 
         # Recognised but unused by the CPU backend
         oo.pop('par-disabled', None)

devito/core/gpu.py

@@ -40,9 +40,6 @@ def _normalize_kwargs(cls, **kwargs):
         o['mpi'] = oo.pop('mpi')
         o['parallel'] = True
 
-        # Minimum scalar type
-        o['scalar-min-type'] = oo.pop('scalar-min-type', cls.SCALAR_MIN_TYPE)
-
         # Buffering
         o['buf-async-degree'] = oo.pop('buf-async-degree', None)
 
@@ -98,6 +95,7 @@ def _normalize_kwargs(cls, **kwargs):
         o['index-mode'] = oo.pop('index-mode', cls.INDEX_MODE)
         o['place-transfers'] = oo.pop('place-transfers', True)
         o['errctl'] = oo.pop('errctl', cls.ERRCTL)
+        o['scalar-min-type'] = oo.pop('scalar-min-type', cls.SCALAR_MIN_TYPE)
 
         if oo:
             raise InvalidOperator("Unsupported optimization options: [%s]"

devito/ir/iet/visitors.py

@@ -629,19 +629,19 @@ def visit_Lambda(self, o):
                 if body:
                     body.append(c.Line())
                 body.extend(as_tuple(v))
+
         captures = [str(i) for i in o.captures]
         decls = [i.inline() for i in self._args_decl(o.parameters)]
+
         extra = []
         if o.special:
             extra.append(' ')
             extra.append(' '.join(str(i) for i in o.special))
         if o.attributes:
             extra.append(' ')
             extra.append(' '.join(f'[[{i}]]' for i in o.attributes))
-        ccapt = ', '.join(captures)
-        cdecls = ', '.join(decls)
-        cextra = ''.join(extra)
-        top = c.Line(f'[{ccapt}]({cdecls}){cextra}')
+
+        top = c.Line(f"[{', '.join(captures)}]({', '.join(decls)}){''.join(extra)}")
         return LambdaCollection([top, c.Block(body)])
 
     def visit_HaloSpot(self, o):

devito/passes/iet/misc.py

@@ -6,6 +6,7 @@
 
 from devito.finite_differences import Max, Min
 from devito.finite_differences.differentiable import SafeInv
+from devito.logger import warning
 from devito.ir import (Any, Forward, DummyExpr, Iteration, List, Prodder,
                        FindApplications, FindNodes, FindSymbols, Transformer,
                        Uxreplace, filter_iterations, retrieve_iteration_tree,
@@ -144,13 +145,12 @@ def generate_macros(graph, **kwargs):
 
 
 @iet_pass
-def _generate_macros(iet, tracker=None, langbb=None, **kwargs):
+def _generate_macros(iet, tracker=None, langbb=None, printer=CPrinter, **kwargs):
     # Derive the Macros necessary for the FIndexeds
     iet = _generate_macros_findexeds(iet, tracker=tracker, **kwargs)
 
     # NOTE: sorting is necessary to ensure deterministic code generation
     headers = [i.header for i in tracker.values()]
-    printer = kwargs.get('printer', CPrinter)
     headers = sorted((printer()._print(define), printer()._print(expr))
                      for define, expr in headers)
 
@@ -238,7 +238,7 @@ def _(expr, langbb):
     try:
         eps = np.finfo(expr.base.dtype).resolution**2
     except ValueError:
-        print(f"Warning: dtype not recognized in SafeInv for {expr.base}")
+        warning(f"Warning: dtype not recognized in SafeInv for {expr.base}")
         eps = np.finfo(np.float32).resolution**2
     b = Cast('b', dtype=np.float32)
     return (('SAFEINV(a, b)',

devito/symbolics/manipulation.py

@@ -13,6 +13,7 @@
 from devito.symbolics.extended_sympy import DefFunction, rfunc
 from devito.symbolics.queries import q_leaf
 from devito.symbolics.search import retrieve_indexed, retrieve_functions
+from devito.symbolics.unevaluation import Mul as UMul, Pow as UPow
 from devito.tools import as_list, as_tuple, flatten, split, transitive_closure
 from devito.types.basic import Basic, Indexed
 from devito.types.array import ComponentAccess
@@ -337,13 +338,13 @@ def pow_to_mul(expr):
             # but at least we traverse the base looking for other Pows
             return expr.func(pow_to_mul(base), exp, evaluate=False)
         elif exp > 0:
-            return Mul(*[pow_to_mul(base)]*int(exp), evaluate=False)
+            return UMul(*[pow_to_mul(base)]*int(exp), evaluate=False)
         else:
             # SymPy represents 1/x as Pow(x,-1). Also, it represents
             # 2/x as Mul(2, Pow(x, -1)). So we shouldn't end up here,
             # but just in case SymPy changes its internal conventions...
             posexpr = Mul(*[base]*(-int(exp)), evaluate=False)
-            return Pow(posexpr, -1, evaluate=False)
+            return UPow(posexpr, -1, evaluate=False)
     else:
         args = [pow_to_mul(i) for i in expr.args]
 

devito/types/grid.py

@@ -79,7 +79,7 @@ class Grid(CartesianDiscretization, ArgProvider):
     shape : tuple of ints
         Shape of the computational domain in grid points.
     extent : tuple of values interpretable as dtype, default=unit box of extent 1m
-    in all dimensions
+    in all dimensions.
         Physical extent of the domain in m.
     origin : tuple of values interpretable as dtype, default=0.0 in all dimensions
         Physical coordinate of the origin of the domain.

examples/compiler/03_iet-A.ipynb

@@ -227,7 +227,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In this example, `op` is represented as a `<Callable Kernel>`. Attached to it are metadata, such as `_headers` and `_includes`, as well as the `body`, which includes the children IET nodes. Here, the body is the concatenation of an `PointerCast` and a `List` object.\n"
+    "In this example, `op` is represented as a `<Callable Kernel>`. Attached to it are metadata, such as `headers` and `includes`, as well as the `body`, which includes the children IET nodes. Here, the body is the concatenation of an `PointerCast` and a `List` object.\n"
    ]
   },
   {

tests/test_pickle.py

@@ -23,7 +23,8 @@
 from devito.types.basic import BoundSymbol, AbstractSymbol
 from devito.tools import EnrichedTuple
 from devito.symbolics import (IntDiv, ListInitializer, FieldFromPointer,
-                              CallFromPointer, DefFunction, Cast, SizeOf)
+                              CallFromPointer, DefFunction, Cast, SizeOf,
+                              pow_to_mul)
 from examples.seismic import (demo_model, AcquisitionGeometry,
                               TimeAxis, RickerSource, Receiver)
 
@@ -609,6 +610,18 @@ def test_SizeOf(self, pickle, typ):
 
         assert un == new_un
 
+    def test_pow_to_mul(self, pickle):
+        grid = Grid(shape=(3,))
+        f = Function(name='f', grid=grid)
+        expr = pow_to_mul(f ** 2)
+
+        assert expr.is_Mul
+
+        pkl_expr = pickle.dumps(expr)
+        new_expr = pickle.loads(pkl_expr)
+
+        assert new_expr.is_Mul
+
 
 class TestAdvanced: