From 90e00355b2ea60a011aa5e4e5470b28bba6e07b6 Mon Sep 17 00:00:00 2001 From: "Timothy A. Smith" Date: Tue, 28 May 2019 23:13:12 -0500 Subject: [PATCH] update references to fixtures in benchmark.py --- benchmark.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/benchmark.py b/benchmark.py index 266d998..00034a7 100644 --- a/benchmark.py +++ b/benchmark.py @@ -14,14 +14,18 @@ from pyopencl.tools import ( # noqa pytest_generate_tests_for_pyopencl as pytest_generate_tests) -import fixtures +import device_fixtures as device +import program_fixtures as program +import transform_fixtures as transform +import setup_fixtures as setup def benchmark_compute_flux_derivatives_gpu(ctx_factory): logging.basicConfig(level="INFO") - prg = fixtures.get_gpu_transformed_weno() + prg = program.get_weno() + prg = transform.weno_for_gpu(prg) - queue = fixtures.get_queue(ctx_factory) + queue = device.get_queue(ctx_factory) ndim = 3 nvars = 5 @@ -31,10 +35,10 @@ def benchmark_compute_flux_derivatives_gpu(ctx_factory): nz = n print("ARRAY GEN") - states = fixtures.f_array(queue, nvars, nx+6, ny+6, nz+6) - fluxes = fixtures.f_array(queue, nvars, ndim, nx+6, ny+6, nz+6) - metrics = fixtures.f_array(queue, ndim, ndim, nx+6, ny+6, nz+6) - metric_jacobians = fixtures.f_array(queue, nx+6, ny+6, nz+6) + states = setup.random_array_on_device(queue, nvars, nx+6, ny+6, nz+6) + fluxes = setup.random_array_on_device(queue, nvars, ndim, nx+6, ny+6, nz+6) + metrics = setup.random_array_on_device(queue, ndim, ndim, nx+6, ny+6, nz+6) + metric_jacobians = setup.random_array_on_device(queue, nx+6, ny+6, nz+6) print("END ARRAY GEN") flux_derivatives_dev = cl.array.empty(queue, (nvars, ndim, nx+6, ny+6, -- GitLab