Adjust progress_bar's format

jamjamjon · Sep 14, 2024 · 97af971 · 97af971
1 parent af8e8a3
commit 97af971
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/examples/dl/main.rs b/examples/dl/main.rs
@@ -2,7 +2,7 @@ use usls::{models::YOLO, Annotator, DataLoader, Options, Vision, YOLOTask, YOLOV
 
 fn main() -> anyhow::Result<()> {
     tracing_subscriber::fmt()
-        .with_max_level(tracing::Level::INFO)
+        .with_max_level(tracing::Level::ERROR)
         .init();
 
     let options = Options::new()
@@ -21,11 +21,11 @@ fn main() -> anyhow::Result<()> {
         // "rtsp://admin:[email protected]:554/h265/ch1/",
         // "rtsp://admin:[email protected]:554/h264/ch1/",
         // "../hall.mp4",
-        // "./assets/bus.jpg",
+        "./assets/bus.jpg",
         // "images/car.jpg",
         // "../set-negs",
         // "/home/qweasd/Desktop/coco/val2017/images/test",
-        "/home/qweasd/Desktop/SourceVideos/3.mp4",
+        // "/home/qweasd/Desktop/SourceVideos/3.mp4",
         // "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
     )?
     .with_batch(1)

diff --git a/src/core/dataloader.rs b/src/core/dataloader.rs
@@ -30,10 +30,7 @@ impl Iterator for DataLoaderIterator {
             Some(progress_bar) => {
                 progress_bar.inc(1);
                 match self.receiver.recv().ok() {
-                    Some(item) => {
-                        // progress_bar.inc(1);
-                        Some(item)
-                    }
+                    Some(item) => Some(item),
                     None => {
                         progress_bar.set_prefix("    Iterated");
                         progress_bar.finish();
@@ -55,7 +52,7 @@ impl IntoIterator for DataLoader {
                 self.nf / self.batch_size as u64,
                 "   Iterating",
                 Some(&format!("{:?}", self.media_type)),
-                "{prefix:.green.bold} {msg} {human_pos}/{human_len} |{bar}| {elapsed_precise}",
+                "{prefix:.green.bold} {human_pos}/{human_len} |{bar}| {elapsed_precise} | {msg} ",
             )
             .ok()
         } else {

diff --git a/src/core/options.rs b/src/core/options.rs
@@ -100,7 +100,7 @@ impl Default for Options {
             onnx_path: String::new(),
             device: Device::Cuda(0),
             profile: false,
-            num_dry_run: 5,
+            num_dry_run: 3,
             i00: None,
             i01: None,
             i02: None,

diff --git a/src/core/ort_engine.rs b/src/core/ort_engine.rs
@@ -288,7 +288,7 @@ impl OrtEngine {
                 self.num_dry_run as u64,
                 "      DryRun",
                 None,
-                "{prefix:.cyan.bold} {msg:.dim} {human_pos}/{human_len} |{bar}| {elapsed_precise}",
+                "{prefix:.green.bold} {human_pos}/{human_len} |{bar}| {elapsed_precise} | {msg}",
             )?;
 
             // dummy inputs
@@ -310,6 +310,8 @@ impl OrtEngine {
             }
             self.ts.clear();
 
+            // update
+            pb.set_message(format!("{:?}", self.device));
             pb.finish();
         }
         Ok(())