From c336e44b50ca01f793070467fb5ff7f52a96c121 Mon Sep 17 00:00:00 2001 From: "Timothy A. Smith" Date: Mon, 27 May 2019 10:27:14 -0500 Subject: [PATCH 1/4] mark slow and failing tests that we don't want to focus on right now --- test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test.py b/test.py index 2446f40..f79d1ab 100644 --- a/test.py +++ b/test.py @@ -27,6 +27,7 @@ def test_matvec(ctx_factory): assert la.norm(a@b - c, 2)/la.norm(c) < 1e-5 +@pytest.mark.skip("slow") def test_compute_flux_derivatives(ctx_factory): logging.basicConfig(level="INFO") @@ -92,6 +93,7 @@ def get_gpu_transformed_weno(): return prg +@pytest.mark.xfail def test_compute_flux_derivatives_gpu(ctx_factory): logging.basicConfig(level="INFO") -- GitLab From 4cbf84d843334d11b8ba5dbc6bd52967d7d62b09 Mon Sep 17 00:00:00 2001 From: "Timothy A. Smith" Date: Mon, 27 May 2019 10:29:26 -0500 Subject: [PATCH 2/4] use skip instead of xfail so test doesn't actually run, and add pytest import --- test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test.py b/test.py index f79d1ab..26fec70 100644 --- a/test.py +++ b/test.py @@ -8,6 +8,7 @@ import sys import logging +import pytest from pyopencl.tools import ( # noqa pytest_generate_tests_for_pyopencl as pytest_generate_tests) @@ -93,7 +94,7 @@ def get_gpu_transformed_weno(): return prg -@pytest.mark.xfail +@pytest.mark.skip("fails") def test_compute_flux_derivatives_gpu(ctx_factory): logging.basicConfig(level="INFO") -- GitLab From 72a5560b18f694eda3c22de8530a3a53f131a5bf Mon Sep 17 00:00:00 2001 From: "Timothy A. Smith" Date: Mon, 27 May 2019 10:32:25 -0500 Subject: [PATCH 3/4] fix bug with uninitialized values in result of mult_mat_vec --- WENO.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WENO.F90 b/WENO.F90 index a6da580..e8618ef 100644 --- a/WENO.F90 +++ b/WENO.F90 @@ -913,7 +913,7 @@ subroutine mult_mat_vec(m, n, alpha, a, b, c) do j=1,n accumulator = accumulator + alpha*a(i,j)*b(j) end do - c(i) = c(i) + accumulator + c(i) = accumulator end do end subroutine -- GitLab From 7530d52d42d90bbb07b0125e929a72b8be3fcfee Mon Sep 17 00:00:00 2001 From: "Timothy A. Smith" Date: Mon, 27 May 2019 10:37:08 -0500 Subject: [PATCH 4/4] remove decorators from skipped tests --- test.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/test.py b/test.py index 26fec70..84ce34c 100644 --- a/test.py +++ b/test.py @@ -28,7 +28,6 @@ def test_matvec(ctx_factory): assert la.norm(a@b - c, 2)/la.norm(c) < 1e-5 -@pytest.mark.skip("slow") def test_compute_flux_derivatives(ctx_factory): logging.basicConfig(level="INFO") @@ -94,7 +93,6 @@ def get_gpu_transformed_weno(): return prg -@pytest.mark.skip("fails") def test_compute_flux_derivatives_gpu(ctx_factory): logging.basicConfig(level="INFO") -- GitLab