Skip to content
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

Jump to bottom

BUG,ENH: np._from_dlpack: export arrays with any strided size-1 dimensions #21148

Merged
merged 1 commit into from Mar 3, 2022
Merged

BUG,ENH: np._from_dlpack: export arrays with any strided size-1 dimensions #21148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/dlpack.c
View file
Open in desktop
Expand Up @@ -138,7 +138,7 @@ array_dlpack(PyArrayObject *self,

if (!PyArray_IS_C_CONTIGUOUS(self) && PyArray_SIZE(self) != 1) {
for (int i = 0; i < ndim; ++i) {
if (strides[i] % itemsize != 0) {
if (shape[i] != 1 && strides[i] % itemsize != 0) {
PyErr_SetString(PyExc_RuntimeError,
"DLPack only supports strides which are a multiple of "
"itemsize.");
Expand Down
13 changes: 12 additions & 1 deletion numpy/core/tests/test_dlpack.py
View file
Open in desktop
Expand Up @@ -100,7 +100,7 @@ def dlpack_deleter_exception(self):
x = np.arange(5)
_ = x.__dlpack__()
raise RuntimeError

def test_dlpack_destructor_exception(self):
with pytest.raises(RuntimeError):
self.dlpack_deleter_exception()
Expand All @@ -110,3 +110,14 @@ def test_readonly(self):
x.flags.writeable = False
with pytest.raises(TypeError):
x.__dlpack__()

def test_ndim0(self):
x = np.array(1.0)
y = np._from_dlpack(x)
assert_array_equal(x, y)

def test_size1dims_arrays(self):
x = np.ndarray(dtype='f8', shape=(10, 5, 1), strides=(8, 80, 4),
buffer=np.ones(1000, dtype=np.uint8), order='F')
y = np._from_dlpack(x)
assert_array_equal(x, y)