From fdb674778f5113e83c61b28462826cf93c33a72d Mon Sep 17 00:00:00 2001 From: "[6~" Date: Tue, 12 May 2020 09:22:26 -0500 Subject: [PATCH 1/4] Test examples during CI --- .gitlab-ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0331f1b..6287eafa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,6 +69,21 @@ Python 3 POCL: reports: junit: test/pytest.xml +Python 3 POCL Examples: + script: + - test -n "$SKIP_EXAMPLES" && exit + - export PY_EXE=python3 + - export PYOPENCL_TEST=portable:pthread + - export EXTRA_INSTALL="pybind11 numpy mako" + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-and-run-examples.sh + - ". ./build-py-project-and-run-examples.sh" + tags: + - python3 + - pocl + - large-node + except: + - tags + Documentation: script: - EXTRA_INSTALL="pybind11 cython numpy" -- GitLab From de411b4df80774ececfa1ef9d5ca3b27015eb400 Mon Sep 17 00:00:00 2001 From: "[6~" Date: Tue, 12 May 2020 09:26:15 -0500 Subject: [PATCH 2/4] Also install cython for exmaples, because it's in requirements.txt --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6287eafa..c61896cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,7 +74,8 @@ Python 3 POCL Examples: - test -n "$SKIP_EXAMPLES" && exit - export PY_EXE=python3 - export PYOPENCL_TEST=portable:pthread - - export EXTRA_INSTALL="pybind11 numpy mako" + # cython is here because pytential (for now, for TS) depends on it + - export EXTRA_INSTALL="pybind11 cython numpy mako" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-and-run-examples.sh - ". ./build-py-project-and-run-examples.sh" tags: -- GitLab From ff075bab10c707bae05c082ff69ba1ed7e3163f6 Mon Sep 17 00:00:00 2001 From: "[6~" Date: Tue, 12 May 2020 09:57:25 -0500 Subject: [PATCH 3/4] Install pyvisfile for examples CI --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c61896cb..a6698cee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,7 +75,7 @@ Python 3 POCL Examples: - export PY_EXE=python3 - export PYOPENCL_TEST=portable:pthread # cython is here because pytential (for now, for TS) depends on it - - export EXTRA_INSTALL="pybind11 cython numpy mako" + - export EXTRA_INSTALL="pybind11 cython numpy mako pyvisfile" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-and-run-examples.sh - ". ./build-py-project-and-run-examples.sh" tags: -- GitLab From 4df8e4d5cbea2c6f82a3efa5148231fd51fb6fef Mon Sep 17 00:00:00 2001 From: "[6~" Date: Tue, 12 May 2020 10:10:03 -0500 Subject: [PATCH 4/4] Install matplotlib for examples CI --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6698cee..36093e8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,7 +75,7 @@ Python 3 POCL Examples: - export PY_EXE=python3 - export PYOPENCL_TEST=portable:pthread # cython is here because pytential (for now, for TS) depends on it - - export EXTRA_INSTALL="pybind11 cython numpy mako pyvisfile" + - export EXTRA_INSTALL="pybind11 cython numpy mako pyvisfile matplotlib" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-and-run-examples.sh - ". ./build-py-project-and-run-examples.sh" tags: -- GitLab