From 21d5ebd638319b3ec85eedc8832880f45f0976a6 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Mon, 12 Feb 2024 23:36:04 +0100 Subject: [PATCH] Try Apple M1 runners for Tests and Benchmarks CI (#8162) --- .github/workflows/ci.yaml | 10 +++++----- ultralytics/engine/exporter.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a7d40798..427ec120 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -94,7 +94,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, macos-14] python-version: ["3.11"] model: [yolov8n] steps: @@ -120,16 +120,16 @@ jobs: # run: coverage run -a --source=ultralytics -m ultralytics.cfg.__init__ benchmark model='path with spaces/${{ matrix.model }}.pt' imgsz=160 verbose=0.318 - name: Benchmark SegmentationModel shell: bash - run: coverage run -a --source=ultralytics -m ultralytics.cfg.__init__ benchmark model='path with spaces/${{ matrix.model }}-seg.pt' imgsz=160 verbose=0.286 + run: coverage run -a --source=ultralytics -m ultralytics.cfg.__init__ benchmark model='path with spaces/${{ matrix.model }}-seg.pt' imgsz=160 verbose=0.281 - name: Benchmark ClassificationModel shell: bash run: coverage run -a --source=ultralytics -m ultralytics.cfg.__init__ benchmark model='path with spaces/${{ matrix.model }}-cls.pt' imgsz=160 verbose=0.166 - name: Benchmark PoseModel shell: bash - run: coverage run -a --source=ultralytics -m ultralytics.cfg.__init__ benchmark model='path with spaces/${{ matrix.model }}-pose.pt' imgsz=160 verbose=0.185 + run: coverage run -a --source=ultralytics -m ultralytics.cfg.__init__ benchmark model='path with spaces/${{ matrix.model }}-pose.pt' imgsz=160 verbose=0.183 - name: Benchmark OBBModel shell: bash - run: coverage run -a --source=ultralytics -m ultralytics.cfg.__init__ benchmark model='path with spaces/${{ matrix.model }}-obb.pt' imgsz=160 verbose=0.360 + run: coverage run -a --source=ultralytics -m ultralytics.cfg.__init__ benchmark model='path with spaces/${{ matrix.model }}-obb.pt' imgsz=160 verbose=0.472 - name: Merge Coverage Reports run: | coverage xml -o coverage-benchmarks.xml @@ -152,7 +152,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, macos-14] python-version: ["3.11"] torch: [latest] include: diff --git a/ultralytics/engine/exporter.py b/ultralytics/engine/exporter.py index 10a020d9..d18f7a7f 100644 --- a/ultralytics/engine/exporter.py +++ b/ultralytics/engine/exporter.py @@ -497,7 +497,7 @@ class Exporter: """ YOLOv8 ncnn export using PNNX https://github.com/pnnx/pnnx. """ - check_requirements("git+https://github.com/Tencent/ncnn.git" if ARM64 else "ncnn") # requires ncnn + check_requirements("ncnn") import ncnn # noqa LOGGER.info(f"\n{prefix} starting export with ncnn {ncnn.__version__}...")