diff --git a/docs/source/tutorials/01_tutorial_getting_started.ipynb b/docs/source/tutorials/01_tutorial_getting_started.ipynb index 04dc50e51a2823de7b768654671b72af43971ba0..f6c92a6bb5ecc36b11406c3ad1a7667218dee016 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 db8cc259667f0312e1a968d55d061f93120975a1..0b5019fba49ba439253ef1257b3c2f12a728d064 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 892d2d949544c0b39157e51f704d1c0888b93563..02b6b99220d11748647f82ccd88679cec6832ae7 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 07a2f102689700571f2d3cc2375f3bb862694d41..4e24cd1b2e86d82f7ee0521054f087929ff3935f 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 Binary files a/tests/runtime/test_data/datahandling_save_test.npz and b/tests/runtime/test_data/datahandling_save_test.npz differ diff --git a/tests/test_quicktests.py b/tests/test_quicktests.py index d27a5e61bc5be75a0d3f443d5aaf2bbc48d5b6fc..9cefc84c540f10cfc1223ae0a00498ee763b2e5e 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()