From 6fd835976b4e4e6202fff0762f4fe4492d31fba6 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sat, 14 Jul 2018 17:56:20 -0500 Subject: [PATCH 1/3] Remove pytest.importorskip('pyfmmlib') in tests --- test/test_layer_pot.py | 2 -- test/test_layer_pot_eigenvalues.py | 3 --- test/test_layer_pot_identity.py | 3 --- test/test_maxwell.py | 2 -- test/test_scalar_int_eq.py | 5 +---- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/test/test_layer_pot.py b/test/test_layer_pot.py index 66445fee..b4f4a02f 100644 --- a/test/test_layer_pot.py +++ b/test/test_layer_pot.py @@ -392,8 +392,6 @@ def test_perf_data_gathering(ctx_getter, n_arms=5): def test_3d_jump_relations(ctx_factory, relation, visualize=False): # logging.basicConfig(level=logging.INFO) - pytest.importorskip("pyfmmlib") - cl_ctx = ctx_factory() queue = cl.CommandQueue(cl_ctx) diff --git a/test/test_layer_pot_eigenvalues.py b/test/test_layer_pot_eigenvalues.py index b8c9c9fd..cdda0a3c 100644 --- a/test/test_layer_pot_eigenvalues.py +++ b/test/test_layer_pot_eigenvalues.py @@ -258,9 +258,6 @@ def no_test_sphere_eigenvalues(ctx_getter, mode_m, mode_n, qbx_order, special = pytest.importorskip("scipy.special") - if fmm_backend == "fmmlib": - pytest.importorskip("pyfmmlib") - cl_ctx = ctx_getter() queue = cl.CommandQueue(cl_ctx) diff --git a/test/test_layer_pot_identity.py b/test/test_layer_pot_identity.py index 942b6ed2..c376fdf3 100644 --- a/test/test_layer_pot_identity.py +++ b/test/test_layer_pot_identity.py @@ -240,9 +240,6 @@ class DynamicTestCase(object): and self.expr.zero_op_name == "green_grad"): pytest.skip("does not achieve sufficient precision") - if self.fmm_backend == "fmmlib": - pytest.importorskip("pyfmmlib") - # {{{ integral identity tester diff --git a/test/test_maxwell.py b/test/test_maxwell.py index 914312e9..fa9383f4 100644 --- a/test/test_maxwell.py +++ b/test/test_maxwell.py @@ -228,8 +228,6 @@ def test_pec_mfie_extinction(ctx_getter, case, visualize=False): cl_ctx = ctx_getter() queue = cl.CommandQueue(cl_ctx) - pytest.importorskip("pyfmmlib") - np.random.seed(12) knl_kwargs = {"k": case.k} diff --git a/test/test_scalar_int_eq.py b/test/test_scalar_int_eq.py index 22d99cab..5f8d3bc2 100644 --- a/test/test_scalar_int_eq.py +++ b/test/test_scalar_int_eq.py @@ -871,10 +871,7 @@ def test_integral_equation(ctx_getter, case, visualize=False): cl_ctx = ctx_getter() queue = cl.CommandQueue(cl_ctx) - if case.fmm_backend == "fmmlib": - pytest.importorskip("pyfmmlib") - - if USE_SYMENGINE and case.fmm_backend is None: + if USE_SYMENGINE and case.fmm_backend == "sumpy": pytest.skip("https://gitlab.tiker.net/inducer/sumpy/issues/25") # prevent cache 'splosion -- GitLab From cfd16d49e1517c104442b39c12d2f9e7ff6af113 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sat, 14 Jul 2018 22:20:21 -0500 Subject: [PATCH 2/3] Fix fmm_backend comparison --- test/test_scalar_int_eq.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_scalar_int_eq.py b/test/test_scalar_int_eq.py index 5f8d3bc2..8830e84b 100644 --- a/test/test_scalar_int_eq.py +++ b/test/test_scalar_int_eq.py @@ -871,7 +871,7 @@ def test_integral_equation(ctx_getter, case, visualize=False): cl_ctx = ctx_getter() queue = cl.CommandQueue(cl_ctx) - if USE_SYMENGINE and case.fmm_backend == "sumpy": + if USE_SYMENGINE and case.fmm_backend is None: pytest.skip("https://gitlab.tiker.net/inducer/sumpy/issues/25") # prevent cache 'splosion -- GitLab From 30db5d03415f6556bb90eaa610fc561c9487cfab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Thu, 19 Jul 2018 09:37:58 -0400 Subject: [PATCH 3/3] Add pyfmmlib as a hard dependency --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index f9ce7403..0c13014d 100644 --- a/setup.py +++ b/setup.py @@ -105,6 +105,7 @@ setup(name="pytential", "loo.py>=2017.2", "sumpy>=2013.1", "cgen>=2013.1.2", + "pyfmmlib>=2018.1", "six", ]) -- GitLab