From 8398d1bcc4fb44a9c918e6407bf8ac3a5191dd98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 24 Jun 2018 14:24:29 -0400 Subject: [PATCH 1/7] Test with py3.6 --- .gitlab-ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 835e97b9..3431f4e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ Python 3.6 Intel CPU: except: - tags -Python 3.5 AMD CPU: +Python 3.6 AMD CPU: script: - export PY_EXE=python3.5 - export PYOPENCL_TEST=amd:pu @@ -37,7 +37,7 @@ Python 3.5 AMD CPU: - ". ./build-and-test-py-project.sh" allow_failure: true tags: - - python3.5 + - python3.6 - amd-cl-cpu except: - tags @@ -56,7 +56,7 @@ Python 2.6 AMD CPU: except: - tags -Python 3.5 Titan X: +Python 3.6 Titan X: script: - export PY_EXE=python3.5 - export PYOPENCL_TEST=nvi:titan @@ -64,34 +64,34 @@ Python 3.5 Titan X: - 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.5 + - python3.6 - nvidia-titan-x except: - tags -Python 3.5 K40: +Python 3.6 K40: script: - - export PY_EXE=python3.5 + - export PY_EXE=python3.6 - export PYOPENCL_TEST=nvi:k40 - export EXTRA_INSTALL="numpy mako" - 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.5 + - python3.6m - nvidia-k40 except: - tags -Python 3.5 AMD GPU: +Python 3.6 AMD GPU: script: - - export PY_EXE=python3.5 + - export PY_EXE=python3.6 - export PYOPENCL_TEST=amd:fiji - export EXTRA_INSTALL="numpy mako" - 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" allow_failure: true tags: - - python3.5 + - python3.6 - amd-fiji except: - tags @@ -109,7 +109,7 @@ Python 3.6 POCL: except: - tags -Python 3.5 POCL CL 1.1: +Python 3.6 POCL CL 1.1: script: - export PY_EXE=python3.5 - export PYOPENCL_TEST=portable @@ -118,7 +118,7 @@ Python 3.5 POCL CL 1.1: - echo "CL_PRETEND_VERSION = '1.1'" > siteconf.py - ". ./build-and-test-py-project.sh" tags: - - python3.5 + - python3.6 - pocl except: - tags @@ -150,7 +150,7 @@ Python 2.7 Apple: except: - tags -Python 3.5 Conda Apple: +Python 3.6 Conda Apple: script: - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh -- GitLab From 1084f0055c9f6fe148f2e2e3520411d36b93e4ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 24 Jun 2018 14:26:01 -0400 Subject: [PATCH 2/7] Try using conda default numpy instead of conda-forge numpy --- .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 b7a4c0cd..07c2b991 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -5,7 +5,7 @@ channels: - defaults dependencies: - git -- conda-forge::numpy +- numpy - pocl - osx-pocl-opencl - mako -- GitLab From e9bfcc59fb54af2e2fa3b332ec62116321814379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 24 Jun 2018 14:47:20 -0400 Subject: [PATCH 3/7] Revert to using conda-forge's numpy --- .test-conda-env-py3.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 07c2b991..4116e113 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -1,11 +1,10 @@ name: test-conda-env-py3 channels: -- inducer - conda-forge - defaults dependencies: - git -- numpy +- conda-forge::numpy - pocl - osx-pocl-opencl - mako -- GitLab From 2ec0fe102a08bfa5e0faf1d1c736794580bcdfcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 24 Jun 2018 21:46:43 -0400 Subject: [PATCH 4/7] Fix K40 CI tag typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3431f4e1..0b082979 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,7 +77,7 @@ Python 3.6 K40: - 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.6m + - python3.6 - nvidia-k40 except: - tags -- GitLab From 7ac5af28dee2e49ba5166b5871993e1fa0df3060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Mon, 25 Jun 2018 12:17:43 -0400 Subject: [PATCH 5/7] Use https://repo.continuum.io/pkgs/main channel instead of defaults as suggested by @mattwala --- .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 4116e113..4c0b81ef 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -1,7 +1,7 @@ name: test-conda-env-py3 channels: - conda-forge -- defaults +- https://repo.continuum.io/pkgs/main dependencies: - git - conda-forge::numpy -- GitLab From d5641231a0761c170f7ef9921979a2a66e291914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Mon, 25 Jun 2018 12:45:27 -0400 Subject: [PATCH 6/7] Rename conda CI job to match reality (We're not prescribing a Python version) --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b082979..d361470f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -150,7 +150,7 @@ Python 2.7 Apple: except: - tags -Python 3.6 Conda Apple: +Python 3 Conda Apple: script: - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh -- GitLab From 86d7d86122eabcfb991c1fcedda2bb4ffa807d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Mon, 25 Jun 2018 12:46:02 -0400 Subject: [PATCH 7/7] Add note to conda env spec about Conda Apple workaround --- .test-conda-env-py3.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 4c0b81ef..97b75b47 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -1,7 +1,13 @@ name: test-conda-env-py3 channels: - conda-forge + +# FIXME: revert to 'defaults' (without quotes) after +# https://github.com/ContinuumIO/anaconda-issues/issues/9663 +# is addressed. Context: +# https://gitlab.tiker.net/inducer/pyopencl/merge_requests/37 - https://repo.continuum.io/pkgs/main + dependencies: - git - conda-forge::numpy -- GitLab