From 7712375b6d3300a20281366a4a327e8b167c0696 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 21 Aug 2018 01:56:51 -0500
Subject: [PATCH] [pybind] More pypy fixes
---
.gitlab-ci.yml | 1 -
src/wrap_cl.hpp | 7 +++++++
test/test_wrapper.py | 15 ++++++++++-----
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ca50bd7..789cef1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -189,7 +189,6 @@ PyPy POCL:
- 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:
- pypy
- pocl
diff --git a/src/wrap_cl.hpp b/src/wrap_cl.hpp
index 9111fd12..a929d229 100644
--- a/src/wrap_cl.hpp
+++ b/src/wrap_cl.hpp
@@ -3291,7 +3291,14 @@ namespace pyopencl
{
#ifdef PYOPENCL_USE_NEW_BUFFER_INTERFACE
ward = std::unique_ptr<py_buffer_wrapper>(new py_buffer_wrapper);
+#ifdef PYPY_VERSION
+ // FIXME: get a read-only buffer
+ // Not quite honest, but Pypy doesn't consider numpy arrays
+ // created from objects with the __aray_interface__ writeable.
+ ward->get(holder.ptr(), PyBUF_ANY_CONTIGUOUS);
+#else
ward->get(holder.ptr(), PyBUF_ANY_CONTIGUOUS | PyBUF_WRITABLE);
+#endif
m_ptr = ward->m_buf.buf;
m_size = ward->m_buf.len;
#else
diff --git a/test/test_wrapper.py b/test/test_wrapper.py
index 34b4207b..4d729642 100644
--- a/test/test_wrapper.py
+++ b/test/test_wrapper.py
@@ -295,7 +295,9 @@ def test_image_format_constructor():
assert iform.channel_order == cl.channel_order.RGBA
assert iform.channel_data_type == cl.channel_type.FLOAT
- assert not hasattr(iform, "__dict__")
+
+ if not cl._PYPY:
+ assert not hasattr(iform, "__dict__")
def test_device_topology_amd_constructor():
@@ -306,7 +308,8 @@ def test_device_topology_amd_constructor():
assert topol.device == 4
assert topol.function == 5
- assert not hasattr(topol, "__dict__")
+ if not cl._PYPY:
+ assert not hasattr(topol, "__dict__")
def test_nonempty_supported_image_formats(ctx_factory):
@@ -738,6 +741,10 @@ def test_user_event(ctx_factory):
def test_buffer_get_host_array(ctx_factory):
+ if cl._PYPY:
+ # FIXME
+ pytest.xfail("Buffer.get_host_array not yet working on pypy")
+
ctx = ctx_factory()
mf = cl.mem_flags
@@ -1016,9 +1023,7 @@ def test_fine_grain_svm(ctx_factory):
cl.cltypes.uint2,
])
def test_map_dtype(ctx_factory, dtype):
- from pyopencl import _PYPY
-
- if _PYPY:
+ if cl._PYPY:
# FIXME
pytest.xfail("enqueue_map_buffer not yet working on pypy")
--
GitLab