Merge remote-tracking branch 'upstream/master'

.github/dependabot.yml

@@ -1,3 +1,7 @@
+# Ultralytics YOLO 🚀, AGPL-3.0 license
+# Dependabot for package version updates
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
 version: 2
 updates:
  - package-ecosystem: pip
@@ -12,7 +16,7 @@ updates:
  - dependencies
 
  - package-ecosystem: github-actions
- directory: "/"
+ directory: "/.github/workflows"
  schedule:
  interval: weekly
  time: "04:00"

.github/workflows/ci-testing.yml

@@ -5,33 +5,32 @@ name: YOLOv5 CI
 
 on:
  push:
- branches: [ master ]
+ branches: [master]
  pull_request:
- branches: [ master ]
+ branches: [master]
  schedule:
- - cron: '0 0 * * *'  # runs at 00:00 UTC every day
+ - cron: "0 0 * * *" # runs at 00:00 UTC every day
 
 jobs:
  Benchmarks:
  runs-on: ${{ matrix.os }}
  strategy:
  fail-fast: false
  matrix:
- os: [ ubuntu-latest ]
- python-version: [ '3.10' ]  # requires python<=3.10
- model: [ yolov5n ]
+ os: [ubuntu-latest]
+ python-version: ["3.11"] # requires python<=3.10
+ model: [yolov5n]
  steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-python@v4
+ - uses: actions/checkout@v4
+ - uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python-version }}
- cache: 'pip' # caching pip dependencies
+ cache: "pip" # caching 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
- python --version
- pip --version
+ yolo checks
  pip list
  - name: Benchmark DetectionModel
  run: |
@@ -52,49 +51,41 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- os: [ ubuntu-latest, windows-latest ]  # macos-latest bug https://github.com/ultralytics/yolov5/pull/9049
- python-version: [ '3.10' ]
- model: [ yolov5n ]
+ os: [ubuntu-latest, windows-latest] # 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
+ python-version: "3.8" # '3.6.8' min
  model: yolov5n
  - os: ubuntu-latest
- python-version: '3.9'
+ python-version: "3.9"
  model: yolov5n
  - os: ubuntu-latest
- python-version: '3.8' # torch 1.7.0 requires python >=3.6, <=3.8
+ python-version: "3.8" # torch 1.8.0 requires python >=3.6, <=3.8
  model: yolov5n
- torch: '1.7.0'  # min torch version CI https://pypi.org/project/torchvision/
+ torch: "1.8.0" # min torch version CI https://pypi.org/project/torchvision/
  steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-python@v4
+ - uses: actions/checkout@v4
+ - uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python-version }}
- cache: 'pip' # caching pip dependencies
+ cache: "pip" # caching pip dependencies
  - name: Install requirements
  run: |
  python -m pip install --upgrade pip wheel
- if [ "${{ matrix.torch }}" == "1.7.0" ]; then
- pip install -r requirements.txt torch==1.7.0 torchvision==0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu
+ if [ "${{ matrix.torch }}" == "1.8.0" ]; then
+ pip install -r requirements.txt torch==1.8.0 torchvision==0.9.0 --extra-index-url https://download.pytorch.org/whl/cpu
  else
  pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu
  fi
- shell: bash  # for Windows compatibility
+ shell: bash # for Windows compatibility
  - name: Check environment
  run: |
- python -c "import utils; utils.notebook_init()"
- echo "RUNNER_OS is ${{ runner.os }}"
- echo "GITHUB_EVENT_NAME is ${{ github.event_name }}"
- echo "GITHUB_WORKFLOW is ${{ github.workflow }}"
- echo "GITHUB_ACTOR is ${{ github.actor }}"
- echo "GITHUB_REPOSITORY is ${{ github.repository }}"
- echo "GITHUB_REPOSITORY_OWNER is ${{ github.repository_owner }}"
- python --version
- pip --version
+ yolo checks
  pip list
  - name: Test detection
- shell: bash  # for Windows compatibility
+ shell: bash # for Windows compatibility
  run: |
  # export PYTHONPATH="$PWD" # to run '$ python *.py' files in subdirectories
  m=${{ matrix.model }} # official weights
@@ -120,7 +111,7 @@ jobs:
  torch.jit.trace(model, [im])
  EOF
  - name: Test segmentation
