From 5978a409a67b948ea4edfb9e563abc559ff57396 Mon Sep 17 00:00:00 2001 From: Alex Fikl Date: Mon, 5 Mar 2018 19:56:30 -0600 Subject: [PATCH] add type for some remaining indices --- sumpy/p2p.py | 11 +++++++---- sumpy/qbx.py | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sumpy/p2p.py b/sumpy/p2p.py index d92360e3..9e26e8e6 100644 --- a/sumpy/p2p.py +++ b/sumpy/p2p.py @@ -308,8 +308,8 @@ class P2PMatrixBlockGenerator(P2PBase): lp.GlobalArg("tgtindices", None, shape="ntgtindices"), lp.GlobalArg("srcranges", None, shape="nranges + 1"), lp.GlobalArg("tgtranges", None, shape="nranges + 1"), - lp.ValueArg("nsrcindices", np.int64), - lp.ValueArg("ntgtindices", np.int64), + lp.ValueArg("nsrcindices", None), + lp.ValueArg("ntgtindices", None), lp.ValueArg("nranges", None) ] + [lp.GlobalArg("result_%d" % i, dtype, @@ -356,8 +356,11 @@ class P2PMatrixBlockGenerator(P2PBase): fixed_parameters=dict(dim=self.dim), lang_version=MOST_RECENT_LANGUAGE_VERSION) - loopy_knl = lp.add_dtypes(loopy_knl, - dict(nsources=np.int64, ntargets=np.int64)) + loopy_knl = lp.add_dtypes(loopy_knl, dict( + nsources=np.int64, + ntargets=np.int64, + ntgtindices=np.int64, + nsrcindices=np.int64)) loopy_knl = lp.tag_inames(loopy_knl, "idim*:unr") for knl in self.kernels: diff --git a/sumpy/qbx.py b/sumpy/qbx.py index 6e8be491..7697bdd9 100644 --- a/sumpy/qbx.py +++ b/sumpy/qbx.py @@ -383,8 +383,11 @@ class LayerPotentialMatrixBlockGenerator(LayerPotentialBase): fixed_parameters=dict(dim=self.dim), lang_version=MOST_RECENT_LANGUAGE_VERSION) - loopy_knl = lp.add_dtypes(loopy_knl, - dict(nsources=np.int64, ntargets=np.int64)) + loopy_knl = lp.add_dtypes(loopy_knl, dict( + nsources=np.int64, + ntargets=np.int64, + ntgtindices=np.int64, + nsrcindices=np.int64)) loopy_knl = lp.tag_inames(loopy_knl, "idim*:unr") for expn in self.expansions: -- GitLab