From 7595c329fada8d2912aceaeef1a6f36e4309b239 Mon Sep 17 00:00:00 2001
From: Michael Kuron <m.kuron@gmx.de>
Date: Sun, 21 Nov 2021 21:57:05 +0100
Subject: [PATCH] create_staggered_kernel: ignore inapplicable
CreateKernelConfig defaults
---
pystencils/kernelcreation.py | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/pystencils/kernelcreation.py b/pystencils/kernelcreation.py
index 19e0180ee..dc2ce0259 100644
--- a/pystencils/kernelcreation.py
+++ b/pystencils/kernelcreation.py
@@ -333,7 +333,15 @@ def create_staggered_kernel(assignments, target: Target = Target.CPU, gpu_exclus
Returns:
AST, see `create_kernel`
"""
- assert 'iteration_slice' not in kwargs and 'ghost_layers' not in kwargs and 'omp_single_loop' not in kwargs
+ if 'ghost_layers' in kwargs:
+ assert kwargs['ghost_layers'] is None
+ del kwargs['ghost_layers']
+ if 'iteration_slice' in kwargs:
+ assert kwargs['iteration_slice'] is None
+ del kwargs['iteration_slice']
+ if 'omp_single_loop' in kwargs:
+ assert kwargs['omp_single_loop'] is False
+ del kwargs['omp_single_loop']
if isinstance(assignments, AssignmentCollection):
subexpressions = assignments.subexpressions + [a for a in assignments.main_assignments
@@ -437,6 +445,9 @@ def create_staggered_kernel(assignments, target: Target = Target.CPU, gpu_exclus
remove_start_conditional = any([gl[0] == 0 for gl in ghost_layers])
prepend_optimizations = [lambda ast: remove_conditionals_in_staggered_kernel(ast, remove_start_conditional),
move_constants_before_loop]
+ if 'cpu_prepend_optimizations' in kwargs:
+ prepend_optimizations += kwargs['cpu_prepend_optimizations']
+ del kwargs['cpu_prepend_optimizations']
ast = create_kernel(final_assignments, ghost_layers=ghost_layers, target=target, omp_single_loop=False,
cpu_prepend_optimizations=prepend_optimizations, **kwargs)
return ast
--
GitLab