Merge pull request #372 from sparsemat/dependabot/cargo/pyo3-0.23.1

sparsemat · Nov 19, 2024 · be00262 · be00262
2 parents cabaedb + 56f153d
commit be00262
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
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.22.3", features = ["auto-initialize"] }
+pyo3 = { version = "0.23.1", features = ["auto-initialize"] }
 
 [build-dependencies]
 cc = "1.0.52"

diff --git a/sprs-benches/src/main.rs b/sprs-benches/src/main.rs
@@ -7,15 +7,15 @@ use sprs_rand::rand_csr_std;
 
 fn scipy_mat<'a>(
     scipy_sparse: &Bound<'a, PyModule>,
-    py: Python,
+    py: Python<'a>,
     mat: &sprs::CsMat<f64>,
 ) -> 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_bound(py)),
+            Some(&[("shape", mat.shape())].into_py_dict(py).unwrap()),
         )
         .map_err(|e| {
             let res = format!("Python error: {e:?}");
@@ -163,12 +163,11 @@ fn bench_densities_with_py(
         },
     ];
 
-    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
-        })?;
+    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
+    })?;
 
     for spec in &bench_specs {
         let shape = spec.shape;
@@ -269,12 +268,9 @@ fn bench_densities_with_py(
                 let m2_py = scipy_mat(&scipy_sparse, py, &m2)?;
                 let now = std::time::Instant::now();
                 let _prod_py = py
-                    .eval_bound(
-                        "m1 * m2",
-                        Some(
-                            &[("m1", m1_py), ("m2", m2_py)]
-                                .into_py_dict_bound(py),
-                        ),
+                    .eval(
+                        c"m1 * m2",
+                        Some(&[("m1", m1_py), ("m2", m2_py)].into_py_dict(py)?),
                         None,
                     )
                     .map_err(|e| {