Merge branch 'main' into rknn2

.github/workflows/ci.yaml

@@ -39,7 +39,8 @@ on:
 
 jobs:
   HUB:
-    if: github.repository == 'ultralytics/ultralytics' && (github.event_name == 'schedule' || github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.hub == 'true'))
+    # if: github.repository == 'ultralytics/ultralytics' && (github.event_name == 'schedule' || github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.hub == 'true'))
+    if: github.repository == 'ultralytics/ultralytics' && 'workflow_dispatch' && github.event.inputs.hub == 'true'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false

.github/workflows/docker.yaml

@@ -84,11 +84,8 @@ jobs:
     outputs:
       new_release: ${{ steps.check_tag.outputs.new_release }}
     steps:
-      - name: Cleanup disk
-        # Free up to 30GB of disk space per https://github.com/ultralytics/ultralytics/pull/15848
-        uses: jlumbroso/free-disk-space@v1.3.1
-        with:
-          tool-cache: true
+      - name: Cleanup disk space
+        uses: ultralytics/actions/cleanup-disk@main
 
       - name: Checkout repo
         uses: actions/checkout@v4

pyproject.toml

@@ -61,7 +61,8 @@ classifiers = [
 
 # Required dependencies ------------------------------------------------------------------------------------------------
 dependencies = [
-    "numpy>=1.23.0", # temporary patch for compat errors https://github.com/ultralytics/yolov5/actions/runs/9538130424/job/26286956354
+    "numpy>=1.23.0",
+    "numpy<2.0.0; sys_platform == 'darwin'", # macOS OpenVINO errors https://github.com/ultralytics/ultralytics/pull/17221
     "matplotlib>=3.3.0",
     "opencv-python>=4.6.0",
     "pillow>=7.1.2",

ultralytics/engine/exporter.py

@@ -467,6 +467,7 @@ class Exporter:
     @try_export
     def export_openvino(self, prefix=colorstr("OpenVINO:")):
         """YOLO OpenVINO export."""
+        # WARNING: numpy>=2.0.0 issue with OpenVINO on macOS https://github.com/ultralytics/ultralytics/pull/17221
         check_requirements(f'openvino{"<=2024.0.0" if ARM64 else ">=2024.0.0"}')  # fix OpenVINO issue on ARM64
         import openvino as ov