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

deps: update pyo3 requirement from 0.22.3 to 0.23.1 #372

Merged
merged 2 commits into from
Nov 19, 2024
Merged

deps: update pyo3 requirement from 0.22.3 to 0.23.1 #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9ca295
deps: update pyo3 requirement from 0.22.3 to 0.23.1
dependabot[bot] Nov 18, 2024
56f153d
Update pyo3 code
mulimoen Nov 19, 2024
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
2 changes: 1 addition & 1 deletion sprs-benches/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
24 changes: 10 additions & 14 deletions sprs-benches/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:?}");
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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| {
Expand Down
Loading