diff --git a/fixtures.py b/fixtures.py index e28fa7da9a35ca058c6ee6847ee97cc4d8912fb9..d11810c0ca5f3c6c532624cb0f207c6a9a06b99f 100644 --- a/fixtures.py +++ b/fixtures.py @@ -92,9 +92,6 @@ def f_array(queue, *shape): ary = np.random.random_sample(shape).astype(np.float32).copy(order="F") return cl.array.to_device(queue, ary) -def random_array(*args): - return np.random.random_sample(args).astype(np.float32).copy(order="F") - def mult_mat_vec(ctx_factory, alpha, a, b): queue = get_queue(ctx_factory) diff --git a/setup_fixtures.py b/setup_fixtures.py new file mode 100644 index 0000000000000000000000000000000000000000..5a36bd8fc42d712e907b62f28cefc72612f34330 --- /dev/null +++ b/setup_fixtures.py @@ -0,0 +1,5 @@ +import numpy as np + + +def random_array(*shape): + return np.random.random_sample(shape).astype(np.float32).copy(order="F") diff --git a/test.py b/test.py index 198cf24a7ba54c24fb01691910b19403f6dff08d..7a8d40620a7b3e3c8e5cca2789875e8873d09e91 100644 --- a/test.py +++ b/test.py @@ -16,17 +16,18 @@ from pyopencl.tools import ( # noqa import fixtures import comparison_fixtures as compare +import setup_fixtures as setup def test_matvec(ctx_factory): - a = fixtures.random_array(10, 10) - b = fixtures.random_array(10) + a = setup.random_array(10, 10) + b = setup.random_array(10) c = fixtures.mult_mat_vec(ctx_factory, a=a, b=b, alpha=1.0) compare.arrays(a@b, c) -@pytest.mark.skip("slow") +#@pytest.mark.skip("slow") def test_compute_flux_derivatives(ctx_factory): logging.basicConfig(level="INFO") @@ -36,10 +37,10 @@ def test_compute_flux_derivatives(ctx_factory): ny = 10 nz = 10 - states = fixtures.random_array(nvars, nx+6, ny+6, nz+6) - fluxes = fixtures.random_array(nvars, ndim, nx+6, ny+6, nz+6) - metrics = fixtures.random_array(ndim, ndim, nx+6, ny+6, nz+6) - metric_jacobians = fixtures.random_array(nx+6, ny+6, nz+6) + states = setup.random_array(nvars, nx+6, ny+6, nz+6) + fluxes = setup.random_array(nvars, ndim, nx+6, ny+6, nz+6) + metrics = setup.random_array(ndim, ndim, nx+6, ny+6, nz+6) + metric_jacobians = setup.random_array(nx+6, ny+6, nz+6) fixtures.compute_flux_derivatives(ctx_factory, nvars=nvars, ndim=ndim, nx=nx, ny=ny, nz=nz,