awooter: return of the progress bar

This commit is contained in:
Lofty 2022-11-27 14:50:27 +00:00
parent ae756e2d8c
commit cb7dba6dd5
3 changed files with 4 additions and 4 deletions

1
Cargo.lock generated
View File

@ -133,6 +133,7 @@ dependencies = [
"console",
"number_prefix",
"portable-atomic",
"rayon",
"unicode-width",
]

View File

@ -12,6 +12,6 @@ crate-type = ["staticlib"]
[dependencies]
libc = "0.2"
indicatif = "0.17"
indicatif = { version = "0.17", features = ["rayon"] }
rayon = "1.6"
colored = "2"

View File

@ -5,7 +5,7 @@ use std::{
};
use colored::Colorize;
use indicatif::{ProgressBar, ProgressStyle};
use indicatif::{ProgressBar, ProgressStyle, ParallelProgressIterator};
use rayon::prelude::*;
use crate::npnr::PortRef;
@ -287,6 +287,7 @@ fn partition_nets(
let arcs = dereffed_nets
.into_par_iter()
.progress_with(progress)
.filter(|(_, net)| !net.is_global())
.filter_map(|(name, net)| {
let source = unsafe { net.driver().as_ref().unwrap() };
@ -547,8 +548,6 @@ fn partition_nets(
}
}
progress.finish_and_clear();
log_info!(
" {} pips explored\n",
explored_pips.get_mut().to_string().bold()