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

Make arrays backed by owned data writeable. #235

Merged
merged 1 commit into from
Jan 3, 2022
Merged

Make arrays backed by owned data writeable. #235

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

- Unreleased
- Make arrays produced via `IntoPyArray`, i.e. those owning Rust data, writeable ([#235](https://github.com/PyO3/rust-numpy/pull/235))

- v0.15.0
- [Remove resolver from Cargo.toml](https://github.com/PyO3/rust-numpy/pull/202)
- [Bump PyO3 to 0.15](https://github.com/PyO3/rust-numpy/pull/212)
Expand Down
12 changes: 6 additions & 6 deletions src/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ impl<T: Element, D: Dimension> PyArray<T, D> {
ptr::null_mut(), // data
0, // itemsize
flag, // flag
ptr::null_mut(), //obj
ptr::null_mut(), // obj
);
Self::from_owned_ptr(py, ptr)
}
Expand All @@ -458,11 +458,11 @@ impl<T: Element, D: Dimension> PyArray<T, D> {
dims.ndim_cint(),
dims.as_dims_ptr(),
T::npy_type() as i32,
strides as *mut _, // strides
data_ptr as _, // data
mem::size_of::<T>() as i32, // itemsize
0, // flag
ptr::null_mut(), //obj
strides as *mut _, // strides
data_ptr as _, // data
mem::size_of::<T>() as i32, // itemsize
npyffi::NPY_ARRAY_WRITEABLE, // flag
ptr::null_mut(), // obj
);
PY_ARRAY_API.PyArray_SetBaseObject(ptr as *mut npyffi::PyArrayObject, cell as _);
Self::from_owned_ptr(py, ptr)
Expand Down
10 changes: 10 additions & 0 deletions tests/to_py.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,16 @@ fn into_pyarray_cant_resize() {
})
}

#[test]
fn into_pyarray_can_write() {
let a = vec![1, 2, 3];
pyo3::Python::with_gil(|py| {
let arr = a.into_pyarray(py);
pyo3::py_run!(py, arr, "assert arr.flags['WRITEABLE']");
pyo3::py_run!(py, arr, "arr[1] = 4");
})
}

/// Check that into_pyarray works for ndarray of which the pointer of the first element is
/// not at the start. See https://github.com/PyO3/rust-numpy/issues/182 for more
#[test]
Expand Down