- shell: bash  # for Windows compatibility
+ shell: bash # for Windows compatibility
  run: |
  m=${{ matrix.model }}-seg # official weights
  b=runs/train-seg/exp/weights/best # best.pt checkpoint
@@ -134,7 +125,7 @@ jobs:
  done
  done
  - name: Test classification
- shell: bash  # for Windows compatibility
+ shell: bash # for Windows compatibility
  run: |
  m=${{ matrix.model }}-cls.pt # official weights
  b=runs/train-cls/exp/weights/best.pt # best.pt checkpoint
@@ -156,7 +147,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.24.0
+ uses: slackapi/slack-github-action@v1.25.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/codeql-analysis.yml

@@ -5,7 +5,7 @@ name: "CodeQL"
 
 on:
  schedule:
- - cron: '0 0 1 * *'  # Runs at 00:00 UTC on the 1st of every month
+ - cron: "0 0 1 * *" # Runs at 00:00 UTC on the 1st of every month
  workflow_dispatch:
 
 jobs:
@@ -16,18 +16,18 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- language: ['python']
+ language: ["python"]
  # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
  # Learn more:
  # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
  steps:
  - name: Checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL
- uses: github/codeql-action/init@v2
+ uses: github/codeql-action/init@v3
  with:
  languages: ${{ matrix.language }}
  # If you wish to specify custom queries, you can do so here or in a config file.
@@ -38,7 +38,7 @@ jobs:
  # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
  # If this step fails, then you should remove it and run the build manually (see below)
  - name: Autobuild
- uses: github/codeql-action/autobuild@v2
+ uses: github/codeql-action/autobuild@v3
 
  # ℹ️ Command-line programs to run using the OS shell.
  # 📚 https://git.io/JvXDl
@@ -52,4 +52,4 @@ jobs:
  # make release
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
+ uses: github/codeql-action/analyze@v3

.github/workflows/docker.yml

@@ -5,7 +5,7 @@ name: Publish Docker Images
 
 on:
  push:
- branches: [ master ]
+ branches: [master]
  workflow_dispatch:
 
 jobs:
@@ -15,22 +15,24 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout repo
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
+ with:
+ fetch-depth: 0 # copy full .git directory to access full git history in Docker images
 
  - name: Set up QEMU
- uses: docker/setup-qemu-action@v2
+ uses: docker/setup-qemu-action@v3
 
  - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v2
+ uses: docker/setup-buildx-action@v3
 
  - name: Login to Docker Hub
- uses: docker/login-action@v2
+ uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_TOKEN }}
 
  - name: Build and push arm64 image
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v5
  continue-on-error: true
  with:
  context: .
@@ -40,7 +42,7 @@ jobs:
  tags: ultralytics/yolov5:latest-arm64
 
  - name: Build and push CPU image
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v5
  continue-on-error: true
  with:
  context: .
@@ -49,7 +51,7 @@ jobs:
  tags: ultralytics/yolov5:latest-cpu
 
  - name: Build and push GPU image
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v5
  continue-on-error: true
  with:
  context: .

.github/workflows/format.yml

@@ -0,0 +1,27 @@
+# Ultralytics 🚀 - AGPL-3.0 license
+# Ultralytics Actions https://github.com/ultralytics/actions
+# This workflow automatically formats code and documentation in PRs to official Ultralytics standards
+
+name: Ultralytics Actions
+
+on:
+ push:
+ branches: [main, master]
+ pull_request_target:
+ branches: [main, master]
+
+jobs:
+ format:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Run Ultralytics Formatting
+ uses: ultralytics/actions@main
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }} # automatically generated, do not modify
+ python: true # format Python code and docstrings
+ markdown: true # format Markdown and YAML
+ spelling: true # check spelling
+ links: false # check broken links
+ summary: true # print PR summary with GPT4 (requires 'openai_api_key' or 'openai_azure_api_key' and 'openai_azure_endpoint')
+ openai_azure_api_key: ${{ secrets.OPENAI_AZURE_API_KEY }}
+ openai_azure_endpoint: ${{ secrets.OPENAI_AZURE_ENDPOINT }}

.github/workflows/greetings.yml

@@ -31,7 +31,7 @@ jobs:
 
  ## Requirements
 
