From 978d22d9bd35fe76f73b340744f14ffb4e0adac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Mon, 12 Oct 2020 08:23:21 +0200 Subject: [PATCH 1/2] Reinstate Gitlab Titan V CI --- .gitlab-ci.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e4968466..2b7447b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,23 +17,22 @@ Python 3 POCL: reports: junit: test/pytest.xml -# https://github.com/illinois-scicomp/machine-shop-maintenance/issues/4 -# Python 3 Nvidia Titan V: -# script: -# - export PY_EXE=python3 -# - export PYOPENCL_TEST=nvi:titan -# - 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: -# - python3 -# - nvidia-titan-v -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml +Python 3 Nvidia Titan V: + script: + - export PY_EXE=python3 + - export PYOPENCL_TEST=nvi:titan + - 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: + - python3 + - nvidia-titan-v + except: + - tags + artifacts: + reports: + junit: test/pytest.xml Python 3 POCL Examples: script: -- GitLab From 8ca10d5e9deaa2f025c7b983a7f674a8b1aca954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Mon, 12 Oct 2020 16:04:42 +0200 Subject: [PATCH 2/2] Fix Titan V Gitlab CI job to allow Nodal DG interop to run --- .gitlab-ci.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b7447b4..f63196cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,13 +18,14 @@ Python 3 POCL: junit: test/pytest.xml Python 3 Nvidia Titan V: - script: - - export PY_EXE=python3 - - export PYOPENCL_TEST=nvi:titan - - 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" + script: | + export PY_EXE=python3 + export PYOPENCL_TEST=nvi:titan + export EXTRA_INSTALL="pybind11 cython numpy mako oct2py" + (cd test; git clone https://github.com/tcew/nodal-dg) + # 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: - python3 - nvidia-titan-v -- GitLab