diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48db98503e76d4144e08395df1bfd90f2a8490f2..6e300ecab9ff1ee2756860a10fff035b963ea100 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ Python 3.5 Intel CPU: - intel-cl-cpu except: - tags + Python 3.5 AMD CPU: script: - export PY_EXE=python3.5 @@ -37,6 +38,7 @@ Python 3.5 AMD CPU: - amd-cl-cpu except: - tags + Python 2.6 AMD CPU: script: - export PY_EXE=python2.6 @@ -134,6 +136,7 @@ PyPy POCL: - export PY_EXE=pypy - export PYOPENCL_TEST=portable - export EXTRA_INSTALL="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: diff --git a/doc/howto.rst b/doc/howto.rst index 5ea67f7df91ae40a44e4a4b8fe78957512aa8b4e..92244c43a69ef61ba3b33a581bc4a696ed9e7705 100644 --- a/doc/howto.rst +++ b/doc/howto.rst @@ -65,10 +65,10 @@ the device: >>> ary_host["field2"].fill(1000) >>> ary_host[13]["field2"] = 12 >>> print(ary_host) - [(217, 1000.0) (217, 1000.0) (217, 1000.0) (217, 1000.0) (217, 1000.0) - (217, 1000.0) (217, 1000.0) (217, 1000.0) (217, 1000.0) (217, 1000.0) - (217, 1000.0) (217, 1000.0) (217, 1000.0) (217, 12.0) (217, 1000.0) - (217, 1000.0) (217, 1000.0) (217, 1000.0) (217, 1000.0) (217, 1000.0)] + [(217, 1000.) (217, 1000.) (217, 1000.) (217, 1000.) (217, 1000.) + (217, 1000.) (217, 1000.) (217, 1000.) (217, 1000.) (217, 1000.) + (217, 1000.) (217, 1000.) (217, 1000.) (217, 12.) (217, 1000.) + (217, 1000.) (217, 1000.) (217, 1000.) (217, 1000.) (217, 1000.)] >>> ary = cl.array.to_device(queue, ary_host) @@ -85,10 +85,10 @@ We can then operate on the array with our own kernels: >>> evt = prg.set_to_1(queue, ary.shape, None, ary.data) >>> print(ary) - [(1, 1000.0) (1, 1000.0) (1, 1000.0) (1, 1000.0) (1, 1000.0) (1, 1000.0) - (1, 1000.0) (1, 1000.0) (1, 1000.0) (1, 1000.0) (1, 1000.0) (1, 1000.0) - (1, 1000.0) (1, 12.0) (1, 1000.0) (1, 1000.0) (1, 1000.0) (1, 1000.0) - (1, 1000.0) (1, 1000.0)] + [(1, 1000.) (1, 1000.) (1, 1000.) (1, 1000.) (1, 1000.) (1, 1000.) + (1, 1000.) (1, 1000.) (1, 1000.) (1, 1000.) (1, 1000.) (1, 1000.) + (1, 1000.) (1, 12.) (1, 1000.) (1, 1000.) (1, 1000.) (1, 1000.) + (1, 1000.) (1, 1000.)] as well as with PyOpenCL's built-in operations: @@ -99,7 +99,7 @@ as well as with PyOpenCL's built-in operations: ... preamble=my_struct_c_decl) >>> evt = elwise(ary) >>> print(ary) - [(2, 1000.0) (2, 1000.0) (2, 1000.0) (2, 1000.0) (2, 1000.0) (2, 1000.0) - (2, 1000.0) (2, 1000.0) (2, 1000.0) (2, 1000.0) (2, 1000.0) (2, 1000.0) - (2, 1000.0) (2, 12.0) (2, 1000.0) (2, 1000.0) (2, 1000.0) (2, 1000.0) - (2, 1000.0) (2, 1000.0)] + [(2, 1000.) (2, 1000.) (2, 1000.) (2, 1000.) (2, 1000.) (2, 1000.) + (2, 1000.) (2, 1000.) (2, 1000.) (2, 1000.) (2, 1000.) (2, 1000.) + (2, 1000.) (2, 12.) (2, 1000.) (2, 1000.) (2, 1000.) (2, 1000.) + (2, 1000.) (2, 1000.)]