From e04a25208112fd851d8fc3d78cd1dcf1ded5caa6 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Wed, 23 Jan 2019 14:44:26 -0600 Subject: [PATCH 01/20] Add Pylint CI job --- .gitlab-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 316f5513..5b45716a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -253,6 +253,17 @@ PyPy POCL: reports: junit: test/pytest.xml +Pylint: + script: + - EXTRA_INSTALL="pybind11 numpy mako" + - py_version=3.6 + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh + - ". ./prepare-and-run-pylint.sh pymbolic test/test_*.py" + tags: + - python3.6 + except: + - tags + Documentation: script: - EXTRA_INSTALL="pybind11 numpy mako" -- GitLab From a5793be9c6e070709dee2193bf7674867c1347c7 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Wed, 23 Jan 2019 16:53:04 -0600 Subject: [PATCH 02/20] Fix pylint job, temporarily disable long running jobs --- .gitlab-ci.yml | 512 ++++++++++++++++++++++++------------------------- 1 file changed, 256 insertions(+), 256 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b45716a..3d622b7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,264 +1,264 @@ -"Python 2.7 AMD CPU": - script: - - export PY_EXE=python2.7 - - export PYOPENCL_TEST=amd:pu - - export EXTRA_INSTALL="pybind11 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: - - python2.7 - - amd-cl-cpu - - opengl - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3.6 Intel CPU: - script: - - export PY_EXE=python3.6 - - export PYOPENCL_TEST="intel(r):pu" - - export EXTRA_INSTALL="pybind11 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.6 - - intel-cl-cpu - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3.6 AMD CPU: - script: - - export PY_EXE=python3.6 - - export PYOPENCL_TEST=amd:pu - - export EXTRA_INSTALL="pybind11 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.6 - - amd-cl-cpu - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3.6 Titan X: - script: - - export PY_EXE=python3.6 - - export PYOPENCL_TEST=nvi:titan - - export EXTRA_INSTALL="pybind11 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.6 - - nvidia-titan-x - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3.6 Titan V: - script: - - export PY_EXE=python3.6 - - export PYOPENCL_TEST=nvi:titan - - export EXTRA_INSTALL="pybind11 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.6 - - nvidia-titan-v - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3.6 K40: - script: - - export PY_EXE=python3.6 - - export PYOPENCL_TEST=nvi:k40 - - export EXTRA_INSTALL="pybind11 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.6 - - nvidia-k40 - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3.6 AMD GPU: - script: - - export PY_EXE=python3.6 - - export PYOPENCL_TEST=amd:fiji - - export EXTRA_INSTALL="pybind11 numpy mako" - - # https://andreask.cs.illinois.edu/MachineShop/UserNotes - - export OCL_ICD_VENDORS=/etc/OpenCLwithAMD/vendors - - - 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.6 - - amd-fiji - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 2.7 POCL: - script: - - export PY_EXE=python2.7 - - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 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: - - python2.7 - - pocl - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3.7 POCL: - script: - - export PY_EXE=python3.7 - - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 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.7 - - pocl - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3.6 POCL CL 1.1: - script: - - export PY_EXE=python3.6 - - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 numpy mako" - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - - echo "CL_PRETEND_VERSION = '1.1'" > siteconf.py - - ". ./build-and-test-py-project.sh" - tags: - - python3.6 - - pocl - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3.6 POCL: - script: - - export PY_EXE=python3.6 - - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 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.6 - - pocl - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3.6 POCL (+GL and special functions): - script: - - export PY_EXE=python3.6 - - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 numpy mako scipy pyfmmlib" - - echo "CL_ENABLE_GL = True" > siteconf.py - - 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.6 - - pocl - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 2.7 Apple: - script: - - export PY_EXE=python2.7 - - export PYOPENCL_TEST=app:cpu - - export EXTRA_INSTALL="pybind11 numpy mako" - - export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig - - 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: - - python2.7 - - apple - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3 Conda Apple: - script: - - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - - export CC=gcc - - 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: - - apple - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -PyPy POCL: - script: - - export PY_EXE=pypy - - export PYOPENCL_TEST=portable - - # https://github.com/pybind/pybind11/pull/1494 - - export EXTRA_INSTALL="git+https://github.com/inducer/pybind11 numpy mako" - - - export NO_DOCTESTS=1 - - 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: - - pypy - - pocl - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - +# "Python 2.7 AMD CPU": +# script: +# - export PY_EXE=python2.7 +# - export PYOPENCL_TEST=amd:pu +# - export EXTRA_INSTALL="pybind11 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: +# - python2.7 +# - amd-cl-cpu +# - opengl +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# Python 3.6 Intel CPU: +# script: +# - export PY_EXE=python3.6 +# - export PYOPENCL_TEST="intel(r):pu" +# - export EXTRA_INSTALL="pybind11 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.6 +# - intel-cl-cpu +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# Python 3.6 AMD CPU: +# script: +# - export PY_EXE=python3.6 +# - export PYOPENCL_TEST=amd:pu +# - export EXTRA_INSTALL="pybind11 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.6 +# - amd-cl-cpu +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# Python 3.6 Titan X: +# script: +# - export PY_EXE=python3.6 +# - export PYOPENCL_TEST=nvi:titan +# - export EXTRA_INSTALL="pybind11 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.6 +# - nvidia-titan-x +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# Python 3.6 Titan V: +# script: +# - export PY_EXE=python3.6 +# - export PYOPENCL_TEST=nvi:titan +# - export EXTRA_INSTALL="pybind11 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.6 +# - nvidia-titan-v +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# Python 3.6 K40: +# script: +# - export PY_EXE=python3.6 +# - export PYOPENCL_TEST=nvi:k40 +# - export EXTRA_INSTALL="pybind11 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.6 +# - nvidia-k40 +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# Python 3.6 AMD GPU: +# script: +# - export PY_EXE=python3.6 +# - export PYOPENCL_TEST=amd:fiji +# - export EXTRA_INSTALL="pybind11 numpy mako" +# +# # https://andreask.cs.illinois.edu/MachineShop/UserNotes +# - export OCL_ICD_VENDORS=/etc/OpenCLwithAMD/vendors +# +# - 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.6 +# - amd-fiji +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# Python 2.7 POCL: +# script: +# - export PY_EXE=python2.7 +# - export PYOPENCL_TEST=portable +# - export EXTRA_INSTALL="pybind11 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: +# - python2.7 +# - pocl +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# Python 3.7 POCL: +# script: +# - export PY_EXE=python3.7 +# - export PYOPENCL_TEST=portable +# - export EXTRA_INSTALL="pybind11 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.7 +# - pocl +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# Python 3.6 POCL CL 1.1: +# script: +# - export PY_EXE=python3.6 +# - export PYOPENCL_TEST=portable +# - export EXTRA_INSTALL="pybind11 numpy mako" +# - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh +# - echo "CL_PRETEND_VERSION = '1.1'" > siteconf.py +# - ". ./build-and-test-py-project.sh" +# tags: +# - python3.6 +# - pocl +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# Python 3.6 POCL: +# script: +# - export PY_EXE=python3.6 +# - export PYOPENCL_TEST=portable +# - export EXTRA_INSTALL="pybind11 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.6 +# - pocl +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# Python 3.6 POCL (+GL and special functions): +# script: +# - export PY_EXE=python3.6 +# - export PYOPENCL_TEST=portable +# - export EXTRA_INSTALL="pybind11 numpy mako scipy pyfmmlib" +# - echo "CL_ENABLE_GL = True" > siteconf.py +# - 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.6 +# - pocl +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# Python 2.7 Apple: +# script: +# - export PY_EXE=python2.7 +# - export PYOPENCL_TEST=app:cpu +# - export EXTRA_INSTALL="pybind11 numpy mako" +# - export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig +# - 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: +# - python2.7 +# - apple +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# Python 3 Conda Apple: +# script: +# - CONDA_ENVIRONMENT=.test-conda-env-py3.yml +# - export CC=gcc +# - 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: +# - apple +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# +# PyPy POCL: +# script: +# - export PY_EXE=pypy +# - export PYOPENCL_TEST=portable +# +# # https://github.com/pybind/pybind11/pull/1494 +# - export EXTRA_INSTALL="git+https://github.com/inducer/pybind11 numpy mako" +# +# - export NO_DOCTESTS=1 +# - 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: +# - pypy +# - pocl +# except: +# - tags +# artifacts: +# reports: +# junit: test/pytest.xml +# Pylint: script: - EXTRA_INSTALL="pybind11 numpy mako" - py_version=3.6 - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh - - ". ./prepare-and-run-pylint.sh pymbolic test/test_*.py" + - ". ./prepare-and-run-pylint.sh pyopencl test/test_*.py" tags: - python3.6 except: -- GitLab From cbd8790c4d1b7e161e5f7056f7e372238d790897 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Wed, 23 Jan 2019 20:28:41 -0600 Subject: [PATCH 03/20] Echo back commands --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d622b7b..f4c46c5a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -255,6 +255,7 @@ # Pylint: script: + - set -x - EXTRA_INSTALL="pybind11 numpy mako" - py_version=3.6 - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh -- GitLab From 5141ae25a5fa54bf9981256839fa4248ac1b8a60 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Thu, 24 Jan 2019 17:49:22 -0600 Subject: [PATCH 04/20] Revert "Echo back commands" This reverts commit cbd8790c4d1b7e161e5f7056f7e372238d790897. --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4c46c5a..3d622b7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -255,7 +255,6 @@ # Pylint: script: - - set -x - EXTRA_INSTALL="pybind11 numpy mako" - py_version=3.6 - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh -- GitLab From 0798683ef94a8aa4bb1f6b6adedab7422efdcf70 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Thu, 24 Jan 2019 17:54:57 -0600 Subject: [PATCH 05/20] Pylint CI: Use PROJECT_INSTALL_FLAGS to build in editable mode --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d622b7b..58c1ed2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -257,6 +257,10 @@ Pylint: script: - EXTRA_INSTALL="pybind11 numpy mako" - py_version=3.6 + - # After installation, PyOpenCL cannot be used from the source directory due + - # to package shadowing. To work around this, build in editable mode so there + - # is only one copy of everything. + - PROJECT_INSTALL_FLAGS="--editable" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh - ". ./prepare-and-run-pylint.sh pyopencl test/test_*.py" tags: -- GitLab From 43a9c385fdeb9cd80c83985c925072ed4ba35770 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Thu, 24 Jan 2019 17:57:45 -0600 Subject: [PATCH 06/20] Fix syntax --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58c1ed2e..71c43279 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -257,9 +257,9 @@ Pylint: script: - EXTRA_INSTALL="pybind11 numpy mako" - py_version=3.6 - - # After installation, PyOpenCL cannot be used from the source directory due - - # to package shadowing. To work around this, build in editable mode so there - - # is only one copy of everything. + # After installation, PyOpenCL cannot be used from the source directory due + # to package shadowing. To work around this, build in editable mode so there + # is only one copy of everything. - PROJECT_INSTALL_FLAGS="--editable" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh - ". ./prepare-and-run-pylint.sh pyopencl test/test_*.py" -- GitLab From e96e262c7e9c2f3648e6bea429bda72257ada17f Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Thu, 24 Jan 2019 18:05:10 -0600 Subject: [PATCH 07/20] Install matplotlib --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71c43279..9aeee7ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -255,7 +255,7 @@ # Pylint: script: - - EXTRA_INSTALL="pybind11 numpy mako" + - EXTRA_INSTALL="pybind11 numpy mako matplotlib" - py_version=3.6 # After installation, PyOpenCL cannot be used from the source directory due # to package shadowing. To work around this, build in editable mode so there -- GitLab From 9410435c326f6a39908e04a42ba2afc196415d5a Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Fri, 25 Jan 2019 22:51:23 -0600 Subject: [PATCH 08/20] Fix a few legitimate looking issues --- pyopencl/__init__.py | 4 +-- pyopencl/array.py | 5 ++- pyopencl/characterize/performance.py | 6 ++-- pyopencl/clrandom.py | 12 +++++++ pyopencl/elementwise.py | 50 ---------------------------- pyopencl/scan.py | 7 ++++ pyopencl/tools.py | 3 ++ test/test_array.py | 2 +- test/test_clrandom.py | 4 +-- 9 files changed, 32 insertions(+), 61 deletions(-) diff --git a/pyopencl/__init__.py b/pyopencl/__init__.py index 179000d3..5d2976c4 100644 --- a/pyopencl/__init__.py +++ b/pyopencl/__init__.py @@ -1967,8 +1967,8 @@ def svm_empty_like(ctx, flags, ary, alignment=None): else: raise ValueError("array is neither C- nor Fortran-contiguous") - return svm_empty(ctx, ary.shape, ary.dtype, order, - flags=flags, alignment=alignment) + return svm_empty(ctx, flags, ary.shape, ary.dtype, order, + alignment=alignment) def csvm_empty(ctx, shape, dtype, order="C", alignment=None): diff --git a/pyopencl/array.py b/pyopencl/array.py index a4a5f4cf..69a9f81b 100644 --- a/pyopencl/array.py +++ b/pyopencl/array.py @@ -2280,9 +2280,8 @@ def multi_put(arrays, dest_indices, dest_shape=None, out=None, queue=None, vec_count = len(arrays) if out is None: - out = [Array(queue, dest_shape, a_dtype, - allocator=a_allocator, queue=queue) - for i in range(vec_count)] + out = [Array(queue, dest_shape, a_dtype, allocator=a_allocator) + for _ in range(vec_count)] else: if a_dtype != single_valued(o.dtype for o in out): raise TypeError("arrays and out must have the same dtype") diff --git a/pyopencl/characterize/performance.py b/pyopencl/characterize/performance.py index f3f2d894..f0c76907 100644 --- a/pyopencl/characterize/performance.py +++ b/pyopencl/characterize/performance.py @@ -50,15 +50,15 @@ class WallTimer(Timer): def start(self): from time import time self.queue.finish() - self.start = time() + self.start_time = time() def stop(self): from time import time self.queue.finish() - self.end = time() + self.end_time = time() def get_elapsed(self): - return self.end-self.start + return self.end_time-self.start_time def _get_time(queue, f, timer_factory=None, desired_duration=0.1, diff --git a/pyopencl/clrandom.py b/pyopencl/clrandom.py index decab716..96acce1f 100644 --- a/pyopencl/clrandom.py +++ b/pyopencl/clrandom.py @@ -424,6 +424,18 @@ class Random123GeneratorBase(object): .. automethod:: normal """ + @property + def header_name(self): + raise NotImplementedError + + @property + def generator_name(self): + raise NotImplementedError + + @property + def key_length(self): + raise NotImplementedError + def __init__(self, context, key=None, counter=None, seed=None): int32_info = np.iinfo(np.int32) from random import Random diff --git a/pyopencl/elementwise.py b/pyopencl/elementwise.py index 0e35df43..cbd8d746 100644 --- a/pyopencl/elementwise.py +++ b/pyopencl/elementwise.py @@ -484,56 +484,6 @@ def get_copy_kernel(context, dtype_dest, dtype_src): name="copy") -@context_dependent_memoize -def get_linear_combination_kernel(summand_descriptors, - dtype_z): - # TODO: Port this! - raise NotImplementedError - - from pyopencl.tools import dtype_to_ctype - from pyopencl.elementwise import \ - VectorArg, ScalarArg, get_elwise_module - - args = [] - preamble = [] - loop_prep = [] - summands = [] - tex_names = [] - - for i, (is_gpu_scalar, scalar_dtype, vector_dtype) in \ - enumerate(summand_descriptors): - if is_gpu_scalar: - preamble.append( - "texture <%s, 1, cudaReadModeElementType> tex_a%d;" - % (dtype_to_ctype(scalar_dtype, with_fp_tex_hack=True), i)) - args.append(VectorArg(vector_dtype, "x%d" % i, with_offset=True)) - tex_names.append("tex_a%d" % i) - loop_prep.append( - "%s a%d = fp_tex1Dfetch(tex_a%d, 0)" - % (dtype_to_ctype(scalar_dtype), i, i)) - else: - args.append(ScalarArg(scalar_dtype, "a%d" % i)) - args.append(VectorArg(vector_dtype, "x%d" % i, with_offset=True)) - - summands.append("a%d*x%d[i]" % (i, i)) - - args.append(VectorArg(dtype_z, "z", with_offset=True)) - args.append(ScalarArg(np.uintp, "n")) - - mod = get_elwise_module(args, - "z[i] = " + " + ".join(summands), - "linear_combination", - preamble="\n".join(preamble), - loop_prep=";\n".join(loop_prep)) - - func = mod.get_function("linear_combination") - tex_src = [mod.get_texref(tn) for tn in tex_names] - func.prepare("".join(arg.struct_char for arg in args), - (1, 1, 1), texrefs=tex_src) - - return func, tex_src - - def complex_dtype_to_name(dtype): if dtype == np.complex128: return "cdouble" diff --git a/pyopencl/scan.py b/pyopencl/scan.py index 30a657d8..71460f25 100644 --- a/pyopencl/scan.py +++ b/pyopencl/scan.py @@ -1137,6 +1137,9 @@ class _GenericScanKernelBase(object): # }}} + def finish_setup(self): + raise NotImplementedError + generic_scan_kernel_cache = WriteOncePersistentDict( "pyopencl-generated-scan-kernel-cache-v1", @@ -1726,6 +1729,10 @@ class _LegacyScanKernelBase(GenericScanKernel): output_statement=self.ary_output_statement, options=options, preamble=preamble, devices=devices) + @property + def ary_output_statement(self): + raise NotImplementedError + def __call__(self, input_ary, output_ary=None, allocator=None, queue=None): allocator = allocator or input_ary.allocator queue = queue or input_ary.queue or output_ary.queue diff --git a/pyopencl/tools.py b/pyopencl/tools.py index 369fb272..5b7b78d9 100644 --- a/pyopencl/tools.py +++ b/pyopencl/tools.py @@ -899,6 +899,9 @@ class KernelTemplateBase(object): def get_renderer(self, type_aliases, var_values, context=None, options=[]): return _TemplateRenderer(self, type_aliases, var_values) + def build_inner(self, context, *args, **kwargs): + raise NotImplementedError + def build(self, context, *args, **kwargs): """Provide caching for an :meth:`build_inner`.""" diff --git a/test/test_array.py b/test/test_array.py index 3f2aa3fa..d7274c68 100644 --- a/test/test_array.py +++ b/test/test_array.py @@ -1008,7 +1008,7 @@ def test_event_management(ctx_factory): from pyopencl.clrandom import rand as clrand x = clrand(queue, (5, 10), dtype=np.float32) - assert len(x.events) == 1, len(x._events) + assert len(x.events) == 1, len(x.events) x.finish() diff --git a/test/test_clrandom.py b/test/test_clrandom.py index 0cd572d0..b6b2094e 100644 --- a/test/test_clrandom.py +++ b/test/test_clrandom.py @@ -78,5 +78,5 @@ if __name__ == "__main__": if len(sys.argv) > 1: exec(sys.argv[1]) else: - import py.test - py.test.cmdline.main([__file__]) + from pytest import main + main([__file__]) -- GitLab From de408095297cea4a956839bab6c281b35992ef7e Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sat, 26 Jan 2019 18:09:57 -0600 Subject: [PATCH 09/20] Add pylintrc --- .pylintrc | 813 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 813 insertions(+) create mode 100644 .pylintrc diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 00000000..a4667ce6 --- /dev/null +++ b/.pylintrc @@ -0,0 +1,813 @@ +# Based on: https://gitlab.tiker.net/inducer/ci-support/blob/237bf5f0414a47499bc9ce4ef54ebd285e6fe648/.pylintrc-default + +[MASTER] + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. +extension-pkg-whitelist=numpy + +# Add files or directories to the blacklist. They should be base names, not +# paths. +ignore=CVS,compyte + +# Add files or directories matching the regex patterns to the blacklist. The +# regex matches against base names, not paths. +ignore-patterns= + +# Python code to execute, usually for sys.path manipulation such as +# pygtk.require(). +#init-hook= + +# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the +# number of processors available to use. +jobs=1 + +# Control the amount of potential inferred values when inferring a single +# object. This can help the performance when dealing with large functions or +# complex, nested conditions. +limit-inference-results=100 + +# List of plugins (as comma separated values of python modules names) to load, +# usually to register additional checkers. +load-plugins= + +# Pickle collected data for later comparisons. +persistent=no + +# Specify a configuration file. +#rcfile= + +# When enabled, pylint would attempt to guess common misconfiguration and emit +# user-friendly hints instead of false-positive error messages. +suggestion-mode=yes + +# Allow loading of arbitrary C extensions. Extensions are imported into the +# active Python interpreter and may run arbitrary code. +unsafe-load-any-extension=no + + +[MESSAGES CONTROL] + +# Only show warnings with the listed confidence levels. Leave empty to show +# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED. +confidence= + +# Disable the message, report, category or checker with the given id(s). You +# can either give multiple identifiers separated by comma (,) or put this +# option multiple times (only on the command line, not in the configuration +# file where it should appear only once). You can also use "--disable=all" to +# disable everything first and then reenable specific checks. For example, if +# you want to run only the similarities checker, you can use "--disable=all +# --enable=similarities". If you want to run only the classes checker, but have +# no Warning level messages displayed, use "--disable=all --enable=classes +# --disable=W". +disable=assignment-from-no-return, # https://github.com/PyCQA/pylint/issues/2694 + blacklisted-name, + invalid-name, + missing-docstring, + empty-docstring, + unneeded-not, + singleton-comparison, + misplaced-comparison-constant, + unidiomatic-typecheck, + consider-using-enumerate, + consider-iterating-dictionary, + bad-classmethod-argument, + bad-mcs-method-argument, + bad-mcs-classmethod-argument, + single-string-used-for-slots, + line-too-long, + too-many-lines, + trailing-whitespace, + missing-final-newline, + trailing-newlines, + multiple-statements, + superfluous-parens, + bad-whitespace, + mixed-line-endings, + unexpected-line-ending-format, + bad-continuation, + wrong-spelling-in-comment, + wrong-spelling-in-docstring, + invalid-characters-in-docstring, + multiple-imports, + wrong-import-order, + ungrouped-imports, + wrong-import-position, + useless-import-alias, + len-as-condition, + print-statement, + parameter-unpacking, + unpacking-in-except, + old-raise-syntax, + backtick, + long-suffix, + old-ne-operator, + old-octal-literal, + import-star-module-level, + non-ascii-bytes-literal, + raw-checker-failed, + bad-inline-option, + locally-disabled, + file-ignored, + suppressed-message, + useless-suppression, + deprecated-pragma, + use-symbolic-message-instead, + c-extension-no-member, + literal-comparison, + comparison-with-itself, + no-self-use, + no-classmethod-decorator, + no-staticmethod-decorator, + useless-object-inheritance, + cyclic-import, + duplicate-code, + too-many-ancestors, + too-many-instance-attributes, + too-few-public-methods, + too-many-public-methods, + too-many-return-statements, + too-many-branches, + too-many-arguments, + too-many-locals, + too-many-statements, + too-many-boolean-expressions, + consider-merging-isinstance, + too-many-nested-blocks, + simplifiable-if-statement, + redefined-argument-from-local, + no-else-return, + consider-using-ternary, + trailing-comma-tuple, + stop-iteration-return, + simplify-boolean-expression, + inconsistent-return-statements, + useless-return, + consider-swap-variables, + consider-using-join, + consider-using-in, + consider-using-get, + chained-comparison, + consider-using-dict-comprehension, + consider-using-set-comprehension, + simplifiable-if-expression, + unreachable, + dangerous-default-value, + pointless-statement, + pointless-string-statement, + expression-not-assigned, + unnecessary-pass, + unnecessary-lambda, + duplicate-key, + assign-to-new-keyword, + useless-else-on-loop, + exec-used, + eval-used, + confusing-with-statement, + using-constant-test, + comparison-with-callable, + lost-exception, + assert-on-tuple, + attribute-defined-outside-init, + bad-staticmethod-argument, + protected-access, + arguments-differ, + signature-differs, + abstract-method, + super-init-not-called, + no-init, + non-parent-init-called, + useless-super-delegation, + unnecessary-semicolon, + bad-indentation, + mixed-indentation, + wildcard-import, + deprecated-module, + relative-import, + reimported, + import-self, + misplaced-future, + fixme, + invalid-encoded-data, + global-variable-undefined, + global-variable-not-assigned, + global-statement, + global-at-module-level, + unused-import, + unused-variable, + unused-argument, + unused-wildcard-import, + redefined-outer-name, + redefined-builtin, + redefine-in-handler, + undefined-loop-variable, + unbalanced-tuple-unpacking, + cell-var-from-loop, + possibly-unused-variable, + self-cls-assignment, + bare-except, + broad-except, + duplicate-except, + try-except-raise, + binary-op-exception, + raising-format-tuple, + keyword-arg-before-vararg, + logging-not-lazy, + logging-format-interpolation, + logging-fstring-interpolation, + bad-format-string-key, + unused-format-string-key, + bad-format-string, + missing-format-argument-key, + unused-format-string-argument, + format-combined-specification, + missing-format-attribute, + invalid-format-index, + duplicate-string-formatting-argument, + anomalous-backslash-in-string, + anomalous-unicode-escape-in-string, + implicit-str-concat-in-sequence, + bad-open-mode, + boolean-datetime, + redundant-unittest-assert, + deprecated-method, + bad-thread-instantiation, + shallow-copy-environ, + invalid-envvar-default, + subprocess-popen-preexec-fn, + apply-builtin, + basestring-builtin, + buffer-builtin, + cmp-builtin, + coerce-builtin, + execfile-builtin, + file-builtin, + long-builtin, + raw_input-builtin, + reduce-builtin, + standarderror-builtin, + unicode-builtin, + xrange-builtin, + coerce-method, + delslice-method, + getslice-method, + setslice-method, + no-absolute-import, + old-division, + dict-iter-method, + dict-view-method, + next-method-called, + metaclass-assignment, + indexing-exception, + raising-string, + reload-builtin, + oct-method, + hex-method, + nonzero-method, + cmp-method, + input-builtin, + round-builtin, + intern-builtin, + unichr-builtin, + map-builtin-not-iterating, + zip-builtin-not-iterating, + range-builtin-not-iterating, + filter-builtin-not-iterating, + using-cmp-argument, + eq-without-hash, + div-method, + idiv-method, + rdiv-method, + exception-message-attribute, + invalid-str-codec, + sys-max-int, + bad-python3-import, + deprecated-string-function, + deprecated-str-translate-call, + deprecated-itertools-function, + deprecated-types-field, + next-method-defined, + dict-items-not-iterating, + dict-keys-not-iterating, + dict-values-not-iterating, + deprecated-operator-function, + deprecated-urllib-function, + xreadlines-attribute, + deprecated-sys-function, + exception-escape, + comprehension-escape + +# Enable the message, report, category or checker with the given id(s). You can +# either give multiple identifier separated by comma (,) or put this option +# multiple time (only on the command line, not in the configuration file where +# it should appear only once). See also the "--disable" option for examples. +enable=syntax-error, + unrecognized-inline-option, + bad-option-value, + init-is-generator, + return-in-init, + function-redefined, + not-in-loop, + return-outside-function, + yield-outside-function, + return-arg-in-generator, + nonexistent-operator, + duplicate-argument-name, + abstract-class-instantiated, + bad-reversed-sequence, + too-many-star-expressions, + invalid-star-assignment-target, + star-needs-assignment-target, + nonlocal-and-global, + continue-in-finally, + nonlocal-without-binding, + used-prior-global-declaration, + misplaced-format-function, + method-hidden, + access-member-before-definition, + no-method-argument, + no-self-argument, + invalid-slots-object, + assigning-non-slot, + invalid-slots, + inherit-non-class, + inconsistent-mro, + duplicate-bases, + non-iterator-returned, + unexpected-special-method-signature, + invalid-length-returned, + import-error, + relative-beyond-top-level, + used-before-assignment, + undefined-variable, + undefined-all-variable, + invalid-all-object, + no-name-in-module, + unpacking-non-sequence, + bad-except-order, + raising-bad-type, + bad-exception-context, + misplaced-bare-raise, + raising-non-exception, + notimplemented-raised, + catching-non-exception, + bad-super-call, + missing-super-argument, + no-member, + not-callable, + no-value-for-parameter, + too-many-function-args, + unexpected-keyword-arg, + redundant-keyword-arg, + missing-kwoa, + invalid-sequence-index, + invalid-slice-index, + assignment-from-none, + not-context-manager, + invalid-unary-operand-type, + unsupported-binary-operation, + repeated-keyword, + not-an-iterable, + not-a-mapping, + unsupported-membership-test, + unsubscriptable-object, + unsupported-assignment-operation, + unsupported-delete-operation, + invalid-metaclass, + unhashable-dict-key, + logging-unsupported-format, + logging-format-truncated, + logging-too-many-args, + logging-too-few-args, + bad-format-character, + truncated-format-string, + mixed-format-string, + format-needs-mapping, + missing-format-string-key, + too-many-format-args, + too-few-format-args, + bad-string-format-type, + bad-str-strip-call, + invalid-envvar-value, + yield-inside-async-function, + not-async-context-manager, + fatal, + astroid-error, + parse-error, + method-check-failed + + +[REPORTS] + +# Python expression which should return a note less than 10 (10 is the highest +# note). You have access to the variables errors warning, statement which +# respectively contain the number of errors / warnings messages and the total +# number of statements analyzed. This is used by the global evaluation report +# (RP0004). +evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) + +# Template used to display messages. This is a python new-style format string +# used to format the message information. See doc for all details. +#msg-template= + +# Set the output format. Available formats are text, parseable, colorized, json +# and msvs (visual studio). You can also give a reporter class, e.g. +# mypackage.mymodule.MyReporterClass. +output-format=text + +# Tells whether to display a full report or only the messages. +reports=no + +# Activate the evaluation score. +score=no + + +[REFACTORING] + +# Maximum number of nested blocks for function / method body +max-nested-blocks=5 + +# Complete name of functions that never returns. When checking for +# inconsistent-return-statements if a never returning function is called then +# it will be considered as an explicit return statement and no message will be +# printed. +never-returning-functions=sys.exit + + +[LOGGING] + +# Format style used to check logging format string. `old` means using % +# formatting, while `new` is for `{}` formatting. +logging-format-style=old + +# Logging modules to check that the string format arguments are in logging +# function parameter format. +logging-modules=logging + + +[SPELLING] + +# Limits count of emitted suggestions for spelling mistakes. +max-spelling-suggestions=4 + +# Spelling dictionary name. Available dictionaries: none. To make it working +# install python-enchant package.. +spelling-dict= + +# List of comma separated words that should not be checked. +spelling-ignore-words= + +# A path to a file that contains private dictionary; one word per line. +spelling-private-dict-file= + +# Tells whether to store unknown words to indicated private dictionary in +# --spelling-private-dict-file option instead of raising a message. +spelling-store-unknown-words=no + + +[MISCELLANEOUS] + +# List of note tags to take in consideration, separated by a comma. +notes=FIXME, + XXX, + TODO + + +[TYPECHECK] + +# List of decorators that produce context managers, such as +# contextlib.contextmanager. Add to this list to register other decorators that +# produce valid context managers. +contextmanager-decorators=contextlib.contextmanager + +# List of members which are set dynamically and missed by pylint inference +# system, and so shouldn't trigger E1101 when accessed. Python regular +# expressions are accepted. +generated-members=cltypes.*,gl_platform.*,mako.template + +# Tells whether missing members accessed in mixin class should be ignored. A +# mixin class is detected if its name ends with "mixin" (case insensitive). +ignore-mixin-members=yes + +# Tells whether to warn about missing members when the owner of the attribute +# is inferred to be None. +ignore-none=yes + +# This flag controls whether pylint should warn about no-member and similar +# checks whenever an opaque object is returned when inferring. The inference +# can return multiple potential results while evaluating a Python object, but +# some branches might not be evaluated, which results in partial inference. In +# that case, it might be useful to still emit no-member and other checks for +# the rest of the inferred objects. +ignore-on-opaque-inference=yes + +# List of class names for which member attributes should not be checked (useful +# for classes with dynamically set attributes). This supports the use of +# qualified names. +ignored-classes=optparse.Values,thread._local,_thread._local + +# List of module names for which member attributes should not be checked +# (useful for modules/projects where namespaces are manipulated during runtime +# and thus existing member attributes cannot be deduced by static analysis. It +# supports qualified module names, as well as Unix pattern matching. +ignored-modules= + +# Show a hint with possible names when a member name was not found. The aspect +# of finding the hint is based on edit distance. +missing-member-hint=yes + +# The minimum edit distance a name should have in order to be considered a +# similar match for a missing member name. +missing-member-hint-distance=1 + +# The total number of similar names that should be taken in consideration when +# showing a hint for a missing member. +missing-member-max-choices=1 + + +[VARIABLES] + +# List of additional names supposed to be defined in builtins. Remember that +# you should avoid defining new builtins when possible. +additional-builtins= + +# Tells whether unused global variables should be treated as a violation. +allow-global-unused-variables=yes + +# List of strings which can identify a callback function by name. A callback +# name must start or end with one of those strings. +callbacks=cb_, + _cb + +# A regular expression matching the name of dummy variables (i.e. expected to +# not be used). +dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ + +# Argument names that match this expression will be ignored. Default to name +# with leading underscore. +ignored-argument-names=_.*|^ignored_|^unused_ + +# Tells whether we should check for unused import in __init__ files. +init-import=no + +# List of qualified module names which can have objects that can redefine +# builtins. +redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io + + +[FORMAT] + +# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. +expected-line-ending-format= + +# Regexp for a line that is allowed to be longer than the limit. +ignore-long-lines=^\s*(# )??$ + +# Number of spaces of indent required inside a hanging or continued line. +indent-after-paren=4 + +# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 +# tab). +indent-string=' ' + +# Maximum number of characters on a single line. +max-line-length=100 + +# Maximum number of lines in a module. +max-module-lines=1000 + +# List of optional constructs for which whitespace checking is disabled. `dict- +# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}. +# `trailing-comma` allows a space between comma and closing bracket: (a, ). +# `empty-line` allows space-only lines. +no-space-check=trailing-comma, + dict-separator + +# Allow the body of a class to be on the same line as the declaration if body +# contains single statement. +single-line-class-stmt=no + +# Allow the body of an if to be on the same line as the test if there is no +# else. +single-line-if-stmt=no + + +[SIMILARITIES] + +# Ignore comments when computing similarities. +ignore-comments=yes + +# Ignore docstrings when computing similarities. +ignore-docstrings=yes + +# Ignore imports when computing similarities. +ignore-imports=no + +# Minimum lines number of a similarity. +min-similarity-lines=4 + + +[BASIC] + +# Naming style matching correct argument names. +argument-naming-style=snake_case + +# Regular expression matching correct argument names. Overrides argument- +# naming-style. +#argument-rgx= + +# Naming style matching correct attribute names. +attr-naming-style=snake_case + +# Regular expression matching correct attribute names. Overrides attr-naming- +# style. +#attr-rgx= + +# Bad variable names which should always be refused, separated by a comma. +bad-names=foo, + bar, + baz, + toto, + tutu, + tata + +# Naming style matching correct class attribute names. +class-attribute-naming-style=any + +# Regular expression matching correct class attribute names. Overrides class- +# attribute-naming-style. +#class-attribute-rgx= + +# Naming style matching correct class names. +class-naming-style=PascalCase + +# Regular expression matching correct class names. Overrides class-naming- +# style. +#class-rgx= + +# Naming style matching correct constant names. +const-naming-style=UPPER_CASE + +# Regular expression matching correct constant names. Overrides const-naming- +# style. +#const-rgx= + +# Minimum line length for functions/classes that require docstrings, shorter +# ones are exempt. +docstring-min-length=-1 + +# Naming style matching correct function names. +function-naming-style=snake_case + +# Regular expression matching correct function names. Overrides function- +# naming-style. +#function-rgx= + +# Good variable names which should always be accepted, separated by a comma. +good-names=i, + j, + k, + ex, + Run, + _ + +# Include a hint for the correct naming format with invalid-name. +include-naming-hint=no + +# Naming style matching correct inline iteration names. +inlinevar-naming-style=any + +# Regular expression matching correct inline iteration names. Overrides +# inlinevar-naming-style. +#inlinevar-rgx= + +# Naming style matching correct method names. +method-naming-style=snake_case + +# Regular expression matching correct method names. Overrides method-naming- +# style. +#method-rgx= + +# Naming style matching correct module names. +module-naming-style=snake_case + +# Regular expression matching correct module names. Overrides module-naming- +# style. +#module-rgx= + +# Colon-delimited sets of names that determine each other's naming style when +# the name regexes allow several styles. +name-group= + +# Regular expression which should only match function or class names that do +# not require a docstring. +no-docstring-rgx=^_ + +# List of decorators that produce properties, such as abc.abstractproperty. Add +# to this list to register other decorators that produce valid properties. +# These decorators are taken in consideration only for invalid-name. +property-classes=abc.abstractproperty + +# Naming style matching correct variable names. +variable-naming-style=snake_case + +# Regular expression matching correct variable names. Overrides variable- +# naming-style. +#variable-rgx= + + +[IMPORTS] + +# Allow wildcard imports from modules that define __all__. +allow-wildcard-with-all=no + +# Analyse import fallback blocks. This can be used to support both Python 2 and +# 3 compatible code, which means that the block might have code that exists +# only in one or another interpreter, leading to false positives when analysed. +analyse-fallback-blocks=no + +# Deprecated modules which should not be used, separated by a comma. +deprecated-modules=optparse,tkinter.tix + +# Create a graph of external dependencies in the given file (report RP0402 must +# not be disabled). +ext-import-graph= + +# Create a graph of every (i.e. internal and external) dependencies in the +# given file (report RP0402 must not be disabled). +import-graph= + +# Create a graph of internal dependencies in the given file (report RP0402 must +# not be disabled). +int-import-graph= + +# Force import order to recognize a module as part of the standard +# compatibility libraries. +known-standard-library= + +# Force import order to recognize a module as part of a third party library. +known-third-party=enchant + + +[CLASSES] + +# List of method names used to declare (i.e. assign) instance attributes. +defining-attr-methods=__init__, + __new__, + setUp + +# List of member names, which should be excluded from the protected access +# warning. +exclude-protected=_asdict, + _fields, + _replace, + _source, + _make + +# List of valid names for the first argument in a class method. +valid-classmethod-first-arg=cls + +# List of valid names for the first argument in a metaclass class method. +valid-metaclass-classmethod-first-arg=cls + + +[DESIGN] + +# Maximum number of arguments for function / method. +max-args=5 + +# Maximum number of attributes for a class (see R0902). +max-attributes=7 + +# Maximum number of boolean expressions in an if statement. +max-bool-expr=5 + +# Maximum number of branch for function / method body. +max-branches=12 + +# Maximum number of locals for function / method body. +max-locals=15 + +# Maximum number of parents for a class (see R0901). +max-parents=7 + +# Maximum number of public methods for a class (see R0904). +max-public-methods=20 + +# Maximum number of return / yield for function / method body. +max-returns=6 + +# Maximum number of statements in function / method body. +max-statements=50 + +# Minimum number of public methods for a class (see R0903). +min-public-methods=2 + + +[EXCEPTIONS] + +# Exceptions that will emit a warning when being caught. Defaults to +# "Exception". +overgeneral-exceptions=Exception -- GitLab From 500259ceadb1eeb382be74194f2db491028ba9fd Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sat, 26 Jan 2019 18:10:05 -0600 Subject: [PATCH 10/20] Install more packages --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9aeee7ee..c0eaf0b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -255,7 +255,7 @@ # Pylint: script: - - EXTRA_INSTALL="pybind11 numpy mako matplotlib" + - EXTRA_INSTALL="pybind11 numpy mako matplotlib PyOpenGl IPython" - py_version=3.6 # After installation, PyOpenCL cannot be used from the source directory due # to package shadowing. To work around this, build in editable mode so there @@ -270,7 +270,7 @@ Pylint: Documentation: script: - - EXTRA_INSTALL="pybind11 numpy mako" + - EXTRA_INSTALL="pybind11 numpy mako matplotlib" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh - ". ./build-docs.sh" tags: -- GitLab From acd2b2dc0e545f0253f3320c76e31d9d3a4a3b53 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sat, 26 Jan 2019 18:10:12 -0600 Subject: [PATCH 11/20] More Pylint changes --- pyopencl/array.py | 2 ++ pyopencl/cache.py | 2 +- pyopencl/clmath.py | 3 +++ test/test_array.py | 4 ++-- test/test_wrapper.py | 5 ++--- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pyopencl/array.py b/pyopencl/array.py index 9d1b66b9..1bfdc137 100644 --- a/pyopencl/array.py +++ b/pyopencl/array.py @@ -1,5 +1,7 @@ """CL device arrays.""" +# pylint:disable=unexpected-keyword-arg # for @elwise_kernel_runner + from __future__ import division, absolute_import __copyright__ = "Copyright (C) 2009 Andreas Kloeckner" diff --git a/pyopencl/cache.py b/pyopencl/cache.py index 3e4bc65d..fd46dc5c 100644 --- a/pyopencl/cache.py +++ b/pyopencl/cache.py @@ -482,7 +482,7 @@ def create_built_program_from_source_cached(ctx, src, options_bytes, devices=Non except Exception as e: from pyopencl import Error if (isinstance(e, Error) - and e.code == _cl.status_code.BUILD_PROGRAM_FAILURE): + and e.code == _cl.status_code.BUILD_PROGRAM_FAILURE): # noqa pylint:disable=no-member # no need to try again raise diff --git a/pyopencl/clmath.py b/pyopencl/clmath.py index 6d45fe44..2ae8bfbf 100644 --- a/pyopencl/clmath.py +++ b/pyopencl/clmath.py @@ -1,4 +1,7 @@ from __future__ import absolute_import + +# pylint:disable=unexpected-keyword-arg # for @elwise_kernel_runner + __copyright__ = "Copyright (C) 2009 Andreas Kloeckner" __license__ = """ diff --git a/test/test_array.py b/test/test_array.py index d7274c68..811969a6 100644 --- a/test/test_array.py +++ b/test/test_array.py @@ -571,7 +571,7 @@ def test_bitwise(ctx_factory): # Test unary ~ res_dev = ~a_dev - res = ~a + res = ~a # pylint:disable=invalid-unary-operand-type assert (res_dev.get() == res).all() # }}} @@ -1072,7 +1072,7 @@ def test_skip_slicing(ctx_factory): a = cl_array.to_device(queue, a_host) b = a[::3] assert b.shape == b_host.shape - assert np.array_equal(b[1].get(), b_host[1]) + assert np.array_equal(b[1].get(), b_host[1]) # pylint:disable=unsubscriptable-object def test_transpose(ctx_factory): diff --git a/test/test_wrapper.py b/test/test_wrapper.py index fba8ceb9..ee3219e9 100644 --- a/test/test_wrapper.py +++ b/test/test_wrapper.py @@ -120,8 +120,7 @@ def test_get_info(ctx_factory): def do_test(cl_obj, info_cls, func=None, try_attr_form=True): if func is None: - def func(info): - cl_obj.get_info(info) + func = cl_obj.get_info for info_name in dir(info_cls): if not info_name.startswith("_") and info_name != "to_string": @@ -1030,7 +1029,7 @@ def test_fine_grain_svm(ctx_factory): @pytest.mark.parametrize("dtype", [ np.uint, - cl.cltypes.uint2, + cltypes.uint2, ]) def test_map_dtype(ctx_factory, dtype): if cl._PYPY: -- GitLab From 886b8543e5cc4869f67396287e244113f93cc8d2 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sat, 26 Jan 2019 18:12:31 -0600 Subject: [PATCH 12/20] Use Py3.7 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c0eaf0b4..7f209050 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -256,7 +256,7 @@ Pylint: script: - EXTRA_INSTALL="pybind11 numpy mako matplotlib PyOpenGl IPython" - - py_version=3.6 + - py_version=3.7 # After installation, PyOpenCL cannot be used from the source directory due # to package shadowing. To work around this, build in editable mode so there # is only one copy of everything. @@ -264,7 +264,7 @@ Pylint: - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh - ". ./prepare-and-run-pylint.sh pyopencl test/test_*.py" tags: - - python3.6 + - python3.7 except: - tags -- GitLab From f05562f456e28d00673e351d145397a5a1923000 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sat, 26 Jan 2019 18:12:49 -0600 Subject: [PATCH 13/20] Long line --- test/test_array.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_array.py b/test/test_array.py index 811969a6..02e43e24 100644 --- a/test/test_array.py +++ b/test/test_array.py @@ -1072,7 +1072,7 @@ def test_skip_slicing(ctx_factory): a = cl_array.to_device(queue, a_host) b = a[::3] assert b.shape == b_host.shape - assert np.array_equal(b[1].get(), b_host[1]) # pylint:disable=unsubscriptable-object + assert np.array_equal(b[1].get(), b_host[1]) # noqa pylint:disable=unsubscriptable-object def test_transpose(ctx_factory): -- GitLab From c140d4701cdc8ad675a6a21eae552a82bdce827e Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sat, 26 Jan 2019 18:16:25 -0600 Subject: [PATCH 14/20] Make sure POCL is installed? --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f209050..3d42366f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -253,6 +253,7 @@ # reports: # junit: test/pytest.xml # + Pylint: script: - EXTRA_INSTALL="pybind11 numpy mako matplotlib PyOpenGl IPython" @@ -265,6 +266,7 @@ Pylint: - ". ./prepare-and-run-pylint.sh pyopencl test/test_*.py" tags: - python3.7 + - pocl except: - tags -- GitLab From 8811fc6964869522522891898d72844feaffeeaf Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sat, 26 Jan 2019 18:20:37 -0600 Subject: [PATCH 15/20] Revert "Make sure POCL is installed?" This reverts commit c140d4701cdc8ad675a6a21eae552a82bdce827e. --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d42366f..7f209050 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -253,7 +253,6 @@ # reports: # junit: test/pytest.xml # - Pylint: script: - EXTRA_INSTALL="pybind11 numpy mako matplotlib PyOpenGl IPython" @@ -266,7 +265,6 @@ Pylint: - ". ./prepare-and-run-pylint.sh pyopencl test/test_*.py" tags: - python3.7 - - pocl except: - tags -- GitLab From 70e0c4fd684c52616f36d86a6b1f6bfd816034cb Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sat, 26 Jan 2019 18:21:01 -0600 Subject: [PATCH 16/20] Revert "Revert "Make sure POCL is installed?"" This reverts commit 8811fc6964869522522891898d72844feaffeeaf. --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f209050..3d42366f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -253,6 +253,7 @@ # reports: # junit: test/pytest.xml # + Pylint: script: - EXTRA_INSTALL="pybind11 numpy mako matplotlib PyOpenGl IPython" @@ -265,6 +266,7 @@ Pylint: - ". ./prepare-and-run-pylint.sh pyopencl test/test_*.py" tags: - python3.7 + - pocl except: - tags -- GitLab From 8c5dd66ecfb1e7be6c35e632221437754d14c774 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sat, 26 Jan 2019 18:22:55 -0600 Subject: [PATCH 17/20] [ci skip] Fix URL --- .pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pylintrc b/.pylintrc index a4667ce6..9389377f 100644 --- a/.pylintrc +++ b/.pylintrc @@ -1,4 +1,4 @@ -# Based on: https://gitlab.tiker.net/inducer/ci-support/blob/237bf5f0414a47499bc9ce4ef54ebd285e6fe648/.pylintrc-default +# Based on: https://gitlab.tiker.net/inducer/ci-support/raw/237bf5f0414a47499bc9ce4ef54ebd285e6fe648/.pylintrc-default [MASTER] -- GitLab From 74f995844c890aa4f4a0e4327faf00f50bce74df Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sat, 26 Jan 2019 23:00:34 -0600 Subject: [PATCH 18/20] Revert "Use Py3.7" This reverts commit 886b8543e5cc4869f67396287e244113f93cc8d2. --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d42366f..253f0bca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -257,7 +257,7 @@ Pylint: script: - EXTRA_INSTALL="pybind11 numpy mako matplotlib PyOpenGl IPython" - - py_version=3.7 + - py_version=3.6 # After installation, PyOpenCL cannot be used from the source directory due # to package shadowing. To work around this, build in editable mode so there # is only one copy of everything. @@ -265,8 +265,7 @@ Pylint: - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh - ". ./prepare-and-run-pylint.sh pyopencl test/test_*.py" tags: - - python3.7 - - pocl + - python3.6 except: - tags -- GitLab From 06da8bb42dfe5c9165c53961e54215fac6ca5e8f Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sat, 26 Jan 2019 23:07:57 -0600 Subject: [PATCH 19/20] Re-enable most of CI --- .gitlab-ci.yml | 509 ++++++++++++++++++++++++------------------------- 1 file changed, 254 insertions(+), 255 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 253f0bca..91056ac9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,258 +1,257 @@ -# "Python 2.7 AMD CPU": -# script: -# - export PY_EXE=python2.7 -# - export PYOPENCL_TEST=amd:pu -# - export EXTRA_INSTALL="pybind11 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: -# - python2.7 -# - amd-cl-cpu -# - opengl -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# Python 3.6 Intel CPU: -# script: -# - export PY_EXE=python3.6 -# - export PYOPENCL_TEST="intel(r):pu" -# - export EXTRA_INSTALL="pybind11 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.6 -# - intel-cl-cpu -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# Python 3.6 AMD CPU: -# script: -# - export PY_EXE=python3.6 -# - export PYOPENCL_TEST=amd:pu -# - export EXTRA_INSTALL="pybind11 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.6 -# - amd-cl-cpu -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# Python 3.6 Titan X: -# script: -# - export PY_EXE=python3.6 -# - export PYOPENCL_TEST=nvi:titan -# - export EXTRA_INSTALL="pybind11 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.6 -# - nvidia-titan-x -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# Python 3.6 Titan V: -# script: -# - export PY_EXE=python3.6 -# - export PYOPENCL_TEST=nvi:titan -# - export EXTRA_INSTALL="pybind11 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.6 -# - nvidia-titan-v -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# Python 3.6 K40: -# script: -# - export PY_EXE=python3.6 -# - export PYOPENCL_TEST=nvi:k40 -# - export EXTRA_INSTALL="pybind11 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.6 -# - nvidia-k40 -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# Python 3.6 AMD GPU: -# script: -# - export PY_EXE=python3.6 -# - export PYOPENCL_TEST=amd:fiji -# - export EXTRA_INSTALL="pybind11 numpy mako" -# -# # https://andreask.cs.illinois.edu/MachineShop/UserNotes -# - export OCL_ICD_VENDORS=/etc/OpenCLwithAMD/vendors -# -# - 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.6 -# - amd-fiji -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# Python 2.7 POCL: -# script: -# - export PY_EXE=python2.7 -# - export PYOPENCL_TEST=portable -# - export EXTRA_INSTALL="pybind11 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: -# - python2.7 -# - pocl -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# Python 3.7 POCL: -# script: -# - export PY_EXE=python3.7 -# - export PYOPENCL_TEST=portable -# - export EXTRA_INSTALL="pybind11 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.7 -# - pocl -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# Python 3.6 POCL CL 1.1: -# script: -# - export PY_EXE=python3.6 -# - export PYOPENCL_TEST=portable -# - export EXTRA_INSTALL="pybind11 numpy mako" -# - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh -# - echo "CL_PRETEND_VERSION = '1.1'" > siteconf.py -# - ". ./build-and-test-py-project.sh" -# tags: -# - python3.6 -# - pocl -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# Python 3.6 POCL: -# script: -# - export PY_EXE=python3.6 -# - export PYOPENCL_TEST=portable -# - export EXTRA_INSTALL="pybind11 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.6 -# - pocl -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# Python 3.6 POCL (+GL and special functions): -# script: -# - export PY_EXE=python3.6 -# - export PYOPENCL_TEST=portable -# - export EXTRA_INSTALL="pybind11 numpy mako scipy pyfmmlib" -# - echo "CL_ENABLE_GL = True" > siteconf.py -# - 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.6 -# - pocl -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# Python 2.7 Apple: -# script: -# - export PY_EXE=python2.7 -# - export PYOPENCL_TEST=app:cpu -# - export EXTRA_INSTALL="pybind11 numpy mako" -# - export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig -# - 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: -# - python2.7 -# - apple -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# Python 3 Conda Apple: -# script: -# - CONDA_ENVIRONMENT=.test-conda-env-py3.yml -# - export CC=gcc -# - 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: -# - apple -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# -# PyPy POCL: -# script: -# - export PY_EXE=pypy -# - export PYOPENCL_TEST=portable -# -# # https://github.com/pybind/pybind11/pull/1494 -# - export EXTRA_INSTALL="git+https://github.com/inducer/pybind11 numpy mako" -# -# - export NO_DOCTESTS=1 -# - 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: -# - pypy -# - pocl -# except: -# - tags -# artifacts: -# reports: -# junit: test/pytest.xml -# +"Python 2.7 AMD CPU": + script: + - export PY_EXE=python2.7 + - export PYOPENCL_TEST=amd:pu + - export EXTRA_INSTALL="pybind11 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: + - python2.7 + - amd-cl-cpu + - opengl + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 3.6 Intel CPU: + script: + - export PY_EXE=python3.6 + - export PYOPENCL_TEST="intel(r):pu" + - export EXTRA_INSTALL="pybind11 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.6 + - intel-cl-cpu + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 3.6 AMD CPU: + script: + - export PY_EXE=python3.6 + - export PYOPENCL_TEST=amd:pu + - export EXTRA_INSTALL="pybind11 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.6 + - amd-cl-cpu + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 3.6 Titan X: + script: + - export PY_EXE=python3.6 + - export PYOPENCL_TEST=nvi:titan + - export EXTRA_INSTALL="pybind11 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.6 + - nvidia-titan-x + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 3.6 Titan V: + script: + - export PY_EXE=python3.6 + - export PYOPENCL_TEST=nvi:titan + - export EXTRA_INSTALL="pybind11 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.6 + - nvidia-titan-v + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 3.6 K40: + script: + - export PY_EXE=python3.6 + - export PYOPENCL_TEST=nvi:k40 + - export EXTRA_INSTALL="pybind11 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.6 + - nvidia-k40 + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 3.6 AMD GPU: + script: + - export PY_EXE=python3.6 + - export PYOPENCL_TEST=amd:fiji + - export EXTRA_INSTALL="pybind11 numpy mako" + + # https://andreask.cs.illinois.edu/MachineShop/UserNotes + - export OCL_ICD_VENDORS=/etc/OpenCLwithAMD/vendors + + - 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.6 + - amd-fiji + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 2.7 POCL: + script: + - export PY_EXE=python2.7 + - export PYOPENCL_TEST=portable + - export EXTRA_INSTALL="pybind11 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: + - python2.7 + - pocl + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 3.7 POCL: + script: + - export PY_EXE=python3.7 + - export PYOPENCL_TEST=portable + - export EXTRA_INSTALL="pybind11 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.7 + - pocl + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 3.6 POCL CL 1.1: + script: + - export PY_EXE=python3.6 + - export PYOPENCL_TEST=portable + - export EXTRA_INSTALL="pybind11 numpy mako" + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + - echo "CL_PRETEND_VERSION = '1.1'" > siteconf.py + - ". ./build-and-test-py-project.sh" + tags: + - python3.6 + - pocl + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 3.6 POCL: + script: + - export PY_EXE=python3.6 + - export PYOPENCL_TEST=portable + - export EXTRA_INSTALL="pybind11 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.6 + - pocl + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 3.6 POCL (+GL and special functions): + script: + - export PY_EXE=python3.6 + - export PYOPENCL_TEST=portable + - export EXTRA_INSTALL="pybind11 numpy mako scipy pyfmmlib" + - echo "CL_ENABLE_GL = True" > siteconf.py + - 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.6 + - pocl + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 2.7 Apple: + script: + - export PY_EXE=python2.7 + - export PYOPENCL_TEST=app:cpu + - export EXTRA_INSTALL="pybind11 numpy mako" + - export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig + - 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: + - python2.7 + - apple + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 3 Conda Apple: + script: + - CONDA_ENVIRONMENT=.test-conda-env-py3.yml + - export CC=gcc + - 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: + - apple + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + +PyPy POCL: + script: + - export PY_EXE=pypy + - export PYOPENCL_TEST=portable + + # https://github.com/pybind/pybind11/pull/1494 + - export EXTRA_INSTALL="git+https://github.com/inducer/pybind11 numpy mako" + + - export NO_DOCTESTS=1 + - 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: + - pypy + - pocl + except: + - tags + artifacts: + reports: + junit: test/pytest.xml Pylint: script: -- GitLab From dd85f61348d1433b6ca7f1ae97b117faa29b975f Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Sun, 27 Jan 2019 06:11:43 +0100 Subject: [PATCH 20/20] Remove matplotlib from docs build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91056ac9..e3ac6172 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -270,7 +270,7 @@ Pylint: Documentation: script: - - EXTRA_INSTALL="pybind11 numpy mako matplotlib" + - EXTRA_INSTALL="pybind11 numpy mako" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh - ". ./build-docs.sh" tags: -- GitLab