Skip to content

Update the pyo3 dependency to version 0.27.1. #89

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

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Update the pyo3 dependency to version 0.27.1. #89

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
b9710ed
Update the `pyo3` dependency to version 0.27.1.
JSorngard Oct 31, 2025
76bb265
Update `plot.rs` to use the latest version of `pyo3`
JSorngard Oct 31, 2025
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: 1 addition & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ peroxide-num = "0.1"
anyhow = "1.0"
paste = "1.0"
netcdf = { version = "0.7", optional = true, default-features = false }
pyo3 = { version = "0.22", optional = true, features = [
pyo3 = { version = "0.27.1", optional = true, features = [
"auto-initialize",
"gil-refs",
] }
blas = { version = "0.22", optional = true }
lapack = { version = "0.19", optional = true }
Expand Down
34 changes: 18 additions & 16 deletions src/util/plot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,14 @@
//! - `savefig` : Save plot with given path

extern crate pyo3;
use self::pyo3::types::IntoPyDict;
use self::pyo3::types::{IntoPyDict, PyDictMethods};
use self::pyo3::{PyResult, Python};
pub use self::Grid::{Off, On};
use self::PlotOptions::{Domain, Images, Pairs, Path};
use std::collections::HashMap;
use std::fmt::Display;
use std::borrow::BorrowMut;
use std::ffi::CString;

type Vector = Vec<f64>;

Expand Down Expand Up @@ -463,7 +465,7 @@ impl Plot for Plot2D {
}

// Plot
Python::with_gil(|py| {
Python::attach(|py| {
// Input data
let x = self.domain.clone();
let ys = self.images.clone();
Expand Down Expand Up @@ -502,24 +504,24 @@ impl Plot for Plot2D {
let plot_type = self.plot_type.clone();

// Global variables to plot
let globals =
vec![("plt", py.import_bound("matplotlib.pyplot")?)].into_py_dict_bound(py);
globals.as_gil_ref().set_item("x", x)?;
globals.as_gil_ref().set_item("y", ys)?;
globals.as_gil_ref().set_item("pair", pairs)?;
globals.as_gil_ref().set_item("n", y_length)?;
globals.as_gil_ref().set_item("p", pair_length)?;
let mut globals =
vec![("plt", py.import("matplotlib.pyplot")?)].into_py_dict(py)?;
globals.borrow_mut().set_item("x", x)?;
globals.borrow_mut().set_item("y", ys)?;
globals.borrow_mut().set_item("pair", pairs)?;
globals.borrow_mut().set_item("n", y_length)?;
globals.borrow_mut().set_item("p", pair_length)?;
if let Some(fs) = fig_size {
globals.as_gil_ref().set_item("fs", fs)?;
globals.borrow_mut().set_item("fs", fs)?;
}
globals.as_gil_ref().set_item("dp", dpi)?;
globals.as_gil_ref().set_item("gr", grid)?;
globals.as_gil_ref().set_item("pa", path)?;
globals.borrow_mut().set_item("dp", dpi)?;
globals.borrow_mut().set_item("gr", grid)?;
globals.borrow_mut().set_item("pa", path)?;
if let Some(xl) = self.xlim {
globals.as_gil_ref().set_item("xl", xl)?;
globals.borrow_mut().set_item("xl", xl)?;
}
if let Some(yl) = self.ylim {
globals.as_gil_ref().set_item("yl", yl)?;
globals.borrow_mut().set_item("yl", yl)?;
}

// Plot Code
Expand Down Expand Up @@ -702,7 +704,7 @@ impl Plot for Plot2D {
plot_string.push_str(&format!("plt.savefig(pa, dpi={})", dpi)[..]);
}

py.run_bound(&plot_string[..], Some(&globals), None)?;
py.run(&CString::new(plot_string)?, Some(&globals), None)?;
Ok(())
})
}
Expand Down