diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea9808021e322e6e649059fb7dd3344d437603e5..173861e7b86df57272c602c6a1459cb076ba78c5 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 3664a4552b3ae5c6c0f493c9149532dda5e7ed56..7c0601cb2bf81ce546a590c71a8ea43fb87f9004 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 8d60a1f0a9b0694d8d5f62ffd1a21c4dc60ac3e1..16e053730d0b14a6374f60d48cb28c4a9308d598 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 diff --git a/test/test_layer_pot_eigenvalues.py b/test/test_layer_pot_eigenvalues.py index b10a9076dd046e8dfdd35fb9e2909bf2e32d9653..c5f927c2880892786f3077ce8654ca16a6c8bd76 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)