Using Rayon to accelarate YOLO post-processing

jamjamjon · Jul 4, 2024 · ffa8ec5 · ffa8ec5
1 parent 25d9088
commit ffa8ec5
Show file tree

Hide file tree

Showing 32 changed files with 418 additions and 668 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,19 +2,19 @@
 
 ### Added
 
-- Add X struct to handle input and preprocessing  
+- Add X struct to handle input and preprocessing
 - Add Ops struct to manage common operations
 - Use SIMD (fast_image_resize) to accelerate model pre-processing and post-processing.YOLOv8-seg post-processing (~120ms => ~20ms), Depth-Anything post-processing (~23ms => ~2ms).
 
 ### Deprecated
-- Mark `Ops::descale_mask()` as deprecated.
 
+- Mark `Ops::descale_mask()` as deprecated.
 
-### Fixed 
+### Fixed
 
 ### Changed
 
-### Removed 
+### Removed
 
 ### Refactored
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "usls"
-version = "0.0.4"
+version = "0.0.5"
 edition = "2021"
 description = "A Rust library integrated with ONNXRuntime, providing a collection of ML models."
 repository = "https://github.com/jamjamjon/usls"
@@ -11,7 +11,7 @@ exclude = ["assets/*", "examples/*"]
 
 [dependencies]
 clap = { version = "4.2.4", features = ["derive"] }
