format (thank lsp) + update ver + allow v4 for onnx

Author: LdDl

Cargo.toml

@@ -10,7 +10,7 @@ keywords = [
   "yolo-v8",
 ]
 license = "MIT"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2021"
 rust-version = "1.73"
 authors = ["Dimitrii Lopanov <sexykdi@gmail.com>"]
@@ -47,7 +47,7 @@ name = "yolo_v8_n"
 
 [dependencies]
 lazy_static = "1.4.0"
-opencv = { version = "0.91.3", default-features = false, features = ["dnn", "imgcodecs", "imgproc"] }
+opencv = { version = "0.94.2", default-features = false, features = ["dnn", "imgcodecs", "imgproc"] }
 
 [patch.crates-io]
 cc = { git = "https://github.com/rust-lang/cc-rs.git", version = "1.0", tag = "1.0.79" }

examples/yolo_v4_tiny_onnx.rs

@@ -0,0 +1,51 @@
+use od_opencv::{model_classic::ModelYOLOClassic, model_format::ModelFormat};
+
+use opencv::{
+    core::{Scalar, Vector},
+    dnn::DNN_BACKEND_CUDA,
+    dnn::DNN_TARGET_CUDA,
+    imgcodecs::imread,
+    imgcodecs::imwrite,
+    imgproc::rectangle,
+    imgproc::LINE_4,
+};
+
+fn main() {
+    let classes_labels: Vec<&str> = vec!["car", "motorbike", "bus", "truck"];
+    let mf = ModelFormat::ONNX;
+    let net_width = 416;
+    let net_height = 416;
+    // let class_filters: Vec<usize> = vec![15, 16];
+    let class_filters: Vec<usize> = vec![];
+    let mut model = ModelYOLOClassic::new_from_file(
+        "pretrained/best_fp32.onnx",
+        None,
+        (net_width, net_height),
+        mf,
+        DNN_BACKEND_CUDA,
+        DNN_TARGET_CUDA,
+        vec![],
+    )
+    .unwrap();
+    let mut frame = imread(
+        "images/dog.jpg",
+        1,
+    )
+    .unwrap();
+    let (bboxes, class_ids, confidences) = model.forward(&frame, 0.75, 0.4).unwrap();
+    for (i, bbox) in bboxes.iter().enumerate() {
+        rectangle(
+            &mut frame,
+            *bbox,
+            Scalar::from((0.0, 255.0, 0.0)),
+            2,
+            LINE_4,
+            0,
+        )
+        .unwrap();
+        println!("Class: {}", classes_labels[class_ids[i]]);
+        println!("\tBounding box: {:?}", bbox);
+        println!("\tConfidences: {}", confidences[i]);
+    }
+    imwrite("images/dog_yolov4_tiny.jpg", &frame, &Vector::new()).unwrap();
+}

src/model.rs

@@ -26,7 +26,7 @@ pub trait ModelTrait {
 /// |                        | ModelFormat::Darknet | ModelFormat::ONNX |
 /// |------------------------|----------------------|------------------|
 /// | ModelVersion::V3       |                    + |                  |
-/// | ModelVersion::V4       |                    + |                  |
+/// | ModelVersion::V4       |                    + |                + |
 /// | ModelVersion::V7       |                    + |                  |
 /// | ModelVersion::V8       |                      |                + |
 ///