From 4d7c42a29baa8b7c5d74f7fb7121573875c94f6d Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sat, 25 Feb 2017 14:18:50 -0600 Subject: [PATCH 1/5] Add symengine test --- .gitlab-ci.yml | 12 ++++++++++++ .test-conda-env-py3-requirements.txt | 3 +++ .test-conda-env-py3.yml | 16 ++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 .test-conda-env-py3-requirements.txt create mode 100644 .test-conda-env-py3.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 906e8e4b..0c76bb83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,18 @@ Python 3.5 POCL: except: - tags +Python 3.5 Conda: + script: + - export SUMPY_NO_CACHE=1 + - 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 + - ". ./build-and-test-py-project-within-miniconda.sh" + tags: + - linux + except: + - tags + Documentation: script: - EXTRA_INSTALL="numpy mako" diff --git a/.test-conda-env-py3-requirements.txt b/.test-conda-env-py3-requirements.txt new file mode 100644 index 00000000..01f08662 --- /dev/null +++ b/.test-conda-env-py3-requirements.txt @@ -0,0 +1,3 @@ +git+https://github.com/inducer/boxtree +git+https://github.com/inducer/pymbolic +git+https://github.com/inducer/loopy diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml new file mode 100644 index 00000000..f336c9e9 --- /dev/null +++ b/.test-conda-env-py3.yml @@ -0,0 +1,16 @@ +name: test-conda-env-py3 +channels: +- inducer +- symengine/label/dev +- conda-forge +- defaults +dependencies: +- git +- conda-forge::numpy +- conda-forge::sympy +- pocl +- islpy +- pyopencl +- python=3.5 +- python-symengine=0.2.0.53.g83912b7=py35_1 +# things not in here: loopy boxtree pymbolic pyfmmlib -- GitLab From 64ffc55f18578943afa546957fa5ffdfc0c0cb36 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sat, 25 Feb 2017 14:58:12 -0600 Subject: [PATCH 2/5] Add missing deps to Conda test --- .test-conda-env-py3-requirements.txt | 2 ++ .test-conda-env-py3.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.test-conda-env-py3-requirements.txt b/.test-conda-env-py3-requirements.txt index 01f08662..7cefac68 100644 --- a/.test-conda-env-py3-requirements.txt +++ b/.test-conda-env-py3-requirements.txt @@ -1,3 +1,5 @@ git+https://github.com/inducer/boxtree git+https://github.com/inducer/pymbolic git+https://github.com/inducer/loopy +git+https://github.com/inducer/sumpy +git+https://github.com/inducer/meshmode diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index f336c9e9..88e2c3cf 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -13,4 +13,4 @@ dependencies: - pyopencl - python=3.5 - python-symengine=0.2.0.53.g83912b7=py35_1 -# things not in here: loopy boxtree pymbolic pyfmmlib +# things not in here: loopy boxtree pymbolic pyfmmlib meshmode sumpy -- GitLab From 5af437949df10f5248ff4c1baebbe442dcbe8a66 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sat, 25 Feb 2017 18:52:27 -0600 Subject: [PATCH 3/5] Fix requirements.txt to point at sumpy symengine branch --- requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0c3cc71e..e50b396c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,6 @@ git+git://github.com/inducer/islpy git+git://github.com/inducer/loopy git+git://github.com/inducer/boxtree git+git://github.com/inducer/meshmode -git+git://github.com/inducer/sumpy + +# FIXME: Point back at sumpy master before merging +git+git://github.com/inducer/sumpy@revert-41712001 -- GitLab From 87e40c207a9b263840344d48a64b0e49c1f45740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Thu, 25 May 2017 14:39:01 -0400 Subject: [PATCH 4/5] Update .test-conda-env-py3.yml --- .test-conda-env-py3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 88e2c3cf..c098bd19 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -8,7 +8,7 @@ dependencies: - git - conda-forge::numpy - conda-forge::sympy -- pocl +- pocl=0.13 - islpy - pyopencl - python=3.5 -- GitLab From e789eb801e39237ca14091d35e37a5d02f94ee8b Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Fri, 26 May 2017 15:07:09 -0700 Subject: [PATCH 5/5] Point requirements.txt back at sumpy master --- requirements.txt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index e50b396c..b8bf37d2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,10 @@ numpy git+git://github.com/inducer/pymbolic sympy==1.0 -git+git://github.com/inducer/modepy -git+git://github.com/pyopencl/pyopencl -git+git://github.com/inducer/islpy -git+git://github.com/inducer/loopy -git+git://github.com/inducer/boxtree -git+git://github.com/inducer/meshmode - -# FIXME: Point back at sumpy master before merging -git+git://github.com/inducer/sumpy@revert-41712001 +git+https://github.com/inducer/modepy +git+https://github.com/pyopencl/pyopencl +git+https://github.com/inducer/islpy +git+https://github.com/inducer/loopy +git+https://github.com/inducer/boxtree +git+https://github.com/inducer/meshmode +git+https://github.com/inducer/sumpy -- GitLab