From 08ace6686aa936eb2a5a5a4cfec320ff2daed607 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Fri, 1 Sep 2017 17:39:37 -0500 Subject: [PATCH] Use fixed_parameters in FMM kernels to avoid temp shape fallback warnings. --- pytential/qbx/interactions.py | 23 ++++++++--------------- setup.py | 2 +- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/pytential/qbx/interactions.py b/pytential/qbx/interactions.py index 0d78dcdb..6105472d 100644 --- a/pytential/qbx/interactions.py +++ b/pytential/qbx/interactions.py @@ -112,9 +112,9 @@ class P2QBXLFromCSR(P2EBase): """], arguments, name=self.name, assumptions="ntgt_centers>=1", - silenced_warnings="write_race(write_expn*)") + silenced_warnings="write_race(write_expn*)", + fixed_parameters=dict(dim=self.dim)) - loopy_knl = lp.fix_parameters(loopy_knl, dim=self.dim) loopy_knl = self.expansion.prepare_loopy_kernel(loopy_knl) loopy_knl = lp.tag_inames(loopy_knl, "idim*:unr") @@ -208,9 +208,8 @@ class M2QBXL(E2EBase): "..." ] + gather_loopy_arguments([self.src_expansion, self.tgt_expansion]), name=self.name, assumptions="ncenters>=1", - silenced_warnings="write_race(write_expn*)") - - loopy_knl = lp.fix_parameters(loopy_knl, dim=self.dim) + silenced_warnings="write_race(write_expn*)", + fixed_parameters=dict(dim=self.dim)) for expn in [self.src_expansion, self.tgt_expansion]: loopy_knl = expn.prepare_loopy_kernel(loopy_knl) @@ -309,11 +308,8 @@ class L2QBXL(E2EBase): ] + gather_loopy_arguments([self.src_expansion, self.tgt_expansion]), name=self.name, assumptions="ncenters>=1", - silenced_warnings="write_race(write_expn*)") - - loopy_knl = lp.fix_parameters(loopy_knl, - dim=self.dim, - nchildren=2**self.dim) + silenced_warnings="write_race(write_expn*)", + fixed_parameters=dict(dim=self.dim, nchildren=2**self.dim)) for expn in [self.src_expansion, self.tgt_expansion]: loopy_knl = expn.prepare_loopy_kernel(loopy_knl) @@ -408,11 +404,8 @@ class QBXL2P(E2PBase): ] + [arg.loopy_arg for arg in self.expansion.get_args()], name=self.name, assumptions="nglobal_qbx_centers>=1", - silenced_warnings="write_race(write_result*)") - - loopy_knl = lp.fix_parameters(loopy_knl, - dim=self.dim, - nresults=len(result_names)) + silenced_warnings="write_race(write_result*)", + fixed_parameters=dict(dim=self.dim, nresults=len(result_names))) loopy_knl = lp.tag_inames(loopy_knl, "idim*:unr") loopy_knl = self.expansion.prepare_loopy_kernel(loopy_knl) diff --git a/setup.py b/setup.py index 52d84d34..d8d49a9c 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ def main(): "pyopencl>=2013.1", "boxtree>=2013.1", "pymbolic>=2013.2", - "loo.py>=2013.1beta", + "loo.py>=2017.2", "sumpy>=2013.1", "cgen>=2013.1.2", -- GitLab