From 4539d7edc4c5ba48bff836f69ab3008c36bbf0b9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 10 Dec 2018 20:30:09 -0600 Subject: [PATCH] Change data layout of expansions --- sumpy/e2e.py | 12 ++++++------ sumpy/e2p.py | 4 ++-- sumpy/p2e.py | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sumpy/e2e.py b/sumpy/e2e.py index 12e80b5f..2d543611 100644 --- a/sumpy/e2e.py +++ b/sumpy/e2e.py @@ -209,9 +209,9 @@ class E2EFromCSR(E2EBase): np.int32), lp.ValueArg("nsrc_level_boxes,ntgt_level_boxes", np.int32), - lp.GlobalArg("src_expansions", None, + lp.GlobalArg("src_expansions", None, dim_tags="f,f", shape=("nsrc_level_boxes", ncoeff_src), offset=lp.auto), - lp.GlobalArg("tgt_expansions", None, + lp.GlobalArg("tgt_expansions", None, dim_tags="f,f", shape=("ntgt_level_boxes", ncoeff_tgt), offset=lp.auto), "..." ] + gather_loopy_arguments([self.src_expansion, self.tgt_expansion]), @@ -328,9 +328,9 @@ class E2EFromChildren(E2EBase): lp.ValueArg("src_rscale,tgt_rscale", None), lp.GlobalArg("box_child_ids", None, shape="nchildren, aligned_nboxes"), - lp.GlobalArg("tgt_expansions", None, + lp.GlobalArg("tgt_expansions", None, dim_tags="f,f", shape=("ntgt_level_boxes", ncoeffs), offset=lp.auto), - lp.GlobalArg("src_expansions", None, + lp.GlobalArg("src_expansions", None, dim_tags="f,f", shape=("nsrc_level_boxes", ncoeffs), offset=lp.auto), lp.ValueArg("src_base_ibox,tgt_base_ibox", np.int32), lp.ValueArg("ntgt_level_boxes,nsrc_level_boxes", np.int32), @@ -436,9 +436,9 @@ class E2EFromParent(E2EBase): lp.ValueArg("tgt_base_ibox,src_base_ibox", np.int32), lp.ValueArg("ntgt_level_boxes,nsrc_level_boxes", np.int32), lp.GlobalArg("box_parent_ids", None, shape="nboxes"), - lp.GlobalArg("tgt_expansions", None, + lp.GlobalArg("tgt_expansions", None, dim_tags="f,f", shape=("ntgt_level_boxes", ncoeffs), offset=lp.auto), - lp.GlobalArg("src_expansions", None, + lp.GlobalArg("src_expansions", None, dim_tags="f,f", shape=("nsrc_level_boxes", ncoeffs), offset=lp.auto), "..." ] + gather_loopy_arguments([self.src_expansion, self.tgt_expansion]), diff --git a/sumpy/e2p.py b/sumpy/e2p.py index d0d05cbf..2e9211b7 100644 --- a/sumpy/e2p.py +++ b/sumpy/e2p.py @@ -178,7 +178,7 @@ class E2PFromSingleBox(E2PBase): lp.ValueArg("rscale", None), lp.GlobalArg("result", None, shape="nresults, ntargets", dim_tags="sep,C"), - lp.GlobalArg("src_expansions", None, + lp.GlobalArg("src_expansions", None, dim_tags="f,f", shape=("nsrc_level_boxes", ncoeffs), offset=lp.auto), lp.ValueArg("nsrc_level_boxes,naligned_boxes", np.int32), lp.ValueArg("src_base_ibox", np.int32), @@ -280,7 +280,7 @@ class E2PFromCSR(E2PBase): lp.GlobalArg("box_target_starts,box_target_counts_nonchild", None, shape=None), lp.GlobalArg("centers", None, shape="dim, aligned_nboxes"), - lp.GlobalArg("src_expansions", None, + lp.GlobalArg("src_expansions", None, dim_tags="f,f", shape=("nsrc_level_boxes", ncoeffs), offset=lp.auto), lp.ValueArg("src_base_ibox", np.int32), lp.ValueArg("nsrc_level_boxes,aligned_nboxes", np.int32), diff --git a/sumpy/p2e.py b/sumpy/p2e.py index daa7d93d..b9bc5822 100644 --- a/sumpy/p2e.py +++ b/sumpy/p2e.py @@ -150,7 +150,7 @@ class P2EFromSingleBox(P2EBase): None, shape=None), lp.GlobalArg("centers", None, shape="dim, aligned_nboxes"), lp.ValueArg("rscale", None), - lp.GlobalArg("tgt_expansions", None, + lp.GlobalArg("tgt_expansions", None, dim_tags="f,f", shape=("nboxes", ncoeffs), offset=lp.auto), lp.ValueArg("nboxes,aligned_nboxes,tgt_base_ibox", np.int32), lp.ValueArg("nsources", np.int32), @@ -217,7 +217,7 @@ class P2EFromCSR(P2EBase): lp.GlobalArg("box_source_starts,box_source_counts_nonchild", None, shape=None), lp.GlobalArg("centers", None, shape="dim, naligned_boxes"), - lp.GlobalArg("tgt_expansions", None, + lp.GlobalArg("tgt_expansions", None, dim_tags="f,f", shape=("ntgt_level_boxes", ncoeffs), offset=lp.auto), lp.ValueArg("naligned_boxes,ntgt_level_boxes,tgt_base_ibox", np.int32), -- GitLab