Merge branch 'ultralytics:master' into master

.github/workflows/ci-testing.yml

@@ -18,18 +18,18 @@ jobs:
  fail-fast: false
  matrix:
  os: [ubuntu-latest]
- python-version: ["3.11"] # requires python<=3.10
+ python-version: ["3.11"] # requires python<=3.11
  model: [yolov5n]
  steps:
  - uses: actions/checkout@v4
  - uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python-version }}
- cache: "pip" # caching pip dependencies
+ cache: "pip" # cache pip dependencies
  - name: Install requirements
  run: |
  python -m pip install --upgrade pip wheel
- pip install -r requirements.txt coremltools openvino-dev tensorflow-cpu --extra-index-url https://download.pytorch.org/whl/cpu
+ pip install -r requirements.txt coremltools openvino-dev "tensorflow-cpu<2.15.1" --extra-index-url https://download.pytorch.org/whl/cpu
  yolo checks
  pip list
  - name: Benchmark DetectionModel
@@ -51,16 +51,10 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- os: [ubuntu-latest, windows-latest] # macos-latest bug https://github.com/ultralytics/yolov5/pull/9049
+ os: [ubuntu-latest, windows-latest, macos-14] # macos-latest bug https://github.com/ultralytics/yolov5/pull/9049
  python-version: ["3.11"]
  model: [yolov5n]
  include:
- - os: ubuntu-latest
- python-version: "3.8" # '3.6.8' min
- model: yolov5n
- - os: ubuntu-latest
- python-version: "3.9"
- model: yolov5n
  - os: ubuntu-latest
  python-version: "3.8" # torch 1.8.0 requires python >=3.6, <=3.8
  model: yolov5n
@@ -147,7 +141,7 @@ jobs:
  steps:
  - name: Check for failure and notify
  if: (needs.Benchmarks.result == 'failure' || needs.Tests.result == 'failure' || needs.Benchmarks.result == 'cancelled' || needs.Tests.result == 'cancelled') && github.repository == 'ultralytics/yolov5' && (github.event_name == 'schedule' || github.event_name == 'push')
- uses: slackapi/slack-github-action@v1.25.0
+ uses: slackapi/slack-github-action@v1.26.0
  with:
  payload: |
  {"text": "<!channel> GitHub Actions error for ${{ github.workflow }} ❌\n\n\n*Repository:* https://github.com/${{ github.repository }}\n*Action:* https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}\n*Author:* ${{ github.actor }}\n*Event:* ${{ github.event_name }}\n"}

.github/workflows/cla.yml

