Add DEIMv2 model (#142)

Author: jamjamjon

README.md

@@ -80,6 +80,7 @@ usls = "latest-version"
 | [DocLayout-YOLO](https://github.com/opendatalab/DocLayout-YOLO) | Object Detection | [demo](examples/picodet-layout) |
 | [D-FINE](https://github.com/manhbd-22022602/D-FINE) | Object Detection | [demo](examples/d-fine) |
 | [DEIM](https://github.com/ShihuaHuang95/DEIM) | Object Detection | [demo](examples/deim) |
+| [DEIMv2](https://github.com/Intellindust-AI-Lab/DEIMv2) | Object Detection | [demo](examples/deimv2) |
 | [RTMPose](https://github.com/open-mmlab/mmpose/tree/dev-1.x/projects/rtmpose) | Keypoint Detection | [demo](examples/rtmpose) |
 | [DWPose](https://github.com/IDEA-Research/DWPose) | Keypoint Detection | [demo](examples/dwpose) |
 | [RTMW](https://arxiv.org/abs/2407.08634) | Keypoint Detection | [demo](examples/rtmw) |

examples/d-fine/main.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use usls::{models::RTDETR, Annotator, Config, DataLoader};
+use usls::{models::DFINE, Annotator, Config, DataLoader};
 
 fn main() -> Result<()> {
     tracing_subscriber::fmt()
@@ -8,7 +8,7 @@ fn main() -> Result<()> {
         .init();
 
     // config
-    let mut model = RTDETR::new(Config::d_fine_n_coco().commit()?)?;
+    let mut model = DFINE::new(Config::d_fine_n_coco().commit()?)?;
 
     // load
     let xs = DataLoader::try_read_n(&["./assets/bus.jpg"])?;

examples/deim/main.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use usls::{models::RTDETR, Annotator, Config, DataLoader};
+use usls::{models::DEIM, Annotator, Config, DataLoader};
 
 fn main() -> Result<()> {
     tracing_subscriber::fmt()
@@ -8,7 +8,7 @@ fn main() -> Result<()> {
         .init();
 
     // config
-    let mut model = RTDETR::new(Config::deim_dfine_s_coco().commit()?)?;
+    let mut model = DEIM::new(Config::deim_dfine_s_coco().commit()?)?;
 
     // load
     let xs = DataLoader::try_read_n(&["./assets/bus.jpg"])?;

examples/deimv2/README.md

@@ -0,0 +1,7 @@
+## Quick Start
+
+```shell
+cargo run -r --example deimv2
+```
+
+

examples/deimv2/main.rs

@@ -0,0 +1,60 @@
+use anyhow::Result;
+use usls::{models::RTDETR, Annotator, Config, DataLoader};
+
+#[derive(argh::FromArgs)]
+/// Example
+struct Args {
+    /// model file
+    #[argh(option)]
+    model: Option<String>,
+
+    /// device
+    #[argh(option, default = "String::from(\"cpu:0\")")]
+    device: String,
+
+    /// dtype
+    #[argh(option, default = "String::from(\"fp16\")")]
+    dtype: String,
+}
+
+fn main() -> Result<()> {
+    tracing_subscriber::fmt()
+        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
+        .with_timer(tracing_subscriber::fmt::time::ChronoLocal::rfc_3339())
+        .init();
+
+    let args: Args = argh::from_env();
+
+    // config
+    let config = match &args.model {
+        Some(m) => Config::deimv2().with_model_file(m),
+        None => Config::deim_v2_n_coco(),
+    }
+    .with_model_dtype(args.dtype.parse()?)
+    .with_device_all(args.device.parse()?)
+    .commit()?;
+    let mut model = RTDETR::new(config)?;
+
+    // load
+    let xs = DataLoader::try_read_n(&["./assets/bus.jpg"])?;
+
+    // run
+    let ys = model.forward(&xs)?;
+    println!("{:?}", ys);
+
+    // annotate
+    let annotator = Annotator::default();
+    for (x, y) in xs.iter().zip(ys.iter()) {
+        annotator.annotate(x, y)?.save(format!(
+            "{}.jpg",
+            usls::Dir::Current
+                .base_dir_with_subs(&["runs", model.spec()])?
+                .join(usls::timestamp(None))
+                .display(),
+        ))?;
+    }
+
+    usls::perf(false);
+
+    Ok(())
+}

src/models/d_fine/mod.rs

@@ -1 +1,3 @@
 mod config;
+
+pub type DFINE = crate::RTDETR;

src/models/deim/mod.rs

@@ -1 +1,3 @@
 mod config;
+
+pub type DEIM = crate::RTDETR;

src/models/deimv2/README.md

@@ -0,0 +1,9 @@
+# DEIMv2: Real-Time Object Detection Meets DINOv3
+
+## Official Repository
+
+The official repository can be found on: [GitHub](https://github.com/Intellindust-AI-Lab/DEIMv2)
+
+## Example
+
+Refer to the [example](../../../examples/deimv2)

src/models/deimv2/config.rs

@@ -0,0 +1,38 @@
+/// Model configuration for `DEIMv2`
+impl crate::Config {
+    pub fn deimv2() -> Self {
+        Self::d_fine().with_name("deimv2")
+    }
+
+    pub fn deim_v2_atto_coco() -> Self {
+        Self::deimv2().with_model_file("hgnetv2-atto-coco.onnx")
+    }
+
+    pub fn deim_v2_femto_coco() -> Self {
+        Self::deimv2().with_model_file("hgnetv2-femto-coco.onnx")
+    }
+
+    pub fn deim_v2_pico_coco() -> Self {
+        Self::deimv2().with_model_file("hgnetv2-pico-coco.onnx")
+    }
+
+    pub fn deim_v2_n_coco() -> Self {
+        Self::deimv2().with_model_file("hgnetv2-n-coco.onnx")
+    }
+
+    pub fn deim_v2_s_coco() -> Self {
+        Self::deimv2().with_model_file("dinov3-s-coco.onnx")
+    }
+
+    pub fn deim_v2_m_coco() -> Self {
+        Self::deimv2().with_model_file("dinov3-m-coco.onnx")
+    }
+
+    pub fn deim_v2_l_coco() -> Self {
+        Self::deimv2().with_model_file("dinov3-l-coco.onnx")
+    }
+
+    pub fn deim_v2_x_coco() -> Self {
+        Self::deimv2().with_model_file("dinov3-x-coco.onnx")
+    }
+}

src/models/deimv2/mod.rs

@@ -0,0 +1,3 @@
+mod config;
+
+pub type DEIMv2 = crate::RTDETR;