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

fix(gear-weights-diff): Fix format_diff and compilation #3430

Merged
merged 2 commits into from
Oct 20, 2023
Merged

fix(gear-weights-diff): Fix format_diff and compilation #3430

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
08bdcc2
Fixes in `weights-diff`
ark0f Oct 20, 2023
32ebaad
Fix reference
ark0f Oct 20, 2023
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
7 changes: 3 additions & 4 deletions utils/weight-diff/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
tabled.workspace = true

pallet-gear.workspace = true
frame-support.workspace = true

vara-runtime.workspace = true
pallet-gear = { workspace = true, features = ["std"] }
frame-support = { workspace = true, features = ["std"] }
vara-runtime = { workspace = true, features = ["std"] }
35 changes: 17 additions & 18 deletions utils/weight-diff/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ enum Commands {
Diff {
/// path to json file #1
#[arg(value_parser)]
output_path1: PathBuf,
before: PathBuf,
/// path to json file #2
#[arg(value_parser)]
output_path2: PathBuf,
after: PathBuf,
/// what runtime to compare?
#[arg(ignore_case = true, value_enum)]
runtime: Runtime,
Expand Down Expand Up @@ -173,16 +173,15 @@ fn format_value(value: Option<u64>, display_units: bool) -> String {
.unwrap_or_else(|| "N/A".into())
}

fn format_diff(value1: Option<u64>, value2: Option<u64>) -> String {
value1
.filter(|&a| a != 0)
.zip(value2)
.map(|(value1, value2)| {
let (value1, value2) = (value1 as f64, value2 as f64);
let percentage_diff = ((value1 / value2) - 1.0) * 100.0;
format!("{percentage_diff:+.2}%")
})
.unwrap_or_else(|| "N/A".into())
fn format_diff(before: Option<u64>, after: Option<u64>) -> String {
let after = after.filter(|&x| x != 0);
if let (Some(before), Some(after)) = (before, after) {
let (before, after) = (before as f64, after as f64);
let percentage_diff = (1.0 - before / after) * 100.0;
format!("{percentage_diff:+.2}%")
} else {
"N/A".to_string()
}
}

fn main() {
Expand All @@ -202,16 +201,16 @@ fn main() {
}
Commands::Diff {
display_units,
output_path1,
output_path2,
before,
after,
runtime,
kind,
} => {
let dump1: DeserializableDump =
serde_json::from_str(&fs::read_to_string(output_path1).unwrap()).unwrap();
serde_json::from_str(&fs::read_to_string(before).unwrap()).unwrap();

let dump2: DeserializableDump =
serde_json::from_str(&fs::read_to_string(output_path2).unwrap()).unwrap();
serde_json::from_str(&fs::read_to_string(after).unwrap()).unwrap();

let (schedule1, schedule2) = match runtime {
Runtime::Vara => (dump1.vara_schedule, dump2.vara_schedule),
Expand Down Expand Up @@ -248,8 +247,8 @@ fn main() {
let mut builder = Builder::default();
builder.set_columns([
"name".into(),
dump1.label.unwrap_or_else(|| "value1".into()),
dump2.label.unwrap_or_else(|| "value2".into()),
dump1.label.unwrap_or_else(|| "before".into()),
dump2.label.unwrap_or_else(|| "after".into()),
"diff".into(),
]);

Expand Down