From 20a6d74260a9061f0e14461697593983a68482f4 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Wed, 6 Sep 2017 17:31:13 -0500 Subject: [PATCH 1/4] Fix SymEngine channel. Also remove SUMPY_NO_CACHE=1 in the Conda build. --- .gitlab-ci.yml | 2 +- .test-conda-env-py3.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d98c18b..94898a58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ Python 3.6 POCL: Python 3.5 Conda: script: - - export SUMPY_NO_CACHE=1 + - export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - REQUIREMENTS_TXT=.test-conda-env-py3-requirements.txt - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 0ffd2f22..f68cdb19 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -12,5 +12,6 @@ dependencies: - islpy - pyopencl - python=3.5 -- python-symengine=0.3.0 +- symengine::symengine=0.3.0 +- symengine::python-symengine=0.3.0 # things not in here: loopy boxtree pymbolic pyfmmlib meshmode sumpy -- GitLab From 1ce2dcb44502707367ea15aec6f476d484a6dd5e Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Wed, 6 Sep 2017 17:39:55 -0500 Subject: [PATCH 2/4] Don't allow Conda failure. --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94898a58..956ebb97 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,6 @@ Python 3.5 Conda: - REQUIREMENTS_TXT=.test-conda-env-py3-requirements.txt - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh - ". ./build-and-test-py-project-within-miniconda.sh" - allow_failure: true # takes very long tags: - linux except: -- GitLab From 7767ef68b7e361c50efd5b0ec5d6103abb6e7a3a Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Thu, 7 Sep 2017 14:01:54 -0500 Subject: [PATCH 3/4] Remove symengine channel now that everything is in conda-forge. --- .test-conda-env-py3.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index f68cdb19..75ea05f3 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -1,7 +1,6 @@ name: test-conda-env-py3 channels: - inducer -- symengine - conda-forge - defaults dependencies: @@ -12,6 +11,6 @@ dependencies: - islpy - pyopencl - python=3.5 -- symengine::symengine=0.3.0 -- symengine::python-symengine=0.3.0 +- symengine=0.3.0 +- python-symengine=0.3.0 # things not in here: loopy boxtree pymbolic pyfmmlib meshmode sumpy -- GitLab From c607de07c7ec42ac8b93dcff3e1388840e0e7cdc Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Thu, 7 Sep 2017 15:43:44 -0500 Subject: [PATCH 4/4] Mark test_matrix_build as skipped under SymEngine. --- test/test_matrix.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/test_matrix.py b/test/test_matrix.py index cd70c0e3..f626a024 100644 --- a/test/test_matrix.py +++ b/test/test_matrix.py @@ -25,17 +25,20 @@ THE SOFTWARE. import numpy as np import numpy.linalg as la import pyopencl as cl +import pytest from meshmode.mesh.generation import ( # noqa ellipse, cloverleaf, starfish, drop, n_gon, qbx_peanut, make_curve_mesh) from pytential import bind, sym from functools import partial +from sumpy.symbolic import USE_SYMENGINE from pyopencl.tools import ( # noqa pytest_generate_tests_for_pyopencl as pytest_generate_tests) +@pytest.mark.skipif(USE_SYMENGINE, reason="line taylor in SymEngine is broken") def test_matrix_build(ctx_factory): cl_ctx = ctx_factory() queue = cl.CommandQueue(cl_ctx) -- GitLab