Improve the speed of resizing

jamjamjon · May 11, 2024 · 236f758 · 236f758
1 parent 64ca7e7
commit 236f758
Show file tree

Hide file tree

Showing 38 changed files with 298 additions and 123 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,4 +43,5 @@ imageproc = { version = "0.24" }
 ab_glyph = "0.2.23"
 geo = "0.28.0"
 prost = "0.12.4"
-human_bytes = "0.4.3"
+human_bytes = "0.4.3"
+fast_image_resize = "3.0.4"
diff --git a/assets/liuyifei.png b/assets/liuyifei.png
diff --git a/assets/portrait.jpg b/assets/portrait.jpg
diff --git a/examples/db/main.rs b/examples/db/main.rs
@@ -6,18 +6,18 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_i00((1, 4, 8).into())
         .with_i02((608, 960, 1280).into())
         .with_i03((608, 960, 1280).into())
+        // .with_trt(0)
         .with_confs(&[0.4])
         .with_min_width(5.0)
         .with_min_height(12.0)
-        // .with_trt(0)
         .with_model("ppocr-v4-db-dyn.onnx")?;
 
-    let mut model = DB::new(&options)?;
+    let mut model = DB::new(options)?;
 
     // load image
     let x = vec![
         DataLoader::try_read("./assets/db.png")?,
-        // DataLoader::try_read("./assets/2.jpg")?,
+        DataLoader::try_read("./assets/2.jpg")?,
     ];
 
     // run

diff --git a/examples/depth-anything/main.rs b/examples/depth-anything/main.rs
@@ -7,7 +7,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_i00((1, 1, 8).into())
         .with_i02((384, 512, 1024).into())
         .with_i03((384, 512, 1024).into());
-    let mut model = DepthAnything::new(&options)?;
+    let mut model = DepthAnything::new(options)?;
 
     // load
     let x = vec![DataLoader::try_read("./assets/2.jpg")?];

diff --git a/examples/dinov2/main.rs b/examples/dinov2/main.rs
@@ -7,7 +7,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_i00((1, 1, 1).into())
         .with_i02((224, 224, 224).into())
         .with_i03((224, 224, 224).into());
-    let _model = Dinov2::new(&options)?;
+    let _model = Dinov2::new(options)?;
     println!("TODO...");
 
     // query from vector

diff --git a/examples/face-parsing/main.rs b/examples/face-parsing/main.rs
@@ -10,7 +10,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         // .with_trt(0)
         // .with_fp16(true)
         .with_confs(&[0.5]);
-    let mut model = YOLO::new(&options)?;
+    let mut model = YOLO::new(options)?;
 
     // load image
     let x = vec![DataLoader::try_read("./assets/nini.png")?];

diff --git a/examples/fastsam/main.rs b/examples/fastsam/main.rs
@@ -8,7 +8,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_i02((416, 640, 800).into())
         .with_i03((416, 640, 800).into())
         .with_confs(&[0.4]);
-    let mut model = YOLO::new(&options)?;
+    let mut model = YOLO::new(options)?;
 
     // load image
     let x = vec![DataLoader::try_read("./assets/bus.jpg")?];

diff --git a/examples/modnet/demo.png b/examples/modnet/demo.png
diff --git a/examples/modnet/main.rs b/examples/modnet/main.rs
@@ -7,10 +7,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_i00((1, 1, 4).into())
         .with_i02((416, 512, 800).into())
         .with_i03((416, 512, 800).into());
-    let mut model = MODNet::new(&options)?;
+    let mut model = MODNet::new(options)?;
 
     // load image
-    let x = vec![DataLoader::try_read("./assets/portrait.jpg")?];
+    let x = vec![DataLoader::try_read("./assets/liuyifei.png")?];
 
     // run
     let y = model.run(&x)?;

diff --git a/examples/rtdetr/main.rs b/examples/rtdetr/main.rs
@@ -4,9 +4,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     // build model
     let options = Options::default()
         .with_model("rtdetr-l-f16.onnx")?
-        .with_confs(&[0.4, 0.15]) // person: 0.4, others: 0.15
+        .with_confs(&[0.4, 0.15])
         .with_names(&coco::NAMES_80);
-    let mut model = RTDETR::new(&options)?;
+    let mut model = RTDETR::new(options)?;
 
     // load image
     let x = vec![DataLoader::try_read("./assets/bus.jpg")?];

diff --git a/examples/rtmo/main.rs b/examples/rtmo/main.rs
@@ -8,7 +8,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_nk(17)
         .with_confs(&[0.3])
         .with_kconfs(&[0.5]);
-    let mut model = RTMO::new(&options)?;
+    let mut model = RTMO::new(options)?;
 
     // load image
     let x = vec![DataLoader::try_read("./assets/bus.jpg")?];

diff --git a/examples/svtr/main.rs b/examples/svtr/main.rs
@@ -8,7 +8,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_confs(&[0.2])
         .with_vocab("ppocr_rec_vocab.txt")?
         .with_model("ppocr-v4-svtr-ch-dyn.onnx")?;
-    let mut model = SVTR::new(&options)?;
+    let mut model = SVTR::new(options)?;
 
     // load images
     let dl = DataLoader::default()

diff --git a/examples/yolo-world/main.rs b/examples/yolo-world/main.rs
@@ -7,9 +7,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_i00((1, 1, 4).into())
         .with_i02((416, 640, 800).into())
         .with_i03((416, 640, 800).into())
-        .with_confs(&[0.3]) // shoes: 0.2
+        .with_confs(&[0.3])
         .with_profile(false);
