From 2b53acd920f3df8646c95d6d5c3be780deadd1c6 Mon Sep 17 00:00:00 2001 From: Rhodri Nelson Date: Thu, 5 Nov 2020 13:34:14 +0000 Subject: [PATCH 1/2] dense: Fix outhalo size warning to check correct dimensions. --- devito/types/dense.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/devito/types/dense.py b/devito/types/dense.py index 1ac6f0e0c9..83fb6374bd 100644 --- a/devito/types/dense.py +++ b/devito/types/dense.py @@ -329,7 +329,9 @@ def _size_outhalo(self): if not self._distributor.is_boundary_rank: warning(warning_msg) else: - for i, j, k, l in zip(left, right, self._distributor.mycoords, + for i, j, k, l in zip(left[-len(self._distributor.dimensions):], + right[-len(self._distributor.dimensions):], + self._distributor.mycoords, self._distributor.topology): if l > 1 and ((j > 0 and k == 0) or (i > 0 and k == l-1)): warning(warning_msg) From 65dc9fbcd52f7ab4b5437a888da1553c4be5ae6f Mon Sep 17 00:00:00 2001 From: rhodrin Date: Fri, 6 Nov 2020 17:31:26 +0000 Subject: [PATCH 2/2] dense: Tighten up halo warning. --- devito/types/dense.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/devito/types/dense.py b/devito/types/dense.py index 83fb6374bd..2c6c5bca48 100644 --- a/devito/types/dense.py +++ b/devito/types/dense.py @@ -329,8 +329,11 @@ def _size_outhalo(self): if not self._distributor.is_boundary_rank: warning(warning_msg) else: - for i, j, k, l in zip(left[-len(self._distributor.dimensions):], - right[-len(self._distributor.dimensions):], + left_dist = [i for i, d in zip(left, self.dimensions) if d + in self._distributor.dimensions] + right_dist = [i for i, d in zip(right, self.dimensions) if d + in self._distributor.dimensions] + for i, j, k, l in zip(left_dist, right_dist, self._distributor.mycoords, self._distributor.topology): if l > 1 and ((j > 0 and k == 0) or (i > 0 and k == l-1)):