Thanks to visit codestin.com
Credit goes to github.com

Skip to content

BUG: Fix shape update in numpy.ctypeslib.as_array(pointer, shape) #6214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

BUG: Fix shape update in numpy.ctypeslib.as_array(pointer, shape) #6214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
729c3e9
TST: Add tests for numpy.ctypeslib.as_array
tynn Jul 1, 2017
06e6b1a
BUG: Fix shape update in numpy.ctypeslib.as_array(pointer, shape)
tynn Mar 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions numpy/ctypeslib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,15 @@ def prep_pointer(pointer_obj, shape):
attach an __array_interface__ property to it if it does not
yet have one.
"""
try: pointer_obj.__array_interface__
except AttributeError: pass
else: return
try:
inter = pointer_obj.__array_interface__
except AttributeError:
pass
else:
# update shape if possible
try: inter['shape'] = shape
except TypeError: pass
return

contents = pointer_obj.contents
dtype = _dtype(type(contents))
Expand All @@ -423,8 +429,8 @@ def as_array(obj, shape=None):
"""Create a numpy array from a ctypes array or a ctypes POINTER.
The numpy array shares the memory with the ctypes object.

The size parameter must be given if converting from a ctypes POINTER.
The size parameter is ignored if converting from a ctypes array
The shape parameter must be given if converting from a ctypes POINTER.
The shape parameter is ignored if converting from a ctypes array
"""
tp = type(obj)
try: tp.__array_interface__
Expand Down
30 changes: 28 additions & 2 deletions numpy/tests/test_ctypeslib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import pytest

import numpy as np
from numpy.ctypeslib import ndpointer, load_library
from numpy.ctypeslib import ndpointer, load_library, as_array
from numpy.distutils.misc_util import get_shared_lib_extension
from numpy.testing import assert_, assert_raises
from numpy.testing import assert_, assert_array_equal, assert_raises

try:
cdll = None
Expand Down Expand Up @@ -113,3 +113,29 @@ def test_cache(self):
a1 = ndpointer(dtype=np.float64)
a2 = ndpointer(dtype=np.float64)
assert_(a1 == a2)

class TestAsArray(object):
@pytest.mark.skipif(not _HAS_CTYPE,
reason="ctypes not available on this python installation")
def test_array(self):
from ctypes import c_int
at = c_int * 2
a = as_array(at(1, 2))
assert_(a.shape == (2,))
assert_array_equal(a, np.array([1, 2]))
a = as_array((at * 3)(at(1, 2), at(3, 4), at(5, 6)))
assert_(a.shape == (3, 2))
assert_array_equal(a, np.array([[1, 2], [3, 4], [5, 6]]))

@pytest.mark.skipif(not _HAS_CTYPE,
reason="ctypes not available on this python installation")
def test_pointer(self):
from ctypes import c_int, cast, POINTER
p = cast((c_int * 10)(*range(10)), POINTER(c_int))
a = as_array(p, (10,))
assert_(a.shape == (10,))
assert_array_equal(a, np.array(range(10)))
a = as_array(p, (3, 2))
assert_(a.shape == (3, 2))
assert_array_equal(a, np.array([[0, 1], [2, 3], [4, 5]]))
assert_raises(TypeError, as_array, p)