@@ -0,0 +1,39 @@
+# Ultralytics YOLO 🚀, AGPL-3.0 license
+# Ultralytics Contributor License Agreement (CLA) action https://docs.ultralytics.com/help/CLA
+# This workflow automatically requests Pull Requests (PR) authors to sign the Ultralytics CLA before PRs can be merged
+
+name: CLA Assistant
+on:
+ issue_comment:
+ types:
+ - created
+ pull_request_target:
+ types:
+ - reopened
+ - opened
+ - synchronize
+
+jobs:
+ CLA:
+ if: github.repository == 'ultralytics/yolov5'
+ runs-on: ubuntu-latest
+ steps:
+ - name: CLA Assistant
+ if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I sign the CLA') || github.event_name == 'pull_request_target'
+ uses: contributor-assistant/[email protected]
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ # must be repository secret token
+ PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+ with:
+ path-to-signatures: "signatures/version1/cla.json"
+ path-to-document: "https://docs.ultralytics.com/help/CLA" # CLA document
+ # branch should not be protected
+ branch: "main"
+ allowlist: dependabot[bot],github-actions,[pre-commit*,pre-commit*,bot*
+
+ remote-organization-name: ultralytics
+ remote-repository-name: cla
+ custom-pr-sign-comment: "I have read the CLA Document and I sign the CLA"
+ custom-allsigned-prcomment: All Contributors have signed the CLA. ✅
+ #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'

.github/workflows/merge-main-into-prs.yml

@@ -0,0 +1,56 @@
+# Ultralytics YOLO 🚀, AGPL-3.0 license
+# Automatically merges repository 'main' branch into all open PRs to keep them up-to-date
+# Action runs on updates to main branch so when one PR merges to main all others update
+
+name: Merge main into PRs
+
+on:
+ workflow_dispatch:
+ push:
+ branches:
+ - main
+ - master
+
+jobs:
+ Merge:
+ if: github.repository == 'ultralytics/yolov5'
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+ - uses: actions/setup-python@v5
+ with:
+ python-version: "3.11"
+ cache: "pip" # caching pip dependencies
+ - name: Install requirements
+ run: |
+ pip install pygithub
+ - name: Merge main into PRs
+ shell: python
+ run: |
+ from github import Github
+ import os
+ 
+ # Authenticate with the GitHub Token
+ g = Github(os.getenv('GITHUB_TOKEN'))
+ 
+ # Get the repository dynamically
+ repo = g.get_repo(os.getenv('GITHUB_REPOSITORY'))
+ 
+ # List all open pull requests
+ open_pulls = repo.get_pulls(state='open', sort='created')
+ 
+ for pr in open_pulls:
+ # Compare PR head with main to see if it's behind
+ try:
+ # Merge main into the PR branch
+ success = pr.update_branch()
+ assert success, "Branch update failed"
+ print(f"Merged 'master' into PR #{pr.number} ({pr.head.ref}) successfully.")
+ except Exception as e:
+ print(f"Could not merge 'master' into PR #{pr.number} ({pr.head.ref}): {e}")
+ env:
+ GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+ GITHUB_REPOSITORY: ${{ github.repository }}

README.md

@@ -78,12 +78,13 @@ python test_patch.py -h # to get a list of all testing options
  -->
  </p>
 
-[中文](https://docs.ultralytics.com/zh/) | [한국어](https://docs.ultralytics.com/ko/) | [日本語](https://docs.ultralytics.com/ja/) | [Русский](https://docs.ultralytics.com/ru/) | [Deutsch](https://docs.ultralytics.com/de/) | [Français](https://docs.ultralytics.com/fr/) | [Español](https://docs.ultralytics.com/es/) | [Português](https://docs.ultralytics.com/pt/) | [हिन्दी](https://docs.ultralytics.com/hi/) | [العربية](https://docs.ultralytics.com/ar/)
+[中文](https://docs.ultralytics.com/zh/) | [한국어](https://docs.ultralytics.com/ko/) | [日本語](https://docs.ultralytics.com/ja/) | [Русский](https://docs.ultralytics.com/ru/) | [Deutsch](https://docs.ultralytics.com/de/) | [Français](https://docs.ultralytics.com/fr/) | [Español](https://docs.ultralytics.com/es/) | [Português](https://docs.ultralytics.com/pt/) | [Türkçe](https://docs.ultralytics.com/tr/) | [Tiếng Việt](https://docs.ultralytics.com/vi/) | [हिन्दी](https://docs.ultralytics.com/hi/) | [العربية](https://docs.ultralytics.com/ar/)
 
 <div>
  <a href="https://github.com/ultralytics/yolov5/actions/workflows/ci-testing.yml"><img src="https://github.com/ultralytics/yolov5/actions/workflows/ci-testing.yml/badge.svg" alt="YOLOv5 CI"></a>
  <a href="https://zenodo.org/badge/latestdoi/264818686"><img src="https://zenodo.org/badge/264818686.svg" alt="YOLOv5 Citation"></a>
  <a href="https://hub.docker.com/r/ultralytics/yolov5"><img src="https://img.shields.io/docker/pulls/ultralytics/yolov5?logo=docker" alt="Docker Pulls"></a>
+ <a href="https://ultralytics.com/discord"><img alt="Discord" src="https://img.shields.io/discord/1089800235347353640?logo=discord&logoColor=white&label=Discord&color=blue"></a>
  <br>
  <a href="https://bit.ly/yolov5-paperspace-notebook"><img src="https://assets.paperspace.io/img/gradient-badge.svg" alt="Run on Gradient"></a>
  <a href="https://colab.research.google.com/github/ultralytics/yolov5/blob/master/tutorial.ipynb"><img src="https://colab.research.google.com/assets/colab-badge.svg" alt="Open In Colab"></a>

README.zh-CN.md

@@ -8,7 +8,7 @@
  -->
  </p>
 
-[中文](https://docs.ultralytics.com/zh/) | [한국어](https://docs.ultralytics.com/ko/) | [日本語](https://docs.ultralytics.com/ja/) | [Русский](https://docs.ultralytics.com/ru/) | [Deutsch](https://docs.ultralytics.com/de/) | [Français](https://docs.ultralytics.com/fr/) | [Español](https://docs.ultralytics.com/es/) | [Português](https://docs.ultralytics.com/pt/) | [हिन्दी](https://docs.ultralytics.com/hi/) | [العربية](https://docs.ultralytics.com/ar/)
+[中文](https://docs.ultralytics.com/zh/) | [한국어](https://docs.ultralytics.com/ko/) | [日本語](https://docs.ultralytics.com/ja/) | [Русский](https://docs.ultralytics.com/ru/) | [Deutsch](https://docs.ultralytics.com/de/) | [Français](https://docs.ultralytics.com/fr/) | [Español](https://docs.ultralytics.com/es/) | [Português](https://docs.ultralytics.com/pt/) | [Türkçe](https://docs.ultralytics.com/tr/) | [Tiếng Việt](https://docs.ultralytics.com/vi/) | [हिन्दी](https://docs.ultralytics.com/hi/) | [العربية](https://docs.ultralytics.com/ar/)
 
 <div>
  <a href="https://github.com/ultralytics/yolov5/actions/workflows/ci-testing.yml"><img src="https://github.com/ultralytics/yolov5/actions/workflows/ci-testing.yml/badge.svg" alt="YOLOv5 CI"></a>

export.py

@@ -346,6 +346,7 @@ def export_engine(model, im, file, half, dynamic, simplify, workspace=4, verbose
  onnx = file.with_suffix(".onnx")
 
  LOGGER.info(f"\n{prefix} starting export with TensorRT {trt.__version__}...")
+ is_trt10 = int(trt.__version__.split(".")[0]) >= 10 # is TensorRT >= 10
  assert onnx.exists(), f"failed to export ONNX file: {onnx}"
  f = file.with_suffix(".engine") # TensorRT engine file
  logger = trt.Logger(trt.Logger.INFO)
@@ -354,9 +355,10 @@ def export_engine(model, im, file, half, dynamic, simplify, workspace=4, verbose
 
  builder = trt.Builder(logger)
  config = builder.create_builder_config()
- config.max_workspace_size = workspace * 1 << 30
- # config.set_memory_pool_limit(trt.MemoryPoolType.WORKSPACE, workspace << 30) # fix TRT 8.4 deprecation notice
-
+ if is_trt10:
+ config.set_memory_pool_limit(trt.MemoryPoolType.WORKSPACE, workspace << 30)
+ else: # TensorRT versions 7, 8
+ config.max_workspace_size = workspace * 1 << 30
  flag = 1 << int(trt.NetworkDefinitionCreationFlag.EXPLICIT_BATCH)
  network = builder.create_network(flag)
  parser = trt.OnnxParser(network, logger)
@@ -381,8 +383,10 @@ def export_engine(model, im, file, half, dynamic, simplify, workspace=4, verbose
  LOGGER.info(f"{prefix} building FP{16 if builder.platform_has_fast_fp16 and half else 32} engine as {f}")
  if builder.platform_has_fast_fp16 and half:
  config.set_flag(trt.BuilderFlag.FP16)
- with builder.build_engine(network, config) as engine, open(f, "wb") as t:
- t.write(engine.serialize())
+
+ build = builder.build_serialized_network if is_trt10 else builder.build_engine
+ with build(network, config) as engine, open(f, "wb") as t:
+ t.write(engine if is_trt10 else engine.serialize())
  return f, None
 
 
@@ -405,7 +409,8 @@ def export_saved_model(
  try:
  import tensorflow as tf
  except Exception:
- check_requirements(f"tensorflow{'' if torch.cuda.is_available() else '-macos' if MACOS else '-cpu'}")
+ check_requirements(f"tensorflow{'' if torch.cuda.is_available() else '-macos' if MACOS else '-cpu'}<=2.15.1")
+
  import tensorflow as tf
  from tensorflow.python.framework.convert_to_constants import convert_variables_to_constants_v2