From d02a0e5d4fc3d587ab32261cb5da532cbc8978ed Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Sun, 27 Oct 2024 18:32:56 +0100 Subject: [PATCH 1/3] Ultralytics Cleanup Disk action in docker.yaml (#17194) --- .github/workflows/docker.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 8d9f749e19..c299bc5bfd 100644 --- a/.github/workflows/docker.yaml +++ b/.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 From e1e54602dfbf6b9c52aaaa340681a5a8b8f089f4 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Sun, 27 Oct 2024 19:09:17 +0100 Subject: [PATCH 2/3] Disable HUB CI temporarily (#17196) --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 796a08968a..43f5d4cfeb 100644 --- a/.github/workflows/ci.yaml +++ b/.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 From da1bf9d79d4063eb9f389f9e7509cd936e21a9cc Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Mon, 28 Oct 2024 20:17:35 +0100 Subject: [PATCH 3/3] Pin `numpy<=2.0.0` on macOS (#17221) --- pyproject.toml | 3 ++- ultralytics/engine/exporter.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f6cb23204a..2545739bab 100644 --- a/pyproject.toml +++ b/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", diff --git a/ultralytics/engine/exporter.py b/ultralytics/engine/exporter.py index 6d403a2afb..49e84af9f5 100644 --- a/ultralytics/engine/exporter.py +++ b/ultralytics/engine/exporter.py @@ -457,6 +457,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