Merge pull request #364 from mulimoen/update/pyo3

Bump pyo3
sparsemat · Sep 22, 2024 · c889dcd · c889dcd
2 parents d83186c + cfb489d
commit c889dcd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/sprs-benches/.cargo/config → sprs-benches/.cargo/config.toml b/sprs-benches/.cargo/config → sprs-benches/.cargo/config.toml
diff --git a/sprs-benches/Cargo.toml b/sprs-benches/Cargo.toml
@@ -10,7 +10,7 @@ edition.workspace = true
 sprs = { version = "0.11.0", path = "../sprs" }
 sprs-rand = { version = "0.4.0", path = "../sprs-rand" }
 plotters = "0.3.4"
-pyo3 = { version = "0.18.3", features = ["auto-initialize"] }
+pyo3 = { version = "0.22.3", features = ["auto-initialize"] }
 
 [build-dependencies]
 cc = "1.0.52"

diff --git a/sprs-benches/src/main.rs b/sprs-benches/src/main.rs
@@ -6,16 +6,16 @@ use sprs::smmp;
 use sprs_rand::rand_csr_std;
 
 fn scipy_mat<'a>(
-    scipy_sparse: &'a PyModule,
+    scipy_sparse: &Bound<'a, PyModule>,
     py: Python,
     mat: &sprs::CsMat<f64>,
-) -> Result<&'a PyAny, String> {
+) -> Result<Bound<'a, PyAny>, String> {
     let indptr = mat.indptr().to_proper().to_vec();
     scipy_sparse
         .call_method(
             "csr_matrix",
             ((mat.data().to_vec(), mat.indices().to_vec(), indptr),),
-            Some([("shape", mat.shape())].into_py_dict(py)),
+            Some(&[("shape", mat.shape())].into_py_dict_bound(py)),
         )
         .map_err(|e| {
             let res = format!("Python error: {e:?}");
@@ -163,11 +163,12 @@ fn bench_densities_with_py(
         },
     ];
 
-    let scipy_sparse = PyModule::import(py, "scipy.sparse").map_err(|e| {
-        let res = format!("Python error: {e:?}");
-        e.print_and_set_sys_last_vars(py);
-        res
-    })?;
+    let scipy_sparse =
+        PyModule::import_bound(py, "scipy.sparse").map_err(|e| {
+            let res = format!("Python error: {e:?}");
+            e.print_and_set_sys_last_vars(py);
+            res
+        })?;
 
     for spec in &bench_specs {
         let shape = spec.shape;
@@ -264,13 +265,16 @@ fn bench_densities_with_py(
 
             // bench scipy as well
             {
-                let m1_py = scipy_mat(scipy_sparse, py, &m1)?;
-                let m2_py = scipy_mat(scipy_sparse, py, &m2)?;
+                let m1_py = scipy_mat(&scipy_sparse, py, &m1)?;
+                let m2_py = scipy_mat(&scipy_sparse, py, &m2)?;
                 let now = std::time::Instant::now();
                 let _prod_py = py
-                    .eval(
+                    .eval_bound(
                         "m1 * m2",
-                        Some([("m1", m1_py), ("m2", m2_py)].into_py_dict(py)),
+                        Some(
+                            &[("m1", m1_py), ("m2", m2_py)]
+                                .into_py_dict_bound(py),
+                        ),
                         None,
                     )
                     .map_err(|e| {