- [**Python>=3.7.0**](https://www.python.org/) with all [requirements.txt](https://github.com/ultralytics/yolov5/blob/master/requirements.txt) installed including [**PyTorch>=1.7**](https://pytorch.org/get-started/locally/). To get started:
+ [**Python>=3.8.0**](https://www.python.org/) with all [requirements.txt](https://github.com/ultralytics/yolov5/blob/master/requirements.txt) installed including [**PyTorch>=1.8**](https://pytorch.org/get-started/locally/). To get started:
  ```bash
  git clone https://github.com/ultralytics/yolov5 # clone
  cd yolov5

.github/workflows/links.yml

@@ -1,19 +1,24 @@
 # Ultralytics YOLO 🚀, AGPL-3.0 license
-# YOLO Continuous Integration (CI) GitHub Actions tests broken link checker
-# Accept 429(Instagram, 'too many requests'), 999(LinkedIn, 'unknown status code'), Timeout(Twitter)
+# Continuous Integration (CI) GitHub Actions tests broken link checker using https://github.com/lycheeverse/lychee
+# Ignores the following status codes to reduce false positives:
+# - 403(OpenVINO, 'forbidden')
+# - 429(Instagram, 'too many requests')
+# - 500(Zenodo, 'cached')
+# - 502(Zenodo, 'bad gateway')
+# - 999(LinkedIn, 'unknown status code')
 
 name: Check Broken links
 
 on:
  workflow_dispatch:
  schedule:
- - cron: '0 0 * * *'  # runs at 00:00 UTC every day
+ - cron: "0 0 * * *" # runs at 00:00 UTC every day
 
 jobs:
  Links:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Download and install lychee
  run: |
@@ -23,18 +28,44 @@ jobs:
  sudo mv lychee /usr/local/bin
 
  - name: Test Markdown and HTML links with retry
- uses: nick-invision/retry@v2
+ uses: nick-invision/retry@v3
  with:
  timeout_minutes: 5
  retry_wait_seconds: 60
  max_attempts: 3
- command: lychee --accept 429,999 --exclude-loopback --exclude 'https?://(www\.)?(twitter\.com|instagram\.com)' --exclude-path '**/ci.yaml' --exclude-mail --github-token ${{ secrets.GITHUB_TOKEN }} './**/*.md' './**/*.html'
+ command: |
+ lychee \
+ --scheme 'https' \
+ --timeout 60 \
+ --insecure \
+ --accept 403,429,500,502,999 \
+ --exclude-all-private \
+ --exclude 'https?://(www\.)?(linkedin\.com|twitter\.com|instagram\.com|kaggle\.com|fonts\.gstatic\.com|url\.com)' \
+ --exclude-path '**/ci.yaml' \
+ --github-token ${{ secrets.GITHUB_TOKEN }} \
+ './**/*.md' \
+ './**/*.html'
 
  - name: Test Markdown, HTML, YAML, Python and Notebook links with retry
  if: github.event_name == 'workflow_dispatch'
- uses: nick-invision/retry@v2
+ uses: nick-invision/retry@v3
  with:
  timeout_minutes: 5
  retry_wait_seconds: 60
  max_attempts: 3
- command: lychee --accept 429,999 --exclude-loopback --exclude 'https?://(www\.)?(twitter\.com|instagram\.com|url\.com)' --exclude-path '**/ci.yaml' --exclude-mail --github-token ${{ secrets.GITHUB_TOKEN }} './**/*.md' './**/*.html' './**/*.yml' './**/*.yaml' './**/*.py' './**/*.ipynb'
+ command: |
+ lychee \
+ --scheme 'https' \
+ --timeout 60 \
+ --insecure \
+ --accept 429,999 \
+ --exclude-all-private \
+ --exclude 'https?://(www\.)?(linkedin\.com|twitter\.com|instagram\.com|kaggle\.com|fonts\.gstatic\.com|url\.com)' \
+ --exclude-path '**/ci.yaml' \
+ --github-token ${{ secrets.GITHUB_TOKEN }} \
+ './**/*.md' \
+ './**/*.html' \
+ './**/*.yml' \
+ './**/*.yaml' \
+ './**/*.py' \
+ './**/*.ipynb'