From e4e49a6b34b4faf7eb95f26ab4ac0bd81f101530 Mon Sep 17 00:00:00 2001
From: Hao Gao <gaohao95@gmail.com>
Date: Fri, 23 Feb 2018 12:55:25 -0600
Subject: [PATCH] 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