update pyo3 to 0.23 (#457)

* remove `gil-ref` feature * initial migration to pyo3 0.23 * fix all deprecations * reintroduce names with `_bound` suffix * switch from `ToPyObject` to `IntoPyObject` * bump to pyo3 0.23 release * fix doc-tests * add changelog
PyO3 · Nov 22, 2024 · c386c8e · c386c8e
1 parent 9eaa51f
commit c386c8e
Show file tree

Hide file tree

Showing 32 changed files with 839 additions and 2,097 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 - v0.23.0
   - Drop support for PyPy 3.7 and 3.8. ([#470](https://github.com/PyO3/rust-numpy/pull/470))
+  - Require `Element: Sync` as part of the free-threading support in PyO3 0.23 ([#469](https://github.com/PyO3/rust-numpy/pull/469))
+  - Bump PyO3 dependency to v0.23.0 ([[#457](https://github.com/PyO3/rust-numpy/pull/457)])
+    - removed the `gil-refs` feature
+    - reintroduced function names without `_bound` suffix + deprecating the old names
+    - switched to `IntoPyObject` as trait bound
+
 - v0.22.1
   - Fix building on 32-bit Windows. ([#463](https://github.com/PyO3/rust-numpy/pull/463))
   - Add `PyReadwriteArray::make_nonwriteable`. ([#462](https://github.com/PyO3/rust-numpy/pull/462))

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "numpy"
-version = "0.22.1"
+version = "0.23.0-dev"
 authors = [
     "The rust-numpy Project Developers",
     "PyO3 Project and Contributors <https://github.com/PyO3>"
@@ -22,15 +22,12 @@ num-complex = ">= 0.2, < 0.5"
 num-integer = "0.1"
 num-traits = "0.2"
 ndarray = ">= 0.15, < 0.17"
-pyo3 = { version = "0.22.0", default-features = false, features = ["macros"] }
+pyo3 = { version = "0.23.0", default-features = false, features = ["macros"] }
 rustc-hash = "1.1"
 
 [dev-dependencies]
-pyo3 = { version = "0.22.0", default-features = false, features = ["auto-initialize"] }
+pyo3 = { version = "0.23.0", default-features = false, features = ["auto-initialize"] }
 nalgebra = { version = ">=0.30, <0.34", default-features = false, features = ["std"] }
 
 [package.metadata.docs.rs]
 all-features = true
-
-[features]
-gil-refs = ["pyo3/gil-refs"]
diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ fn rust_ext<'py>(_py: Python<'py>, m: &Bound<'py, PyModule>) -> PyResult<()> {
         let x = x.as_array();
         let y = y.as_array();
         let z = axpy(a, x, y);
-        z.into_pyarray_bound(py)
+        z.into_pyarray(py)
     }
 
     // wrapper of `mult`
@@ -99,15 +99,15 @@ numpy = "0.22"
 
 ```rust
 use numpy::{PyArray1, PyArrayMethods};
-use pyo3::{types::{IntoPyDict, PyAnyMethods}, PyResult, Python};
+use pyo3::{types::{IntoPyDict, PyAnyMethods}, PyResult, Python, ffi::c_str};
 
 fn main() -> PyResult<()> {
     Python::with_gil(|py| {
-        let np = py.import_bound("numpy")?;
-        let locals = [("np", np)].into_py_dict_bound(py);
+        let np = py.import("numpy")?;
+        let locals = [("np", np)].into_py_dict(py)?;
 
         let pyarray = py
-            .eval_bound("np.absolute(np.array([-1, -2, -3], dtype='int32'))", Some(&locals), None)?
+            .eval(c_str!("np.absolute(np.array([-1, -2, -3], dtype='int32'))"), Some(&locals), None)?
             .downcast_into::<PyArray1<i32>>()?;
 
         let readonly = pyarray.readonly();

diff --git a/benches/array.rs b/benches/array.rs
@@ -6,12 +6,12 @@ use test::{black_box, Bencher};
 use std::ops::Range;
 
 use numpy::{PyArray1, PyArray2, PyArray3};
-use pyo3::{types::PyAnyMethods, Bound, Python, ToPyObject};
+use pyo3::{types::PyAnyMethods, Bound, Python};
 
 #[bench]
 fn extract_success(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let any = PyArray2::<f64>::zeros_bound(py, (10, 10), false).into_any();
+        let any = PyArray2::<f64>::zeros(py, (10, 10), false).into_any();
 
         bencher.iter(|| {
             black_box(&any)
@@ -24,7 +24,7 @@ fn extract_success(bencher: &mut Bencher) {
 #[bench]
 fn extract_failure(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let any = PyArray2::<f64>::zeros_bound(py, (10, 10), false).into_any();
+        let any = PyArray2::<f64>::zeros(py, (10, 10), false).into_any();
 
         bencher.iter(|| {
             black_box(&any)
@@ -37,7 +37,7 @@ fn extract_failure(bencher: &mut Bencher) {
 #[bench]
 fn downcast_success(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let any = PyArray2::<f64>::zeros_bound(py, (10, 10), false).into_any();
+        let any = PyArray2::<f64>::zeros(py, (10, 10), false).into_any();
 
         bencher.iter(|| black_box(&any).downcast::<PyArray2<f64>>().unwrap());
     });
@@ -46,7 +46,7 @@ fn downcast_success(bencher: &mut Bencher) {
 #[bench]
 fn downcast_failure(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let any = PyArray2::<f64>::zeros_bound(py, (10, 10), false).into_any();
+        let any = PyArray2::<f64>::zeros(py, (10, 10), false).into_any();
 
         bencher.iter(|| black_box(&any).downcast::<PyArray2<f64>>().unwrap_err());
     });
@@ -67,7 +67,7 @@ fn from_iter(bencher: &mut Bencher, size: usize) {
         bencher.iter(|| {
             let iter = black_box(Iter(0..size));
 
-            PyArray1::from_iter_bound(py, iter)
+            PyArray1::from_iter(py, iter)
         });
     });
 }
@@ -94,7 +94,7 @@ fn from_slice(bencher: &mut Bencher, size: usize) {
         bencher.iter(|| {
             let slice = black_box(&vec);
 
-            PyArray1::from_slice_bound(py, slice)
+            PyArray1::from_slice(py, slice)
         });
     });
 }
@@ -121,7 +121,7 @@ fn from_object_slice(bencher: &mut Bencher, size: usize) {
         bencher.iter(|| {
             let slice = black_box(&vec);
 
-            PyArray1::from_slice_bound(py, slice)
+            PyArray1::from_slice(py, slice)
         });
     });
 }
@@ -148,7 +148,7 @@ fn from_vec2(bencher: &mut Bencher, size: usize) {
         bencher.iter(|| {
             let vec2 = black_box(&vec2);
 
-            PyArray2::from_vec2_bound(py, vec2).unwrap()
+            PyArray2::from_vec2(py, vec2).unwrap()
         });
     });
 }
@@ -175,7 +175,7 @@ fn from_vec3(bencher: &mut Bencher, size: usize) {
         bencher.iter(|| {
             let vec3 = black_box(&vec3);
 
-            PyArray3::from_vec3_bound(py, vec3).unwrap()
+            PyArray3::from_vec3(py, vec3).unwrap()
         });
     });
 }

diff --git a/benches/borrow.rs b/benches/borrow.rs
@@ -9,7 +9,7 @@ use pyo3::Python;
 #[bench]
 fn initial_shared_borrow(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let array = PyArray::<f64, _>::zeros_bound(py, (6, 5, 4, 3, 2, 1), false);
+        let array = PyArray::<f64, _>::zeros(py, (6, 5, 4, 3, 2, 1), false);
 
         bencher.iter(|| {
             let array = black_box(&array);
@@ -22,7 +22,7 @@ fn initial_shared_borrow(bencher: &mut Bencher) {
 #[bench]
 fn additional_shared_borrow(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let array = PyArray::<f64, _>::zeros_bound(py, (6, 5, 4, 3, 2, 1), false);
+        let array = PyArray::<f64, _>::zeros(py, (6, 5, 4, 3, 2, 1), false);
 
         let _shared = (0..128).map(|_| array.readonly()).collect::<Vec<_>>();
 
@@ -37,7 +37,7 @@ fn additional_shared_borrow(bencher: &mut Bencher) {
 #[bench]
 fn exclusive_borrow(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let array = PyArray::<f64, _>::zeros_bound(py, (6, 5, 4, 3, 2, 1), false);
+        let array = PyArray::<f64, _>::zeros(py, (6, 5, 4, 3, 2, 1), false);
 
         bencher.iter(|| {
             let array = black_box(&array);

diff --git a/examples/linalg/Cargo.lock b/examples/linalg/Cargo.lock
diff --git a/examples/linalg/Cargo.toml b/examples/linalg/Cargo.toml
@@ -9,7 +9,7 @@ name = "rust_linalg"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.22.0", features = ["extension-module"] }
+pyo3 = { version = "0.23.0", features = ["extension-module"] }
 numpy = { path = "../.." }
 ndarray-linalg = { version = "0.14.1", features = ["openblas-system"] }
 

diff --git a/examples/linalg/src/lib.rs b/examples/linalg/src/lib.rs
@@ -13,7 +13,7 @@ fn rust_linalg<'py>(m: &Bound<'py, PyModule>) -> PyResult<()> {
         let y = x
             .inv()
             .map_err(|e| PyRuntimeError::new_err(e.to_string()))?;
-        Ok(y.into_pyarray_bound(py))
+        Ok(y.into_pyarray(py))
     }
     Ok(())
 }
diff --git a/examples/parallel/Cargo.toml b/examples/parallel/Cargo.toml
@@ -9,7 +9,7 @@ name = "rust_parallel"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.22.0", features = ["extension-module", "multiple-pymethods"] }
+pyo3 = { version = "0.23.0", features = ["extension-module", "multiple-pymethods"] }
 numpy = { path = "../.." }
 ndarray = { version = "0.16", features = ["rayon", "blas"] }
 blas-src = { version = "0.8", features = ["openblas"] }

diff --git a/examples/parallel/src/lib.rs b/examples/parallel/src/lib.rs
@@ -16,7 +16,7 @@ fn rust_parallel<'py>(m: &Bound<'py, PyModule>) -> PyResult<()> {
         let x = x.as_array();
         let y = y.as_array();
         let z = Zip::from(x.rows()).par_map_collect(|row| row.dot(&y));
-        z.into_pyarray_bound(py)
+        z.into_pyarray(py)
     }
     Ok(())
 }
diff --git a/examples/simple/Cargo.toml b/examples/simple/Cargo.toml
@@ -9,7 +9,7 @@ name = "rust_ext"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.22.0", features = ["extension-module", "abi3-py37"] }
+pyo3 = { version = "0.23.0", features = ["extension-module", "abi3-py37"] }
 numpy = { path = "../.." }
 
 [workspace]