Merge branch 'cat_dog_model' into 'master'

cat dog model

See merge request ai/esp-dl!204

Author: sun-xiangyu

.gitlab/ci/build.yml

@@ -172,6 +172,17 @@ build_example_cat_detect:
   variables:
     EXAMPLE_DIR: examples/cat_detect
 
+build_example_dog_detect:
+  extends:
+    - .build_examples_template
+    - .rules:build:example_dog_detect
+  parallel:
+    matrix:
+      - IMAGE: [espressif/idf:release-v5.3, espressif/idf:release-v5.5]
+        TARGET: [esp32p4, esp32s3]
+  variables:
+    EXAMPLE_DIR: examples/dog_detect
+
 build_example_color_detect:
   extends:
     - .build_examples_template

.gitlab/ci/rules.yml

@@ -55,6 +55,9 @@
 .patterns-model_cat_detect: &patterns-model_cat_detect
   - "models/cat_detect/**/*"
 
+.patterns-model_dog_detect: &patterns-model_dog_detect
+  - "models/dog_detect/**/*"
+
 .patterns-model_color_detect: &patterns-model_color_detect
   - "models/color_detect/**/*"
 
@@ -80,6 +83,9 @@
 .patterns-example_cat_detect: &patterns-example_cat_detect
 - "examples/cat_detect/**/*"
 
+.patterns-example_dog_detect: &patterns-example_dog_detect
+- "examples/dog_detect/**/*"
+
 .patterns-example_color_detect: &patterns-example_color_detect
 - "examples/color_detect/**/*"
 
@@ -256,6 +262,19 @@
     - <<: *if-dev-push
       changes: *patterns-gitlab-ci
 
+.rules:build:example_dog_detect:
+  rules:
+    - <<: *if-protected
+    - <<: *if-label-build
+    - <<: *if-dev-push
+      changes: *patterns-esp-dl
+    - <<: *if-dev-push
+      changes: *patterns-model_dog_detect
+    - <<: *if-dev-push
+      changes: *patterns-example_dog_detect
+    - <<: *if-dev-push
+      changes: *patterns-gitlab-ci
+
 .rules:build:example_color_detect:
   rules:
     - <<: *if-protected

examples/cat_detect/README.md

@@ -7,23 +7,22 @@
 
 # Cat Detect Example
 
-A simple image inference example. In this example, we use ``cat.jpg`` for test. With default setting(iou=0.7, conf=0.25), the detection result before quantization is shown below:
+A simple image inference example. In this example, we use ``cat.jpg`` for test. With default setting(iou=0.7, conf=0.6), the detection result before quantization is shown below:
 
-![](./img/cat_fp32.jpg)
+![](./img/cat_224_224_fp32.jpg)
 
 And the detection result of espdet_pico_224_224_cat after int8 quantization on ESP32-P4 is as follows:
 
-![](./img/cat_n_p4.jpg)
+![](./img/cat_224_224_int8_p4.jpg)
 
 ## Quick start
 
 Follow the [quick start](https://docs.espressif.com/projects/esp-dl/en/latest/getting_started/readme.html#quick-start) to flash the example, you will see the output in idf monitor:
 
 ```
-I (1563) cat_detect: [category: 0, score: 0.939913, x1: 357, y1: 212, x2: 639, y2: 479]
-I (1563) cat_detect: [category: 0, score: 0.851953, x1: 200, y1: 109, x2: 394, y2: 207]
-I (1573) cat_detect: [category: 0, score: 0.817575, x1: 74, y1: 250, x2: 280, y2: 336]
-I (1583) main_task: Returned from app_main()
+I (1555) cat_detect: [category: 0, score: 0.880797, x1: 0, y1: 171, x2: 428, y2: 479]
+I (1555) cat_detect: [category: 0, score: 0.851953, x1: 280, y1: 85, x2: 639, y2: 479]
+I (1565) main_task: Returned from app_main()
 ```
 
 ## Configurable Options in Menuconfig

examples/cat_detect/img/cat_224_224_fp32.jpg

@@ -1,7 +1,7 @@
 ## IDF Component Manager Manifest File
 dependencies:
   espressif/cat_detect:
-    version: "^0.1.0"
+    version: "^0.1.1"
     override_path: "../../../models/cat_detect"
   espressif/esp32_p4_function_ev_board_noglib:
     version: "^4.0.1"

examples/cat_detect/img/cat_224_224_int8_p4.jpg

@@ -0,0 +1,7 @@
+# The following lines of boilerplate have to be in your project's
+# CMakeLists in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+add_compile_options(-fdiagnostics-color=always)
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(dog_detect)