Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try Apple M1 runners for Tests and Benchmarks CI #8162

Merged
merged 10 commits into from
Feb 12, 2024
Merged

Try Apple M1 runners for Tests and Benchmarks CI #8162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ad86d32
Try Apple M1 runners for Tests and Benchmarks CI
glenn-jocher Feb 12, 2024
6361cb9
Update test_python.py
glenn-jocher Feb 12, 2024
7634928
Merge branch 'main' into apple-m1-runners
glenn-jocher Feb 12, 2024
7edbebf
Update ci.yaml
glenn-jocher Feb 12, 2024
23f43d0
Merge branch 'main' into apple-m1-runners
glenn-jocher Feb 12, 2024
447312a
Update exporter.py
glenn-jocher Feb 12, 2024
4dcab07
Update ci.yaml
glenn-jocher Feb 12, 2024
b3548c1
Update ci.yaml
glenn-jocher Feb 12, 2024
e33797a
Update ci.yaml
glenn-jocher Feb 12, 2024
5c77338
Update ci.yaml
glenn-jocher Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ultralytics/engine/exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@
"""
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")

Check warning on line 500 in ultralytics/engine/exporter.py

View check run for this annotation

Codecov / codecov/patch

ultralytics/engine/exporter.py#L500 

Added line #L500 was not covered by tests
import ncnn # noqa

LOGGER.info(f"\n{prefix} starting export with ncnn {ncnn.__version__}...")
Expand Down