Merge pull request #916 from opesci/fix-mpi-gather-ompization

mpi: OMP-collapse gather/scatter routines
devitocodes · Aug 29, 2019 · 914afa6 · 914afa6
2 parents f8e137c + 1d4ac66
commit 914afa6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/devito/dle/blocking_utils.py b/devito/dle/blocking_utils.py
@@ -36,7 +36,7 @@ def make_blocking(self, iet):
         block_dims = []
         for tree in retrieve_iteration_tree(iet):
             # Is the Iteration tree blockable ?
-            iterations = filter_iterations(tree, lambda i: i.is_Parallel)
+            iterations = filter_iterations(tree, lambda i: i.is_Parallel and i.is_Affine)
             if not self.blockinner:
                 iterations = iterations[:-1]
             if len(iterations) <= 1:

diff --git a/devito/mpi/routines.py b/devito/mpi/routines.py
@@ -319,8 +319,7 @@ def _make_copy(self, f, hse, key, swap=False):
         iet = Expression(eq)
         for i, d in reversed(list(zip(buf_indices, buf_dims))):
             # The -1 below is because an Iteration, by default, generates <=
-            iet = Iteration(iet, i, d.symbolic_size - 1)
-        iet = iet._rebuild(properties=PARALLEL)
+            iet = Iteration(iet, i, d.symbolic_size - 1, properties=PARALLEL)
 
         parameters = [buf] + list(buf.shape) + [f] + f_offsets
         return Callable(name, iet, 'void', parameters, ('static',))