diff --git a/sumpy/codegen.py b/sumpy/codegen.py index 6ee517f8f9ce2565b5321a3a929982fcf0005501..9d273c39e9273c92929d890003ed70ff18f4ea67 100644 --- a/sumpy/codegen.py +++ b/sumpy/codegen.py @@ -533,7 +533,7 @@ def to_loopy_insns(assignments, vector_names=set(), pymbolic_expr_maps=[], import loopy as lp result = [ - lp.ExpressionInstruction(id=None, + lp.Assignment(id=None, assignee=name, expression=convert_expr(name, expr), temp_var_type=lp.auto) for name, expr in assignments] diff --git a/sumpy/e2p.py b/sumpy/e2p.py index 4735fcc0c3522c405a8897a3a4d1855fa4b903d9..e08bb27b585920cc9d73a553071f1c148c44c79f 100644 --- a/sumpy/e2p.py +++ b/sumpy/e2p.py @@ -107,7 +107,7 @@ class E2PBase(KernelCacheWrapper): from pymbolic.sympy_interface import SympyToPymbolicMapper sympy_conv = SympyToPymbolicMapper() loopy_insns.append( - lp.ExpressionInstruction(id=None, + lp.Assignment(id=None, assignee="kernel_scaling", expression=sympy_conv(self.expansion.kernel.get_scaling()), temp_var_type=lp.auto)) diff --git a/sumpy/p2p.py b/sumpy/p2p.py index 6541cf94d2a2c1b1375094af58d23830cfa16856..5c5cfd6f34ce33ef6e849b8b26e9fe60944eec36 100644 --- a/sumpy/p2p.py +++ b/sumpy/p2p.py @@ -133,7 +133,7 @@ class P2P(P2PBase): "<> d[idim] = targets[idim,itgt] - sources[idim,isrc] \ {id=compute_d}", ]+[ - lp.ExpressionInstruction(id=None, + lp.Assignment(id=None, assignee="pair_result_%d" % i, expression=expr, temp_var_type=lp.auto) for i, expr in enumerate(exprs) @@ -245,7 +245,7 @@ class P2PFromCSR(P2PBase): * simul_reduce(sum, isrc, pair_result_${KNLIDX}) """ ]+[ - lp.ExpressionInstruction(id=None, + lp.Assignment(id=None, assignee="pair_result_%d" % i, expression=expr, temp_var_type=lp.auto) for i, expr in enumerate(exprs) diff --git a/sumpy/qbx.py b/sumpy/qbx.py index 90304db1bc26d8701779600857b2b8e104e8cdf5..ffc8482d8bc800050e228ecaf9012a8b2d1f5b7a 100644 --- a/sumpy/qbx.py +++ b/sumpy/qbx.py @@ -153,7 +153,7 @@ class LayerPotentialBase(KernelComputation): "<> a[idim] = center[idim,itgt] - src[idim,isrc] {id=compute_a}", "<> b[idim] = tgt[idim,itgt] - center[idim,itgt] {id=compute_b}", ]+self.get_kernel_scaling_assignments()+loopy_insns+[ - lp.ExpressionInstruction(id=None, + lp.Assignment(id=None, assignee="pair_result_%d" % i, expression=expr, temp_var_type=lp.auto) for i, (expr, dtype) in enumerate(zip(exprs, self.value_dtypes)) diff --git a/sumpy/tools.py b/sumpy/tools.py index dbad2fab86854f12d1f76e5830ff4db1679c5b06..a64237239be2bfce277b192ed58f8e5f99d4100d 100644 --- a/sumpy/tools.py +++ b/sumpy/tools.py @@ -197,7 +197,7 @@ class KernelComputation(object): import loopy as lp return [ - lp.ExpressionInstruction(id=None, + lp.Assignment(id=None, assignee="knl_%d_scaling" % i, expression=sympy_conv(kernel.get_scaling()), temp_var_type=dtype)