diff --git a/input.py b/data_for_test.py similarity index 99% rename from input.py rename to data_for_test.py index f29c026a30a38b21fd5dc65cbc4c3ecb915de36a..c83dd53e00786939bcf71b2cf9ec6d38936a3fc4 100644 --- a/input.py +++ b/data_for_test.py @@ -1,6 +1,7 @@ import pytest import utilities as u + # {{{ FluxDataSingle class FluxDataSingle: @@ -54,24 +55,25 @@ class FluxDataSingle: def swap_array(self, arr, d): p = self.permutation(d) - arr[p] = arr[[1,2,3]] + arr[p] = arr[[1, 2, 3]] return arr def swap_array_rows(self, arr, d): p = self.permutation(d) - arr[p,:] = arr[[1,2,3],:] + arr[p, :] = arr[[1, 2, 3], :] return arr def swap_array_cols(self, arr, d): p = self.permutation(d) - arr[:,p] = arr[:,[1,2,3]] + arr[:, p] = arr[:, [1, 2, 3]] return arr def permutation(self, d): - return [(d-1+i)%3 + 1 for i in range(3)] + return [(d-1+i) % 3 + 1 for i in range(3)] # }}} + single_data = {} # {{{ Input data: Case (a) @@ -703,7 +705,7 @@ single_data["Case d:z"] = FluxDataSingle( "Case b:x", "Case b:y", "Case b:z", "Case c:x", "Case c:y", "Case c:z", "Case d:x", "Case d:y", "Case d:z"]) -def data(request): +def flux_test_data_fixture(request): return single_data[request.param] diff --git a/setup.cfg b/setup.cfg index f812af5d478f1a1481323631cdb98bc73a8a4ff7..7963e687c9e69eeeeafbee1326357c0b5b7f6d04 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,4 @@ [flake8] -ignore = E126,E127,E128,E123,E226,E241,E242,E265,N802,N803,N806,W503,E402,N814,W504,F401,F811 +ignore = E126,E127,E128,E123,E226,E241,E242,E265,N802,N803,N806,W503,E402,N814,W504 max-line-length=85 +per-file-ignores = test.py:F811 diff --git a/test.py b/test.py index 75fabad317d4981630c06b3e05dd5858ea45d4ac..ab1c1387b7f39c170fc5ea88574067fc6dfce97b 100644 --- a/test.py +++ b/test.py @@ -15,10 +15,12 @@ from pyopencl.tools import ( # noqa as pytest_generate_tests) import utilities as u -from input import data +from data_for_test import flux_test_data_fixture # noqa: F401 -def test_weno_flux_uniform_grid(ctx_factory, data): +def test_weno_flux_uniform_grid(ctx_factory, flux_test_data_fixture): + data = flux_test_data_fixture + prg = u.get_weno_program_with_root_kernel("weno_flux") queue = u.get_queue(ctx_factory) @@ -35,7 +37,9 @@ def test_weno_flux_uniform_grid(ctx_factory, data): u.compare_arrays(flux_dev.get(), data.weno_flux) -def test_consistent_part_uniform_grid(ctx_factory, data): +def test_consistent_part_uniform_grid(ctx_factory, flux_test_data_fixture): + data = flux_test_data_fixture + prg = u.get_weno_program_with_root_kernel("consistent_part") queue = u.get_queue(ctx_factory) @@ -48,7 +52,9 @@ def test_consistent_part_uniform_grid(ctx_factory, data): u.compare_arrays(consistent_dev.get(), data.consistent) -def test_dissipation_part_pos_uniform_grid(ctx_factory, data): +def test_dissipation_part_pos_uniform_grid(ctx_factory, flux_test_data_fixture): + data = flux_test_data_fixture + prg = u.get_weno_program_with_root_kernel("dissipation_part_pos") queue = u.get_queue(ctx_factory) @@ -63,7 +69,9 @@ def test_dissipation_part_pos_uniform_grid(ctx_factory, data): u.compare_arrays(dissipation_dev.get(), data.dissipation_pos) -def test_dissipation_part_neg_uniform_grid(ctx_factory, data): +def test_dissipation_part_neg_uniform_grid(ctx_factory, flux_test_data_fixture): + data = flux_test_data_fixture + prg = u.get_weno_program_with_root_kernel("dissipation_part_neg") queue = u.get_queue(ctx_factory) @@ -78,7 +86,9 @@ def test_dissipation_part_neg_uniform_grid(ctx_factory, data): u.compare_arrays(dissipation_dev.get(), data.dissipation_neg) -def test_weno_weights_pos_uniform_grid(ctx_factory, data): +def test_weno_weights_pos_uniform_grid(ctx_factory, flux_test_data_fixture): + data = flux_test_data_fixture + prg = u.get_weno_program_with_root_kernel("weno_weights_pos") queue = u.get_queue(ctx_factory) @@ -92,7 +102,9 @@ def test_weno_weights_pos_uniform_grid(ctx_factory, data): u.compare_arrays(weights_dev.get(), data.weno_weights_pos) -def test_weno_weights_neg_uniform_grid(ctx_factory, data): +def test_weno_weights_neg_uniform_grid(ctx_factory, flux_test_data_fixture): + data = flux_test_data_fixture + prg = u.get_weno_program_with_root_kernel("weno_weights_neg") queue = u.get_queue(ctx_factory) @@ -106,7 +118,9 @@ def test_weno_weights_neg_uniform_grid(ctx_factory, data): u.compare_arrays(weights_dev.get(), data.weno_weights_neg) -def test_flux_splitting_uniform_grid(ctx_factory, data): +def test_flux_splitting_uniform_grid(ctx_factory, flux_test_data_fixture): + data = flux_test_data_fixture + prg = u.get_weno_program_with_root_kernel("split_characteristic_fluxes") queue = u.get_queue(ctx_factory) @@ -125,7 +139,9 @@ def test_flux_splitting_uniform_grid(ctx_factory, data): u.compare_arrays(fluxes_neg_dev.get(), data.char_fluxes_neg) -def test_pointwise_eigenvalues_ideal_gas(ctx_factory, data): +def test_pointwise_eigenvalues_ideal_gas(ctx_factory, flux_test_data_fixture): + data = flux_test_data_fixture + prg = u.get_weno_program_with_root_kernel("pointwise_eigenvalues") queue = u.get_queue(ctx_factory) @@ -137,7 +153,9 @@ def test_pointwise_eigenvalues_ideal_gas(ctx_factory, data): u.compare_arrays(lam_dev.get(), data.lam_pointwise) -def test_roe_uniform_grid_ideal_gas(ctx_factory, data): +def test_roe_uniform_grid_ideal_gas(ctx_factory, flux_test_data_fixture): + data = flux_test_data_fixture + def identity_matrix(n): return np.identity(n).astype(np.float32).copy(order="F")