From 44a924db405dc818a99e74825a2ad75e1295bfae Mon Sep 17 00:00:00 2001
From: Michael Kuron <m.kuron@gmx.de>
Date: Fri, 29 Nov 2019 18:14:48 +0100
Subject: [PATCH] Improve debugging of create_staggered_kernel
---
pystencils/kernelcreation.py | 15 ++++++++++-----
pystencils_tests/test_staggered_kernel.py | 3 ++-
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/pystencils/kernelcreation.py b/pystencils/kernelcreation.py
index 8feadc001..0860efc31 100644
--- a/pystencils/kernelcreation.py
+++ b/pystencils/kernelcreation.py
@@ -215,14 +215,18 @@ def create_staggered_kernel(assignments, gpu_exclusive_conditions=False, **kwarg
if isinstance(assignments, AssignmentCollection):
subexpressions = assignments.subexpressions + [a for a in assignments.main_assignments
- if type(a.lhs) is not Field.Access
+ if not hasattr(a, 'lhs')
+ or type(a.lhs) is not Field.Access
or not FieldType.is_staggered(a.lhs.field)]
- assignments = [a for a in assignments.main_assignments if type(a.lhs) is Field.Access
+ assignments = [a for a in assignments.main_assignments if hasattr(a, 'lhs')
+ and type(a.lhs) is Field.Access
and FieldType.is_staggered(a.lhs.field)]
else:
- subexpressions = [a for a in assignments if type(a.lhs) is not Field.Access
+ subexpressions = [a for a in assignments if not hasattr(a, 'lhs')
+ or type(a.lhs) is not Field.Access
or not FieldType.is_staggered(a.lhs.field)]
- assignments = [a for a in assignments if type(a.lhs) is Field.Access
+ assignments = [a for a in assignments if hasattr(a, 'lhs')
+ and type(a.lhs) is Field.Access
and FieldType.is_staggered(a.lhs.field)]
if len(set([tuple(a.lhs.field.staggered_stencil) for a in assignments])) != 1:
raise ValueError("All assignments need to be made to staggered fields with the same stencil")
@@ -277,7 +281,8 @@ def create_staggered_kernel(assignments, gpu_exclusive_conditions=False, **kwarg
for assignment in assignments:
direction = assignment.lhs.field.staggered_stencil[assignment.lhs.index[0]]
- sp_assignments = [SympyAssignment(s.lhs, s.rhs) for s in subexpressions] + \
+ sp_assignments = [s for s in subexpressions if not hasattr(s, 'lhs')] + \
+ [SympyAssignment(s.lhs, s.rhs) for s in subexpressions if hasattr(s, 'lhs')] + \
[SympyAssignment(assignment.lhs, assignment.rhs)]
last_conditional = Conditional(condition(direction), Block(sp_assignments))
final_assignments.append(last_conditional)
diff --git a/pystencils_tests/test_staggered_kernel.py b/pystencils_tests/test_staggered_kernel.py
index 0937dc98e..a914b9180 100644
--- a/pystencils_tests/test_staggered_kernel.py
+++ b/pystencils_tests/test_staggered_kernel.py
@@ -45,8 +45,9 @@ class TestStaggeredDiffusion:
dh.all_to_cpu()
def init():
+ dh.fill(c.name, np.nan, ghost_layers=True, inner_ghost_layers=True)
dh.fill(c.name, 0)
- dh.fill(j.name, np.nan)
+ dh.fill(j.name, np.nan, ghost_layers=True, inner_ghost_layers=True)
dh.cpu_arrays[c.name][L[0] // 2:L[0] // 2 + 2, L[1] // 2:L[1] // 2 + 2] = 1.0
init()
--
GitLab