From 34b28318efa88a12914653890b18e5f21147825d Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Thu, 13 Jun 2019 19:22:39 -0500 Subject: [PATCH 1/2] Fix deprecated usages in expand_cses(). This caused some mysterious warnings in Pytential. --- loopy/kernel/creation.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/loopy/kernel/creation.py b/loopy/kernel/creation.py index 5ba147dfd..6f38a6446 100644 --- a/loopy/kernel/creation.py +++ b/loopy/kernel/creation.py @@ -1327,17 +1327,14 @@ def expand_cses(instructions, inames_to_dup, cse_prefix="cse_expr"): new_var_name = var_name_gen(base_name) - if dtype is None: - import loopy as lp - dtype = lp.auto - else: + if dtype is not None: dtype = np.dtype(dtype) from loopy.kernel.data import TemporaryVariable new_temp_vars.append(TemporaryVariable( name=new_var_name, dtype=dtype, - scope=lp.auto, + address_space=lp.auto, shape=())) from pymbolic.primitives import Variable -- GitLab From e368ff0039b3c0bb5b634854e713da763e6249c4 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Thu, 13 Jun 2019 19:24:48 -0500 Subject: [PATCH 2/2] Add back loopy import --- loopy/kernel/creation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/loopy/kernel/creation.py b/loopy/kernel/creation.py index 6f38a6446..9a9046276 100644 --- a/loopy/kernel/creation.py +++ b/loopy/kernel/creation.py @@ -1330,6 +1330,7 @@ def expand_cses(instructions, inames_to_dup, cse_prefix="cse_expr"): if dtype is not None: dtype = np.dtype(dtype) + import loopy as lp from loopy.kernel.data import TemporaryVariable new_temp_vars.append(TemporaryVariable( name=new_var_name, -- GitLab