From 3de9dbb7042d2750192d3ab585991ab6eb7ff821 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Wed, 20 Apr 2016 17:24:26 -0500
Subject: [PATCH] ExpressionInstruction -> Assignment to avoid deprecation
 warnings

---
 sumpy/codegen.py | 2 +-
 sumpy/e2p.py     | 2 +-
 sumpy/p2p.py     | 4 ++--
 sumpy/qbx.py     | 2 +-
 sumpy/tools.py   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sumpy/codegen.py b/sumpy/codegen.py
index 6ee517f8..9d273c39 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 4735fcc0..e08bb27b 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 6541cf94..5c5cfd6f 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 90304db1..ffc8482d 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 dbad2fab..a6423723 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)
-- 
GitLab