Skip to content
Snippets Groups Projects
Commit 777bdfaa authored by Markus Holzer's avatar Markus Holzer
Browse files

test

parent 4424dfd3
No related branches found
No related tags found
1 merge request!275WIP: Revamp the type system
...@@ -82,10 +82,6 @@ try: ...@@ -82,10 +82,6 @@ try:
except ImportError: except ImportError:
collect_ignore += [os.path.join(SCRIPT_FOLDER, "pystencils/datahandling/vtk.py")] collect_ignore += [os.path.join(SCRIPT_FOLDER, "pystencils/datahandling/vtk.py")]
# TODO: Remove if Ubuntu 18.04 is no longer supported
if pytest_version < 50403:
collect_ignore += [os.path.join(SCRIPT_FOLDER, "pystencils_tests/test_jupyter_extensions.ipynb")]
collect_ignore += [os.path.join(SCRIPT_FOLDER, 'setup.py')] collect_ignore += [os.path.join(SCRIPT_FOLDER, 'setup.py')]
for root, sub_dirs, files in os.walk('.'): for root, sub_dirs, files in os.walk('.'):
......
...@@ -63,7 +63,7 @@ def test_vectorized_abs(instruction_set, dtype): ...@@ -63,7 +63,7 @@ def test_vectorized_abs(instruction_set, dtype):
def test_strided(instruction_set, dtype): def test_strided(instruction_set, dtype):
npdtype = np.float64 if dtype == 'double' else np.float32 npdtype = np.float64 if dtype == 'double' else np.float32
type_string = "float64" if dtype == 'double' else "float32" type_string = "float64" if dtype == 'double' else "float32"
f, g = ps.fields(f"f, g : {type_string}[2D]") f, g = ps.fields(f"f, g : {type_string}[2D]")
update_rule = [ps.Assignment(g[0, 0], f[0, 0] + f[-1, 0] + f[1, 0] + f[0, 1] + f[0, -1] + 42.0)] update_rule = [ps.Assignment(g[0, 0], f[0, 0] + f[-1, 0] + f[1, 0] + f[0, 1] + f[0, -1] + 42.0)]
if 'storeS' not in get_vector_instruction_set(dtype, instruction_set) and instruction_set not in ['avx512', 'rvv'] and not instruction_set.startswith('sve'): if 'storeS' not in get_vector_instruction_set(dtype, instruction_set) and instruction_set not in ['avx512', 'rvv'] and not instruction_set.startswith('sve'):
...@@ -79,7 +79,7 @@ def test_strided(instruction_set, dtype): ...@@ -79,7 +79,7 @@ def test_strided(instruction_set, dtype):
ast = ps.create_kernel(update_rule, config=config) ast = ps.create_kernel(update_rule, config=config)
assert len(warn) == 0 assert len(warn) == 0
ps.show_code(ast) # ps.show_code(ast)
func = ast.compile() func = ast.compile()
ref_config = pystencils.config.CreateKernelConfig(default_number_float=type_string) ref_config = pystencils.config.CreateKernelConfig(default_number_float=type_string)
ref_func = ps.create_kernel(update_rule, config=ref_config).compile() ref_func = ps.create_kernel(update_rule, config=ref_config).compile()
...@@ -92,7 +92,7 @@ def test_strided(instruction_set, dtype): ...@@ -92,7 +92,7 @@ def test_strided(instruction_set, dtype):
func(g=dst, f=arr) func(g=dst, f=arr)
ref_func(g=ref, f=arr) ref_func(g=ref, f=arr)
np.testing.assert_almost_equal(dst, ref, 13 if dtype == 'double' else 5) np.testing.assert_almost_equal(dst[1:-1, 1:-1], ref[1:-1, 1:-1], 13 if dtype == 'double' else 5)
@pytest.mark.parametrize('dtype', ('float', 'double')) @pytest.mark.parametrize('dtype', ('float', 'double'))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment