From f6e09fc58073766c96e9d07baea568948c075850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 18 Aug 2019 16:35:09 +0200 Subject: [PATCH 1/4] Aktualisieren .gitlab-ci.yml --- .gitlab-ci.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f331f0c..4f1e6568 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,8 @@ Python 2.7 POCL: script: - export PY_EXE=python2.7 - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 numpy mako mpi4py" + - export EXTRA_INSTALL="pybind11 cython numpy mako mpi4py" + # cython is here because pytential (for now, for TS) depends on it - 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: @@ -19,7 +20,8 @@ Python 3 Nvidia K40: script: - export PY_EXE=python3 - export PYOPENCL_TEST=nvi:k40 - - export EXTRA_INSTALL="pybind11 numpy mako" + - export EXTRA_INSTALL="pybind11 cython numpy mako" + # cython is here because pytential (for now, for TS) depends on it - 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: @@ -35,7 +37,8 @@ Python 3 POCL: script: - export PY_EXE=python3 - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 numpy mako mpi4py" + # cython is here because pytential (for now, for TS) depends on it + - export EXTRA_INSTALL="pybind11 cython numpy mako mpi4py" - 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: @@ -52,7 +55,8 @@ Python 3 POCL: script: - export PY_EXE=python3 - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 numpy mako mpi4py" + # cython is here because pytential (for now, for TS) depends on it + - export EXTRA_INSTALL="pybind11 cython numpy mako mpi4py" - 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: -- GitLab From 8add4b0e47674672cd09208760b66ced73358fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 18 Aug 2019 16:43:59 +0200 Subject: [PATCH 2/4] Install pymbolic from git during CI for pytential's benefit --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 86f8d11b..7eb6638a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ git+https://gitlab.tiker.net/inducer/islpy.git git+https://gitlab.tiker.net/inducer/loopy.git # required by pytential, which is in turn needed for some tests +git+https://gitlab.tiker.net/inducer/pymbolic.git git+https://gitlab.tiker.net/inducer/boxtree.git git+https://gitlab.tiker.net/inducer/sumpy.git git+https://gitlab.tiker.net/inducer/pytential.git -- GitLab From 6620dd907355ed0cd133d2d91635cf1bc885887d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 18 Aug 2019 16:54:29 +0200 Subject: [PATCH 3/4] Fix ordering of pymbolic in requirements.txt --- requirements.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7eb6638a..cc4868ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ git+https://gitlab.tiker.net/inducer/gmsh_interop.git git+https://gitlab.tiker.net/inducer/modepy.git git+https://gitlab.tiker.net/inducer/pyopencl.git git+https://gitlab.tiker.net/inducer/islpy.git -git+https://gitlab.tiker.net/inducer/loopy.git + # required by pytential, which is in turn needed for some tests git+https://gitlab.tiker.net/inducer/pymbolic.git @@ -11,5 +11,8 @@ git+https://gitlab.tiker.net/inducer/boxtree.git git+https://gitlab.tiker.net/inducer/sumpy.git git+https://gitlab.tiker.net/inducer/pytential.git +# also depends on pymbolic, so should come after it +git+https://gitlab.tiker.net/inducer/loopy.git + # requires pymetis for tests for partition_mesh git+https://gitlab.tiker.net/inducer/pymetis.git -- GitLab From 54e3d8e75dad62ef56540f0b2ba32eca92df5b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Mon, 19 Aug 2019 18:55:14 +0200 Subject: [PATCH 4/4] More fiddling with package order in requirements.txt --- requirements.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index cc4868ba..62920342 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,12 +7,14 @@ git+https://gitlab.tiker.net/inducer/islpy.git # required by pytential, which is in turn needed for some tests git+https://gitlab.tiker.net/inducer/pymbolic.git -git+https://gitlab.tiker.net/inducer/boxtree.git -git+https://gitlab.tiker.net/inducer/sumpy.git -git+https://gitlab.tiker.net/inducer/pytential.git # also depends on pymbolic, so should come after it git+https://gitlab.tiker.net/inducer/loopy.git +# more pytential dependencies +git+https://gitlab.tiker.net/inducer/boxtree.git +git+https://gitlab.tiker.net/inducer/sumpy.git +git+https://gitlab.tiker.net/inducer/pytential.git + # requires pymetis for tests for partition_mesh git+https://gitlab.tiker.net/inducer/pymetis.git -- GitLab