From 3a48efcf4aba6aecf65d0658d1f76f00864af5b7 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Fri, 24 Aug 2018 13:24:54 -0500 Subject: [PATCH 1/2] Re-enable test_sphere_eigenvalues() --- test/test_layer_pot_eigenvalues.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_layer_pot_eigenvalues.py b/test/test_layer_pot_eigenvalues.py index b10a9076..c5f927c2 100644 --- a/test/test_layer_pot_eigenvalues.py +++ b/test/test_layer_pot_eigenvalues.py @@ -252,7 +252,7 @@ def test_ellipse_eigenvalues(ctx_getter, ellipse_aspect, mode_nr, qbx_order, "sumpy", "fmmlib", ]) -def no_test_sphere_eigenvalues(ctx_getter, mode_m, mode_n, qbx_order, +def test_sphere_eigenvalues(ctx_getter, mode_m, mode_n, qbx_order, fmm_backend): logging.basicConfig(level=logging.INFO) -- GitLab From e337e88756ff5cc94f7c0c5019b7c6535be6f580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 24 Aug 2018 14:58:16 -0400 Subject: [PATCH 2/2] Install scipy to make sphere eigenvalue test run --- .gitlab-ci.yml | 6 +++--- .test-conda-env-py3-macos.yml | 1 + .test-conda-env-py3.yml | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea980802..173861e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ Python 3.5 POCL: script: - export PY_EXE=python3.5 - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 numpy mako" + - export EXTRA_INSTALL="pybind11 numpy scipy mako" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: @@ -16,7 +16,7 @@ Python 3.6 POCL: script: - export PY_EXE=python3.6 - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 numpy mako" + - export EXTRA_INSTALL="pybind11 numpy scipy mako" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: @@ -57,7 +57,7 @@ Python 2.7 POCL: script: - export PY_EXE=python2.7 - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 numpy mako" + - export EXTRA_INSTALL="pybind11 scipy numpy mako" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: diff --git a/.test-conda-env-py3-macos.yml b/.test-conda-env-py3-macos.yml index 3664a455..7c0601cb 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -6,6 +6,7 @@ dependencies: - git - conda-forge::numpy - conda-forge::sympy +- scipy - pocl=1.0 - islpy - pyopencl diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 8d60a1f0..16e05373 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -4,6 +4,7 @@ channels: - defaults dependencies: - git +- scipy - conda-forge::numpy - conda-forge::sympy - pocl=1.0 -- GitLab