diff --git a/fixtures.py b/fixtures.py index d11810c0ca5f3c6c532624cb0f207c6a9a06b99f..10d0f453bfc2b7ff869dcfa34c67f955a2d1ed4b 100644 --- a/fixtures.py +++ b/fixtures.py @@ -92,16 +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 mult_mat_vec(ctx_factory, alpha, a, b): - queue = get_queue(ctx_factory) - - c_dev = cl.array.empty(queue, 10, dtype=np.float32) - - prg = with_root_kernel(get_weno_program(), "mult_mat_vec") - prg(queue, a=a, b=b, c=c_dev, alpha=alpha) - - return c_dev.get() - def compute_flux_derivatives(ctx_factory, nvars, ndim, nx, ny, nz, states, fluxes, metrics, metric_jacobians): diff --git a/kernel_fixtures.py b/kernel_fixtures.py new file mode 100644 index 0000000000000000000000000000000000000000..d480a5d960088d7e086943992d35f8aeeb1c8dfe --- /dev/null +++ b/kernel_fixtures.py @@ -0,0 +1,15 @@ +import numpy as np +import pyopencl as cl + +import fixtures + +def mult_mat_vec(ctx_factory, alpha, a, b): + queue = fixtures.get_queue(ctx_factory) + + c_dev = cl.array.empty(queue, 10, dtype=np.float32) + + prg = fixtures.with_root_kernel(fixtures.get_weno_program(), "mult_mat_vec") + prg(queue, a=a, b=b, c=c_dev, alpha=alpha) + + return c_dev.get() + diff --git a/test.py b/test.py index 7a8d40620a7b3e3c8e5cca2789875e8873d09e91..555e9539277e2276820efa507c0fb6803de8dcce 100644 --- a/test.py +++ b/test.py @@ -17,17 +17,19 @@ from pyopencl.tools import ( # noqa import fixtures import comparison_fixtures as compare import setup_fixtures as setup +import kernel_fixtures as kernel + def test_matvec(ctx_factory): 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) + c = kernel.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")