not parallel on default dimensions

devitocodes · May 17, 2018 · 932c067 · 932c067
1 parent fe26803
commit 932c067
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/devito/core/autotuning.py b/devito/core/autotuning.py
@@ -170,7 +170,7 @@ def more_heuristic_attempts(blocksizes):
 
 options = {
     'at_squeezer': 4,
-    'at_blocksize': sorted({8, 16, 24, 32, 40, 64, 128}),
+    'at_blocksize': sorted({1, 8, 16, 24, 32, 40, 64, 128}),
     'at_stack_limit': resource.getrlimit(resource.RLIMIT_STACK)[0] / 4
 }
 """Autotuning options."""
diff --git a/devito/dle/backends/advanced.py b/devito/dle/backends/advanced.py
@@ -187,7 +187,9 @@ def _simdize(self, nodes, state):
 
         mapper = {}
         for tree in retrieve_iteration_tree(nodes):
-            vector_iterations = [i for i in tree if i.is_Vectorizable]
+            vector_iterations = []
+            if not any(i.is_ParallelAtomic for i in tree):
+                vector_iterations = [i for i in tree if i.is_Vectorizable]
             for i in vector_iterations:
                 handle = FindSymbols('symbolics').visit(i)
                 try:

diff --git a/devito/ir/iet/nodes.py b/devito/ir/iet/nodes.py
@@ -369,11 +369,11 @@ def is_Sequential(self):
 
     @property
     def is_Parallel(self):
-        return PARALLEL in self.properties
+        return PARALLEL in self.properties and not self.dim.is_Default
 
     @property
     def is_ParallelAtomic(self):
-        return PARALLEL_IF_ATOMIC in self.properties
+        return PARALLEL_IF_ATOMIC in self.properties and not self.dim.is_Default
 
     @property
     def is_ParallelRelaxed(self):