From a4446126a3be19eaea6c2ef463d1a620a9de6946 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Mon, 6 Aug 2018 19:19:57 -0500 Subject: [PATCH 1/2] Point to boxtree 2018.2 --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6d1e4cce..83394272 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ git+https://github.com/inducer/modepy git+https://github.com/inducer/pyopencl git+https://github.com/inducer/islpy git+https://github.com/inducer/loopy -git+https://gitlab.tiker.net/inducer/boxtree +git+https://gitlab.tiker.net/inducer/boxtree@reindex-list4-close git+https://github.com/inducer/meshmode git+https://gitlab.tiker.net/inducer/sumpy git+https://github.com/inducer/pyfmmlib diff --git a/setup.py b/setup.py index 0c13014d..e2a1ae90 100644 --- a/setup.py +++ b/setup.py @@ -100,7 +100,7 @@ setup(name="pytential", "pytools>=2018.2", "modepy>=2013.3", "pyopencl>=2013.1", - "boxtree>=2018.1", + "boxtree>=2018.2", "pymbolic>=2013.2", "loo.py>=2017.2", "sumpy>=2013.1", -- GitLab From 48273c210ea3177c4187d269bb1444df4ee067ae Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Mon, 6 Aug 2018 19:56:30 -0500 Subject: [PATCH 2/2] Fix overcounting of eval_locals. Closes #103 --- pytential/qbx/fmm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pytential/qbx/fmm.py b/pytential/qbx/fmm.py index 994c8ff7..46d7ae88 100644 --- a/pytential/qbx/fmm.py +++ b/pytential/qbx/fmm.py @@ -809,7 +809,8 @@ def assemble_performance_data(geo_data, uses_pde_expansions, # {{{ evaluate locals - result["eval_part"] = tree.ntargets * ncoeffs_fmm + non_qbx_box_targets = geo_data.non_qbx_box_target_lists() + result["eval_part"] = non_qbx_box_targets.nfiltered_targets * ncoeffs_fmm # }}} -- GitLab