diff --git a/pyopencl/__init__.py b/pyopencl/__init__.py index 6c92c44b94c409d941ab45593c631a92d9cec327..710f99a1df01a1b697aa2e60f88d8ff3b6f13d17 100644 --- a/pyopencl/__init__.py +++ b/pyopencl/__init__.py @@ -1223,45 +1223,6 @@ _csc = create_some_context # {{{ enqueue_copy -def _mark_copy_deprecated(func): - def new_func(*args, **kwargs): - from warnings import warn - warn("'%s' has been deprecated in version 2011.1. Please use " - "enqueue_copy() instead." % func.__name__[1:], DeprecationWarning, - stacklevel=2) - return func(*args, **kwargs) - - try: - from functools import update_wrapper - except ImportError: - pass - else: - try: - update_wrapper(new_func, func) - except AttributeError: - pass - - return new_func - - -enqueue_read_image = _mark_copy_deprecated(_cl._enqueue_read_image) -enqueue_write_image = _mark_copy_deprecated(_cl._enqueue_write_image) -enqueue_copy_image = _mark_copy_deprecated(_cl._enqueue_copy_image) -enqueue_copy_image_to_buffer = _mark_copy_deprecated( - _cl._enqueue_copy_image_to_buffer) -enqueue_copy_buffer_to_image = _mark_copy_deprecated( - _cl._enqueue_copy_buffer_to_image) -enqueue_read_buffer = _mark_copy_deprecated(_cl._enqueue_read_buffer) -enqueue_write_buffer = _mark_copy_deprecated(_cl._enqueue_write_buffer) -enqueue_copy_buffer = _mark_copy_deprecated(_cl._enqueue_copy_buffer) - - -if _cl.get_cl_header_version() >= (1, 1): - enqueue_read_buffer_rect = _mark_copy_deprecated(_cl._enqueue_read_buffer_rect) - enqueue_write_buffer_rect = _mark_copy_deprecated(_cl._enqueue_write_buffer_rect) - enqueue_copy_buffer_rect = _mark_copy_deprecated(_cl._enqueue_copy_buffer_rect) - - def enqueue_copy(queue, dest, src, **kwargs): """Copy from :class:`Image`, :class:`Buffer` or the host to :class:`Image`, :class:`Buffer` or the host. (Note: host-to-host diff --git a/test/test_wrapper.py b/test/test_wrapper.py index efb860060f696eee8a58ddc282af853ae0f323fd..034184800bf8e478199a6fadb6ca9eed7e6d8ed4 100644 --- a/test/test_wrapper.py +++ b/test/test_wrapper.py @@ -351,7 +351,7 @@ def test_that_python_args_fail(ctx_factory): prg.mult(queue, a.shape, None, a_buf, np.float32(2), np.int32(3)) a_result = np.empty_like(a) - cl.enqueue_read_buffer(queue, a_buf, a_result).wait() + cl.enqueue_copy(queue, a_buf, a_result).wait() def test_image_2d(ctx_factory): @@ -513,8 +513,8 @@ def test_copy_buffer(ctx_factory): buf1 = cl.Buffer(context, mf.READ_ONLY | mf.COPY_HOST_PTR, hostbuf=a) buf2 = cl.Buffer(context, mf.WRITE_ONLY, b.nbytes) - cl.enqueue_copy_buffer(queue, buf1, buf2).wait() - cl.enqueue_read_buffer(queue, buf2, b).wait() + cl.enqueue_copy(queue, buf2, buf1).wait() + cl.enqueue_copy(queue, b, buf2).wait() assert la.norm(a - b) == 0 @@ -569,7 +569,7 @@ def test_vector_args(ctx_factory): prg.set_vec(queue, dest.shape, None, x, dest_buf) - cl.enqueue_read_buffer(queue, dest_buf, dest).wait() + cl.enqueue_copy(queue, dest, dest_buf).wait() assert (dest == x).all()