From e4e49a6b34b4faf7eb95f26ab4ac0bd81f101530 Mon Sep 17 00:00:00 2001 From: Hao Gao Date: Fri, 23 Feb 2018 12:55:25 -0600 Subject: [PATCH 1/6] Use compressed list 3 interface --- requirements.txt | 2 +- sumpy/fmm.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6690e3d9..c4425ea8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,6 @@ sympy==1.0 git+https://github.com/inducer/pymbolic git+https://github.com/inducer/islpy git+https://github.com/inducer/pyopencl -git+https://github.com/inducer/boxtree +git+https://gitlab.tiker.net/inducer/boxtree@compress-list-3-new git+https://github.com/inducer/loopy git+https://github.com/inducer/pyfmmlib diff --git a/sumpy/fmm.py b/sumpy/fmm.py index 36b07377..d21ee06a 100644 --- a/sumpy/fmm.py +++ b/sumpy/fmm.py @@ -450,7 +450,7 @@ class SumpyExpansionWrangler(object): def eval_multipoles(self, level_start_target_box_nrs, - target_boxes, source_boxes_by_level, mpole_exps): + target_boxes_by_source_level, source_boxes_by_level, mpole_exps): pot = self.output_zeros() kwargs = self.kernel_extra_kwargs.copy() @@ -459,7 +459,7 @@ class SumpyExpansionWrangler(object): wait_for = mpole_exps.events for isrc_level, ssn in enumerate(source_boxes_by_level): - if len(target_boxes) == 0: + if len(target_boxes_by_source_level[isrc_level]) == 0: continue m2p = self.code.m2p(self.level_orders[isrc_level]) @@ -473,7 +473,7 @@ class SumpyExpansionWrangler(object): src_expansions=source_mpoles_view, src_base_ibox=source_level_start_ibox, - target_boxes=target_boxes, + target_boxes=target_boxes_by_source_level[isrc_level], source_box_starts=ssn.starts, source_box_lists=ssn.lists, centers=self.tree.box_centers, -- GitLab From 60dc322716eba5b7f3788b6c18e06c8c89ffce52 Mon Sep 17 00:00:00 2001 From: Hao Gao Date: Fri, 23 Feb 2018 14:07:32 -0600 Subject: [PATCH 2/6] Update requirements for Python 3.5 Conda --- .test-conda-env-py3-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.test-conda-env-py3-requirements.txt b/.test-conda-env-py3-requirements.txt index 01f08662..b0dc4973 100644 --- a/.test-conda-env-py3-requirements.txt +++ b/.test-conda-env-py3-requirements.txt @@ -1,3 +1,3 @@ -git+https://github.com/inducer/boxtree +git+https://gitlab.tiker.net/inducer/boxtree@compress-list-3-new git+https://github.com/inducer/pymbolic git+https://github.com/inducer/loopy -- GitLab From 16544c46491b36a753bad2ccef3ff48e0778c88a Mon Sep 17 00:00:00 2001 From: Hao Gao Date: Sun, 4 Mar 2018 23:00:47 -0600 Subject: [PATCH 3/6] Fix bug --- sumpy/fmm.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sumpy/fmm.py b/sumpy/fmm.py index d21ee06a..bc9a79d6 100644 --- a/sumpy/fmm.py +++ b/sumpy/fmm.py @@ -458,6 +458,7 @@ class SumpyExpansionWrangler(object): wait_for = mpole_exps.events + has_evt = False for isrc_level, ssn in enumerate(source_boxes_by_level): if len(target_boxes_by_source_level[isrc_level]) == 0: continue @@ -485,14 +486,16 @@ class SumpyExpansionWrangler(object): **kwargs) + has_evt = True wait_for = [evt] for pot_i, pot_res_i in zip(pot, pot_res): assert pot_i is pot_res_i - for pot_i in pot: - # Intentionally only adding the last event. - pot_i.add_event(evt) + if has_evt: + for pot_i in pot: + # Intentionally only adding the last event. + pot_i.add_event(evt) return pot -- GitLab From b8c3651e7ad0a754ac2ba1452d2b767c3cc77c6b Mon Sep 17 00:00:00 2001 From: Hao Gao Date: Mon, 5 Mar 2018 08:23:49 -0600 Subject: [PATCH 4/6] Remove the first arg in eval_multipoles --- sumpy/fmm.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sumpy/fmm.py b/sumpy/fmm.py index bc9a79d6..ed2a1e4b 100644 --- a/sumpy/fmm.py +++ b/sumpy/fmm.py @@ -449,7 +449,6 @@ class SumpyExpansionWrangler(object): return local_exps def eval_multipoles(self, - level_start_target_box_nrs, target_boxes_by_source_level, source_boxes_by_level, mpole_exps): pot = self.output_zeros() -- GitLab From 1410b4714e3cfb39e49f9c4084286bd2c7fad1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 9 Mar 2018 01:26:27 -0500 Subject: [PATCH 5/6] Revert .test-conda-env-py3-requirements.txt to boxtree master [ci skip] --- .test-conda-env-py3-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.test-conda-env-py3-requirements.txt b/.test-conda-env-py3-requirements.txt index b0dc4973..45c20c1f 100644 --- a/.test-conda-env-py3-requirements.txt +++ b/.test-conda-env-py3-requirements.txt @@ -1,3 +1,3 @@ -git+https://gitlab.tiker.net/inducer/boxtree@compress-list-3-new +git+https://gitlab.tiker.net/inducer/boxtree git+https://github.com/inducer/pymbolic git+https://github.com/inducer/loopy -- GitLab From bca4ee5442f7ab70edcc6af754c21496ac564580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 9 Mar 2018 01:27:16 -0500 Subject: [PATCH 6/6] Revert requirements.txt to boxtree master --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c4425ea8..1e86e610 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,6 @@ sympy==1.0 git+https://github.com/inducer/pymbolic git+https://github.com/inducer/islpy git+https://github.com/inducer/pyopencl -git+https://gitlab.tiker.net/inducer/boxtree@compress-list-3-new +git+https://gitlab.tiker.net/inducer/boxtree git+https://github.com/inducer/loopy git+https://github.com/inducer/pyfmmlib -- GitLab