Merge branch 'master' into argmax

Tencent · Jan 19, 2025 · 60e3de0 · 60e3de0
2 parents 622b583 + ace8372
commit 60e3de0
Show file tree

Hide file tree

Showing 16 changed files with 3,669 additions and 1,774 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -52,6 +52,10 @@ if(NCNN_PIXEL)
         ncnn_add_example(yolov5_pnnx)
         ncnn_add_example(yolov7_pnnx)
         ncnn_add_example(yolov7)
+        ncnn_add_example(yolov8)
+        ncnn_add_example(yolov8_seg)
+        ncnn_add_example(yolov8_pose)
+        ncnn_add_example(yolov8_cls)
         ncnn_add_example(yolox)
         ncnn_add_example(mobilenetv2ssdlite)
         ncnn_add_example(mobilenetssd)
@@ -67,9 +71,9 @@ if(NCNN_PIXEL)
         ncnn_add_example(scrfd_crowdhuman)
         if(OpenCV_FOUND)
             ncnn_add_example(yolov4)
+            ncnn_add_example(yolov8_obb)
             ncnn_add_example(rvm)
             ncnn_add_example(p2pnet)
-            ncnn_add_example(yolov8)
         endif()
     else()
         message(WARNING "OpenCV not found and NCNN_SIMPLEOCV disabled, examples won't be built")