From 29bf15870fa3ac2c10bac9f96c05cd4080d20514 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Thu, 27 Jun 2013 13:50:32 -0400 Subject: [PATCH] Track "Instruction" name change in loopy --- sumpy/codegen.py | 2 +- sumpy/p2p.py | 2 +- sumpy/qbx.py | 2 +- sumpy/tools.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sumpy/codegen.py b/sumpy/codegen.py index 905f99e0..a232bf58 100644 --- a/sumpy/codegen.py +++ b/sumpy/codegen.py @@ -437,7 +437,7 @@ def to_loopy_insns(assignments, vector_names=set(), pymbolic_expr_maps=[], import loopy as lp result = [ - lp.Instruction(id=None, + lp.ExpressionInstruction(id=None, assignee=name, expression=convert_expr(name, expr), temp_var_type=lp.auto) for name, expr in assignments] diff --git a/sumpy/p2p.py b/sumpy/p2p.py index ac0f2831..e9433255 100644 --- a/sumpy/p2p.py +++ b/sumpy/p2p.py @@ -115,7 +115,7 @@ class P2P(KernelComputation): + [ "<> d[idim] = tgt[idim,itgt] - src[idim,isrc] {id=compute_d}", ]+[ - lp.Instruction(id=None, + lp.ExpressionInstruction(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/qbx.py b/sumpy/qbx.py index 3d13ba67..4cfd3406 100644 --- a/sumpy/qbx.py +++ b/sumpy/qbx.py @@ -138,7 +138,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.Instruction(id=None, + lp.ExpressionInstruction(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 140108e5..074f2c47 100644 --- a/sumpy/tools.py +++ b/sumpy/tools.py @@ -182,7 +182,7 @@ class KernelComputation: import loopy as lp return [ - lp.Instruction(id=None, + lp.ExpressionInstruction(id=None, assignee="knl_%d_scaling" % i, expression=ComplexConstantSizer(dtype)( sympy_conv(kernel.get_scaling())), -- GitLab