caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

awooter: return of the progress bar

Browse Source
This commit is contained in:
Lofty 2022-11-27 14:50:27 +00:00
parent d7dbaa2c7e
commit fbbcf6aa67
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

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

2
common/route/awooter/rust/Cargo.toml
View File

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

5
common/route/awooter/rust/src/lib.rs
View File

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