diff --git a/doc/source/algorithm.rst b/doc/source/algorithm.rst
index 781cbcb608705c7a4a4799d4b5d00d28bc93d68b..17a86176e57886fa150d5057028212a4523d3100 100644
--- a/doc/source/algorithm.rst
+++ b/doc/source/algorithm.rst
@@ -189,7 +189,7 @@ in PyOpenCL:
Making Custom Scan Kernels
^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. versionadded: 2012.2
+.. versionadded: 2013.1
.. autoclass:: GenericScanKernel
@@ -237,7 +237,7 @@ Simple / Legacy Interface
Works like :class:`ExclusiveScanKernel`.
- .. versionchanged:: 2012.2
+ .. versionchanged:: 2013.1
*neutral* is now always required.
For the array `[1,2,3]`, inclusive scan results in `[1,3,6]`, and exclusive
diff --git a/doc/source/array.rst b/doc/source/array.rst
index 6a4eda2e04dfd2990fa38837508b0e98fc68ccd0..2d18141b48479e126739ba0cc5cc1935bbe9c3fa 100644
--- a/doc/source/array.rst
+++ b/doc/source/array.rst
@@ -44,11 +44,11 @@ about them using this function:
.. exception:: TypeNameNotKnown
- .. versionadded:: 2012.2
+ .. versionadded:: 2013.1
.. function:: register_dtype(dtype, name)
- .. versionchanged:: 2012.2
+ .. versionchanged:: 2013.1
This function has been deprecated. It is recommended that you develop
against the new interface, :func:`get_or_register_dtype`.
@@ -56,7 +56,7 @@ about them using this function:
Returns a C name registered for *dtype*.
- .. versionadded: 2012.2
+ .. versionadded: 2013.1
This function helps with producing C/OpenCL declarations for structured
:class:`numpy.dtype` instances:
@@ -196,7 +196,7 @@ The :class:`Array` Class
.. method :: copy(queue=None)
- .. versionadded:: 2012.2
+ .. versionadded:: 2013.1
.. method :: __str__()
.. method :: __repr__()
@@ -485,7 +485,7 @@ Generating Arrays of Random Numbers
.. versionadded:: 2011.2
- .. versionchanged:: 2012.2
+ .. versionchanged:: 2013.1
Added default value for `num_work_items`.
.. attribute:: state
diff --git a/doc/source/misc.rst b/doc/source/misc.rst
index 5861a5411bcd9166cc66ae5b8fc1156ffe3d54a9..76387486f9b77b8acd680159e67b0642f21c8eaf 100644
--- a/doc/source/misc.rst
+++ b/doc/source/misc.rst
@@ -72,7 +72,7 @@ C interface to Python:
User-visible Changes
====================
-Version 2012.2
+Version 2013.1
--------------
.. note::
diff --git a/doc/source/runtime.rst b/doc/source/runtime.rst
index ccfa11726c820118e8afe6facf2a5a6f3f920708..c6738e53403d3a6f8328fb354feedca28fa98294 100644
--- a/doc/source/runtime.rst
+++ b/doc/source/runtime.rst
@@ -550,7 +550,7 @@ Mapping Memory into Host Address Space
.. versionchanged:: 2011.1
*is_blocking* now defaults to True.
- .. versionchanged:: 2012.2
+ .. versionchanged:: 2013.1
*order* now defaults to "C".
.. function:: enqueue_map_image(queue, buf, flags, origin, region, shape, dtype, order="C", wait_for=None, is_blocking=True)
@@ -568,7 +568,7 @@ Mapping Memory into Host Address Space
.. versionchanged:: 2011.1
*is_blocking* now defaults to True.
- .. versionchanged:: 2012.2
+ .. versionchanged:: 2013.1
*order* now defaults to "C".
Samplers
@@ -630,7 +630,7 @@ Programs and Kernels
.. versionchanged:: 2011.1
*options* may now also be a :class:`list` of :class:`str`.
- .. versionchanged:: 2012.2
+ .. versionchanged:: 2013.1
Added :envvar:`PYOPENCL_NO_CACHE`.
.. method:: compile(self, options=[], devices=None, headers=[])
diff --git a/doc/source/tools.rst b/doc/source/tools.rst
index 361882e7e211568bf6e27d5792cba78953636295..e8418912a0727bed02d9cd719ffd7971ec7795ae 100644
--- a/doc/source/tools.rst
+++ b/doc/source/tools.rst
@@ -41,7 +41,7 @@ the available memory.
device the buffer is used with.)
.. versionchanged::
- In version 2012.2, :class:`CLAllocator` was deprecated and replaced
+ In version 2013.1, :class:`CLAllocator` was deprecated and replaced
by :class:`DeferredAllocator`.
.. method:: __call__(size)
@@ -56,7 +56,7 @@ the available memory.
promise memory to be available that later on (in any call to a buffer-using
CL function).
- .. versionadded:: 2012.2
+ .. versionadded:: 2013.1
.. method:: __call__(size)
diff --git a/pyopencl/algorithm.py b/pyopencl/algorithm.py
index a89810347ae0e8e8fe0755592c8fe01f10d6a185..e51e30a88714f3b50ac1fea72e9bd888b267677b 100644
--- a/pyopencl/algorithm.py
+++ b/pyopencl/algorithm.py
@@ -64,7 +64,7 @@ def copy_if(ary, predicate, extra_args=[], queue=None, preamble=""):
is an on-device scalar (fetch to host with `count.get()`) indicating
how many elements satisfied *predicate*.
- .. versionadded:: 2012.2
+ .. versionadded:: 2013.1
"""
if len(ary) > np.iinfo(np.int32).max:
scan_dtype = np.int64
@@ -99,7 +99,7 @@ def remove_if(ary, predicate, extra_args=[], queue=None, preamble=""):
is an on-device scalar (fetch to host with `count.get()`) indicating
how many elements did not satisfy *predicate*.
- .. versionadded:: 2012.2
+ .. versionadded:: 2013.1
"""
return copy_if(ary, "!(%s)" % predicate, extra_args=extra_args, queue=queue,
preamble=preamble)
@@ -137,7 +137,7 @@ def partition(ary, predicate, extra_args=[], queue=None, preamble=""):
is an on-device scalar (fetch to host with `count.get()`) indicating
how many elements satisfied the predicate.
- .. versionadded:: 2012.2
+ .. versionadded:: 2013.1
"""
if len(ary) > np.iinfo(np.uint32).max:
scan_dtype = np.uint64
@@ -195,7 +195,7 @@ def unique(ary, is_equal_expr="a == b", extra_args=[], queue=None, preamble=""):
is an on-device scalar (fetch to host with `count.get()`) indicating
how many elements satisfied the predicate.
- .. versionadded:: 2012.2
+ .. versionadded:: 2013.1
"""
if len(ary) > np.iinfo(np.uint32).max:
@@ -343,7 +343,7 @@ class RadixSort(object):
"""Provides a general `radix sort <https://en.wikipedia.org/wiki/Radix_sort>`_
on the compute device.
- .. versionadded:: 2012.2
+ .. versionadded:: 2013.1
"""
def __init__(self, context, arguments, key_expr, sort_arg_names,
bits_at_a_time=2, index_dtype=np.int32, key_dtype=np.uint32,
@@ -626,7 +626,7 @@ class ListOfListsBuilder:
.. note:: This functionality is provided as a preview. Its interface
is subject to change until this notice is removed.
- .. versionadded:: 2012.2
+ .. versionadded:: 2013.1
Here's a usage example::
diff --git a/pyopencl/tools.py b/pyopencl/tools.py
index 6a8bf4e78be3308afca5029d5f832289cece1f4e..c5d5dd5dfb3a7305fd1eb37cf78f463e5c71bc7b 100644
--- a/pyopencl/tools.py
+++ b/pyopencl/tools.py
@@ -418,7 +418,7 @@ def match_dtype_to_c_struct(device, name, dtype, context=None):
the given *device* to ensure that :mod:`numpy` and C offsets and
sizes match.)
- .. versionadded: 2012.2
+ .. versionadded: 2013.1
This example explains the use of this function::
diff --git a/pyopencl/version.py b/pyopencl/version.py
index dea8dc2ed0673abe3935926be6bee8acce922e88..e62b84cd7f32f84b7a20776298e2a607baedf3f2 100644
--- a/pyopencl/version.py
+++ b/pyopencl/version.py
@@ -1,4 +1,4 @@
-VERSION = (2012, 2)
+VERSION = (2013, 1)
VERSION_STATUS = ""
VERSION_TEXT = ".".join(str(x) for x in VERSION) + VERSION_STATUS
diff --git a/test/test_wrapper.py b/test/test_wrapper.py
index 42172cd27d6fa66bb3587522d939cc97578d2f8e..06b09deb18aef75542c77828cd961380faeac7cf 100644
--- a/test/test_wrapper.py
+++ b/test/test_wrapper.py
@@ -256,9 +256,9 @@ class TestCL:
from py.test import skip
skip("images not supported on %s" % device)
- if device.platform.vendor == "Intel(R) Corporation":
- from py.test import skip
- skip("images crashy on %s" % device)
+ #if device.platform.vendor == "Intel(R) Corporation":
+ #from py.test import skip
+ #skip("images crashy on %s" % device)
prg = cl.Program(context, """
__kernel void copy_image(