From 958a499f4a529c4ca1636e306fdecc327da13759 Mon Sep 17 00:00:00 2001
From: Frederik Hennig <frederik.hennig@fau.de>
Date: Mon, 20 Jan 2025 15:27:51 +0100
Subject: [PATCH] fix testsuite
---
.../01_tutorial_getting_started.ipynb | 10 ++++---
tests/kernelcreation/test_buffer_gpu.py | 6 ++--
tests/kernelcreation/test_iteration_slices.py | 5 ++--
tests/nbackend/kernelcreation/test_openmp.py | 26 +++++++-----------
.../test_data/datahandling_save_test.npz | Bin 428 -> 410 bytes
tests/test_quicktests.py | 11 +++-----
6 files changed, 24 insertions(+), 34 deletions(-)
diff --git a/docs/source/tutorials/01_tutorial_getting_started.ipynb b/docs/source/tutorials/01_tutorial_getting_started.ipynb
index 04dc50e51..f6c92a6bb 100644
--- a/docs/source/tutorials/01_tutorial_getting_started.ipynb
+++ b/docs/source/tutorials/01_tutorial_getting_started.ipynb
@@ -1138,7 +1138,7 @@
},
{
"cell_type": "code",
- "execution_count": 34,
+ "execution_count": null,
"metadata": {},
"outputs": [
{
@@ -1262,11 +1262,13 @@
}
],
"source": [
+ "cfg = ps.CreateKernelConfig()\n",
+ "cfg.cpu.openmp.enable = True\n",
+ "cfg.cpu.openmp.num_threads = 2\n",
"ast = ps.create_kernel(\n",
" update_rule,\n",
- " cpu = ps.CpuOptions(\n",
- " openmp=ps.OpenMpOptions(enable=True, num_threads=2))\n",
- " )\n",
+ " cfg\n",
+ ")\n",
"\n",
"ps.show_code(ast)"
]
diff --git a/tests/kernelcreation/test_buffer_gpu.py b/tests/kernelcreation/test_buffer_gpu.py
index db8cc2596..0b5019fba 100644
--- a/tests/kernelcreation/test_buffer_gpu.py
+++ b/tests/kernelcreation/test_buffer_gpu.py
@@ -299,8 +299,7 @@ def test_iteration_slices(gpu_indexing):
gpu_src_arr.set(src_arr)
gpu_dst_arr.fill(0)
- config = CreateKernelConfig(target=Target.GPU, iteration_slice=pack_slice,
- gpu=gpu_indexing)
+ config = CreateKernelConfig(target=Target.GPU, iteration_slice=pack_slice)
pack_code = create_kernel(pack_eqs, config=config)
pack_kernel = pack_code.compile()
@@ -312,8 +311,7 @@ def test_iteration_slices(gpu_indexing):
eq = Assignment(dst_field(idx), buffer(idx))
unpack_eqs.append(eq)
- config = CreateKernelConfig(target=Target.GPU, iteration_slice=pack_slice,
- gpu=gpu_indexing)
+ config = CreateKernelConfig(target=Target.GPU, iteration_slice=pack_slice)
unpack_code = create_kernel(unpack_eqs, config=config)
unpack_kernel = unpack_code.compile()
diff --git a/tests/kernelcreation/test_iteration_slices.py b/tests/kernelcreation/test_iteration_slices.py
index 892d2d949..02b6b9922 100644
--- a/tests/kernelcreation/test_iteration_slices.py
+++ b/tests/kernelcreation/test_iteration_slices.py
@@ -13,7 +13,6 @@ from pystencils import (
make_slice,
Target,
CreateKernelConfig,
- GpuOptions,
DynamicType,
)
from pystencils.sympyextensions.integer_functions import int_rem
@@ -81,7 +80,7 @@ def test_numerical_slices(gen_config: CreateKernelConfig, xp, islice):
try:
kernel = create_kernel(update, gen_config).compile()
except NotImplementedError:
- if gen_config.target.is_vector_cpu():
+ if gen_config.get_target().is_vector_cpu():
# TODO Gather/Scatter not implemented yet
pytest.xfail("Gather/Scatter not available yet")
@@ -179,7 +178,7 @@ def test_red_black_pattern(gen_config: CreateKernelConfig, xp):
try:
kernel = create_kernel(update, gen_config).compile()
except NotImplementedError:
- if gen_config.target.is_vector_cpu():
+ if gen_config.get_target().is_vector_cpu():
pytest.xfail("Gather/Scatter not implemented yet")
if isinstance(kernel, CupyKernelWrapper):
diff --git a/tests/nbackend/kernelcreation/test_openmp.py b/tests/nbackend/kernelcreation/test_openmp.py
index 07a2f1026..4e24cd1b2 100644
--- a/tests/nbackend/kernelcreation/test_openmp.py
+++ b/tests/nbackend/kernelcreation/test_openmp.py
@@ -4,8 +4,6 @@ from pystencils import (
Assignment,
create_kernel,
CreateKernelConfig,
- CpuOptions,
- OpenMpOptions,
Target,
)
@@ -21,16 +19,12 @@ def test_openmp(nesting_depth, schedule, collapse, omit_parallel_construct):
f, g = fields("f, g: [3D]")
asm = Assignment(f.center(0), g.center(0))
- omp = OpenMpOptions(
- enable=True,
- nesting_depth=nesting_depth,
- schedule=schedule,
- collapse=collapse,
- omit_parallel_construct=omit_parallel_construct,
- )
- gen_config = CreateKernelConfig(
- target=Target.CPU, cpu=CpuOptions(openmp=omp)
- )
+ gen_config = CreateKernelConfig(target=Target.CPU)
+ gen_config.cpu.openmp.enable = True
+ gen_config.cpu.openmp.nesting_depth = nesting_depth
+ gen_config.cpu.openmp.schedule = schedule
+ gen_config.cpu.openmp.collapse = collapse
+ gen_config.cpu.openmp.omit_parallel_construct = omit_parallel_construct
kernel = create_kernel(asm, gen_config)
ast = kernel.body
@@ -53,10 +47,10 @@ def test_openmp(nesting_depth, schedule, collapse, omit_parallel_construct):
pragma = find_omp_pragma(ast)
tokens = set(pragma.text.split())
- expected_tokens = {"omp", "for", f"schedule({omp.schedule})"}
- if not omp.omit_parallel_construct:
+ expected_tokens = {"omp", "for", f"schedule({schedule})"}
+ if not omit_parallel_construct:
expected_tokens.add("parallel")
- if omp.collapse is not None:
- expected_tokens.add(f"collapse({omp.collapse})")
+ if collapse is not None:
+ expected_tokens.add(f"collapse({collapse})")
assert tokens == expected_tokens
diff --git a/tests/runtime/test_data/datahandling_save_test.npz b/tests/runtime/test_data/datahandling_save_test.npz
index 22202358a4fa1d1cea4db89c0889f5bca636598b..d363a8a0aba1bb78a06314a19b887eb4c4975334 100644
GIT binary patch
literal 410
zcmWIWW@Zs#U|`^2U|>*W=q~1y3SnSiU|?lnU}q3vC@xCY%PXj4WDo!gfn>na3=9mj
z--y4G7C3n#;8?)gd6S~%#4O2Mx*%_I+QM~<7tEU$9}+ZWhWPyWDU-N__%*eBS-Hg1
zRm7Gs?UYip;&Mn?xpHy9Y6rCkNes>W-xhz-u=VP{^ko?%e#fK~m(bTSj7%cTxWWb$
p6cF6N2%@1O72r**rd|dH2B?n$yjj^mW-u`@F=R0?Fi3$-1OO#vVK)E(
literal 428
zcmWIWW@Zs#U|`^2U|>*W=q~1yie+G6U|?lnU}q3vC@xCY%PXj4WDo!gfn>na3=9mj
z--y4G7C3n#;8?)gd6S~%#4O2Mx*%_I+QM~<7tEU$9}+ZWhWPyWDU-N__%*eBuLcI_
zpYzc12;ClZ!Qf(`!NtH0SFQxE2vra+Fl;!;{yVVBM8@s%!3?{E1;us@4ESA@Qd}}X
yu3}^oVa63&pumCP21XDK4Z8quVl_=;U|@iHEx?<V4P*ur0~13Q0|SE&*hBzalx#cz
diff --git a/tests/test_quicktests.py b/tests/test_quicktests.py
index d27a5e61b..9cefc84c5 100644
--- a/tests/test_quicktests.py
+++ b/tests/test_quicktests.py
@@ -71,13 +71,10 @@ def test_basic_vectorization():
update_rule = [
ps.Assignment(g[0, 0], f[0, 0] + f[-1, 0] + f[1, 0] + f[0, 1] + f[0, -1] + 42.0)
]
- ast = ps.create_kernel(
- update_rule,
- target=target,
- cpu=ps.CpuOptions(
- vectorize=ps.VectorizationOptions(enable=True, assume_inner_stride_one=True)
- ),
- )
+ cfg = ps.CreateKernelConfig(target=target)
+ cfg.cpu.vectorize.enable = True
+ cfg.cpu.vectorize.assume_inner_stride_one = True
+ ast = ps.create_kernel(update_rule, cfg)
func = ast.compile()
--
GitLab