-ndarray = { version = "0.15.6" }
+ndarray = { version = "0.15.6", features = ["rayon"] }
 ort = { version = "2.0.0-rc.2", default-features = false, features = [
     "load-dynamic",
     "copy-dylibs",

diff --git a/README.md b/README.md
diff --git a/examples/face-parsing/README.md b/examples/face-parsing/README.md
diff --git a/examples/face-parsing/main.rs b/examples/face-parsing/main.rs
diff --git a/examples/fastsam/README.md b/examples/fastsam/README.md
diff --git a/examples/fastsam/main.rs b/examples/fastsam/main.rs
diff --git a/examples/yolov8-face/README.md b/examples/yolov8-face/README.md
diff --git a/examples/yolov8-face/main.rs b/examples/yolov8-face/main.rs
diff --git a/examples/yolov8-falldown/README.md b/examples/yolov8-falldown/README.md
diff --git a/examples/yolov8-falldown/main.rs b/examples/yolov8-falldown/main.rs
diff --git a/examples/yolov8-head/README.md b/examples/yolov8-head/README.md
diff --git a/examples/yolov8-head/main.rs b/examples/yolov8-head/main.rs
diff --git a/examples/yolov8-trash/README.md b/examples/yolov8-trash/README.md
diff --git a/examples/yolov8-trash/main.rs b/examples/yolov8-trash/main.rs
diff --git a/examples/yolov8/README.md b/examples/yolov8/README.md
@@ -26,10 +26,24 @@ yolo export model=yolov8m-obb.pt format=onnx simplify
 
 ## Result
 
-|         Task         | Annotated image       |
-| :-------------------: | --------------------- |
-| Obb | ![img](./demo-obb.png)  |
-| Instance Segmentation | ![img](./demo-seg.png)  |
-|    Classification    | ![img](./demo-cls.png)  |
-|       Detection       | ![img](./demo-det.png)  |
-|         Pose         | ![img](./demo-pose.png) |
+|         Task         | Annotated image                                             |
+| :-------------------: | ----------------------------------------------------------- |
+|          Obb          |                                                             |
+| Instance Segmentation | `<img src='examples/yolov8/demo-seg.png' width="800px">`  |
+|    Classification    | `<img src='examples/yolov8/demo-cls.png' width="800px">`  |
+|       Detection       | `<img src='examples/yolov8/demo-det.png' width="800px">`  |
+|         Pose         | `<img src='examples/yolov8/demo-pose.png' width="800px">` |
+
+## Other YOLOv8 Solution Models
+
+|          Model          |                                                                                                       Weights                                                                                                       |                                     Result                                     | Datasets                                                                                                                                                                                                                                                                                                                  |
+| :---------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Face-Landmark Detection |                                                      [yolov8-face-dyn-f16](https://github.com/jamjamjon/assets/releases/download/v0.0.1/yolov8-face-dyn-f16.onnx)                                                      |   `<img src='examples/yolov8-face/demo.png'  width="220px" height="180px">`   |                                                                                                                                                                                                                                                                                                                           |
+|     Head Detection     |                                                          [yolov8-head-f16](https://github.com/jamjamjon/assets/releases/download/v0.0.1/yolov8-head-f16.onnx)                                                          |   `<img src='examples/yolov8-head/demo.png'  width="220px" height="180px">`   |                                                                                                                                                                                                                                                                                                                           |
+|     Fall Detection     |                                                      [yolov8-falldown-f16](https://github.com/jamjamjon/assets/releases/download/v0.0.1/yolov8-falldown-f16.onnx)                                                      | `<img src='examples/yolov8-falldown/demo.png'  width="220px" height="180px">` |                                                                                                                                                                                                                                                                                                                           |
+|     Trash Detection     |                                                   [yolov8-plastic-bag-f16](https://github.com/jamjamjon/assets/releases/download/v0.0.1/yolov8-plastic-bag-f16.onnx)                                                   |  `<img src='examples/yolov8-trash/demo.png'  width="250px" height="180px">`  |                                                                                                                                                                                                                                                                                                                           |
+|         FastSAM         |                                                        [FastSAM-s-dyn-f16](https://github.com/jamjamjon/assets/releases/download/v0.0.1/FastSAM-s-dyn-f16.onnx)                                                        |                                                                                |                                                                                                                                                                                                                                                                                                                           |
+|       FaceParsing       | [face-parsing-dyn](https://github.com/jamjamjon/assets/releases/download/v0.0.1/face-parsing-dyn.onnx)<br />[face-parsing-dyn-f16](https://github.com/jamjamjon/assets/releases/download/v0.0.1/face-parsing-dyn-f16.onnx) |                                                                                | [CelebAMask-HQ](https://github.com/switchablenorms/CelebAMask-HQ/tree/master/face_parsing)<br />[[Processed YOLO labels]](https://github.com/jamjamjon/assets/releases/download/v0.0.1/CelebAMask-HQ-YOLO-Labels.zip)[[Python Script]](https://github.com/jamjamjon/assets/releases/download/v0.0.1/CelebAMask-HQ-YOLO-Labels.zip) |
+|                        |                                                                                                                                                                                                                      |                                                                                |                                                                                                                                                                                                                                                                                                                           |
+|                        |                                                                                                                                                                                                                      |                                                                                |                                                                                                                                                                                                                                                                                                                           |
+|                        |                                                                                                                                                                                                                      |                                                                                |                                                                                                                                                                                                                                                                                                                           |
diff --git a/examples/yolov8/demo-cls.png → examples/yolov8/demos/demo-cls.png b/examples/yolov8/demo-cls.png → examples/yolov8/demos/demo-cls.png
diff --git a/examples/yolov8/demo-det.png → examples/yolov8/demos/demo-det.png b/examples/yolov8/demo-det.png → examples/yolov8/demos/demo-det.png
diff --git a/examples/face-parsing/demo.png → examples/yolov8/demos/demo-face-parsing.png b/examples/face-parsing/demo.png → examples/yolov8/demos/demo-face-parsing.png
diff --git a/examples/yolov8-face/demo.png → examples/yolov8/demos/demo-face.png b/examples/yolov8-face/demo.png → examples/yolov8/demos/demo-face.png
diff --git a/examples/yolov8-falldown/demo.png → examples/yolov8/demos/demo-falldown.png b/examples/yolov8-falldown/demo.png → examples/yolov8/demos/demo-falldown.png
diff --git a/examples/fastsam/demo.png → examples/yolov8/demos/demo-fastsam.png b/examples/fastsam/demo.png → examples/yolov8/demos/demo-fastsam.png
diff --git a/examples/yolov8-head/demo.png → examples/yolov8/demos/demo-head.png b/examples/yolov8-head/demo.png → examples/yolov8/demos/demo-head.png
diff --git a/examples/yolov8/demo-obb-2.png → examples/yolov8/demos/demo-obb-2.png b/examples/yolov8/demo-obb-2.png → examples/yolov8/demos/demo-obb-2.png
diff --git a/examples/yolov8/demo-obb.png → examples/yolov8/demos/demo-obb.png b/examples/yolov8/demo-obb.png → examples/yolov8/demos/demo-obb.png
diff --git a/examples/yolov8/demo-pose.png → examples/yolov8/demos/demo-pose.png b/examples/yolov8/demo-pose.png → examples/yolov8/demos/demo-pose.png
diff --git a/examples/yolov8/demo-seg.png → examples/yolov8/demos/demo-seg.png b/examples/yolov8/demo-seg.png → examples/yolov8/demos/demo-seg.png
diff --git a/examples/yolov8-trash/demo.png → examples/yolov8/demos/demo-trash.png b/examples/yolov8-trash/demo.png → examples/yolov8/demos/demo-trash.png