-    let mut model = YOLO::new(&options)?;
+    let mut model = YOLO::new(options)?;
 
     // load image
     let x = vec![DataLoader::try_read("./assets/bus.jpg")?];

diff --git a/examples/yolop/main.rs b/examples/yolop/main.rs
@@ -6,7 +6,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_model("yolopv2-dyn-480x800.onnx")?
         .with_i00((1, 1, 8).into())
         .with_confs(&[0.3]);
-    let mut model = YOLOPv2::new(&options)?;
+    let mut model = YOLOPv2::new(options)?;
 
     // load image
     let x = vec![DataLoader::try_read("./assets/car.jpg")?];

diff --git a/examples/yolov5/main.rs b/examples/yolov5/main.rs
@@ -10,13 +10,12 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_anchors_first(true)
         .with_yolo_task(YOLOTask::Segment)
         .with_model("yolov5s-seg.onnx")?
-        .with_trt(0)
-        .with_fp16(true)
+        // .with_trt(0)
+        // .with_fp16(true)
         .with_i00((1, 1, 4).into())
         .with_i02((224, 640, 800).into())
-        .with_i03((224, 640, 800).into())
-        .with_dry_run(3);
-    let mut model = YOLO::new(&options)?;
+        .with_i03((224, 640, 800).into());
+    let mut model = YOLO::new(options)?;
 
     // load image
     let x = vec![DataLoader::try_read("./assets/bus.jpg")?];

diff --git a/examples/yolov8-face/demo.png b/examples/yolov8-face/demo.png
diff --git a/examples/yolov8-face/main.rs b/examples/yolov8-face/main.rs
@@ -8,7 +8,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_i02((416, 640, 800).into())
         .with_i03((416, 640, 800).into())
         .with_confs(&[0.15]);
-    let mut model = YOLO::new(&options)?;
+    let mut model = YOLO::new(options)?;
 
     // load image
     let x = vec![DataLoader::try_read("./assets/kids.jpg")?];

diff --git a/examples/yolov8-falldown/main.rs b/examples/yolov8-falldown/main.rs
@@ -3,7 +3,7 @@ use usls::{models::YOLO, Annotator, DataLoader, Options};
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     // build model
     let options = Options::default().with_model("yolov8-falldown-f16.onnx")?;
-    let mut model = YOLO::new(&options)?;
+    let mut model = YOLO::new(options)?;
 
     // load image
     let x = vec![DataLoader::try_read("./assets/falldown.jpg")?];

diff --git a/examples/yolov8-head/main.rs b/examples/yolov8-head/main.rs
@@ -3,7 +3,7 @@ use usls::{models::YOLO, Annotator, DataLoader, Options};
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     // build model
     let options = Options::default().with_model("yolov8-head-f16.onnx")?;
-    let mut model = YOLO::new(&options)?;
+    let mut model = YOLO::new(options)?;
 
     // load image
     let x = vec![DataLoader::try_read("./assets/kids.jpg")?];

diff --git a/examples/yolov8-trash/main.rs b/examples/yolov8-trash/main.rs
@@ -5,7 +5,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let options = Options::default()
         .with_model("yolov8-plastic-bag-f16.onnx")?
         .with_names(&["trash"]);
-    let mut model = YOLO::new(&options)?;
+    let mut model = YOLO::new(options)?;
 
     // load image
     let x = vec![DataLoader::try_read("./assets/trash.jpg")?];

diff --git a/examples/yolov8/main.rs b/examples/yolov8/main.rs
@@ -10,18 +10,18 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         // .with_model("yolov8m-seg-dyn.onnx")?
         // .with_model("yolov8m-obb-dyn.onnx")?
         // .with_model("yolov8m-oiv7-dyn.onnx")?
-        .with_trt(0)
+        // .with_trt(0)
         // .with_fp16(true)
         // .with_coreml(0)
         // .with_cuda(3)
         .with_i00((1, 1, 4).into())
         .with_i02((224, 640, 800).into())
         .with_i03((224, 640, 800).into())
-        .with_confs(&[0.4, 0.15]) // person: 0.4, others: 0.15
+        .with_confs(&[0.4, 0.15]) // class 0: 0.4, others: 0.15
         .with_names2(&coco::KEYPOINTS_NAMES_17)
-        .with_dry_run(10)
-        .with_profile(false);
-    let mut model = YOLO::new(&options)?;
+        // .with_dry_run(10)
+        .with_profile(true);
+    let mut model = YOLO::new(options)?;
 
     // build dataloader
     let dl = DataLoader::default()

diff --git a/examples/yolov9/main.rs b/examples/yolov9/main.rs
@@ -7,8 +7,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_i00((1, 1, 4).into())
         .with_i02((416, 640, 800).into())
         .with_i03((416, 640, 800).into())
-        .with_confs(&[0.4, 0.15]); // person: 0.4, others: 0.15
-    let mut model = YOLO::new(&options)?;
+        .with_confs(&[0.4, 0.15]);
+    let mut model = YOLO::new(options)?;
 
     // load image
     let x = vec![DataLoader::try_read("./assets/bus.jpg")?];

diff --git a/src/core/annotator.rs b/src/core/annotator.rs
@@ -495,7 +495,7 @@ impl Annotator {
 
                 // keypoint
                 let color = match &self.keypoints_palette {
-                    None => self.get_color(i + 10),
+                    None => self.get_color(i),
                     Some(keypoints_palette) => keypoints_palette[i],
                 };
                 imageproc::drawing::draw_filled_circle_mut(