Merge branch 'master' into bugfix/triton-half-precision

.github/workflows/ci-testing.yml

@@ -18,19 +18,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        python-version: [ '3.9' ]  # requires python<=3.9
+        python-version: [ '3.10' ]  # requires python<=3.10
         model: [ yolov5n ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      #- name: Cache pip
-      #  uses: actions/cache@v3
-      #  with:
-      #    path: ~/.cache/pip
-      #    key: ${{ runner.os }}-Benchmarks-${{ hashFiles('requirements.txt') }}
-      #    restore-keys: ${{ runner.os }}-Benchmarks-
+          cache: 'pip' # caching pip dependencies
       - name: Install requirements
         run: |
           python -m pip install --upgrade pip wheel
@@ -79,16 +74,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Get cache dir
-        # https://github.com/actions/cache/blob/master/examples.md#multiple-oss-in-a-workflow
-        id: pip-cache
-        run: echo "::set-output name=dir::$(pip cache dir)"
-      - name: Cache pip
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('requirements.txt') }}
-          restore-keys: ${{ runner.os }}-${{ matrix.python-version }}-pip-
+          cache: 'pip' # caching pip dependencies
       - name: Install requirements
         run: |
           python -m pip install --upgrade pip wheel

.github/workflows/docker.yml

@@ -29,7 +29,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push arm64 image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         continue-on-error: true
         with:
           context: .
@@ -39,7 +39,7 @@ jobs:
           tags: ultralytics/yolov5:latest-arm64
 
       - name: Build and push CPU image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         continue-on-error: true
         with:
           context: .
@@ -48,7 +48,7 @@ jobs:
           tags: ultralytics/yolov5:latest-cpu
 
       - name: Build and push GPU image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         continue-on-error: true
         with:
           context: .

.github/workflows/greetings.yml

@@ -25,11 +25,9 @@ jobs:
           issue-message: |
             👋 Hello @${{ github.actor }}, thank you for your interest in YOLOv5 🚀! Please visit our ⭐️ [Tutorials](https://github.com/ultralytics/yolov5/wiki#tutorials) to get started, where you can find quickstart guides for simple tasks like [Custom Data Training](https://github.com/ultralytics/yolov5/wiki/Train-Custom-Data) all the way to advanced concepts like [Hyperparameter Evolution](https://github.com/ultralytics/yolov5/issues/607).
 
-            If this is a 🐛 Bug Report, please provide screenshots and **minimum viable code to reproduce your issue**, otherwise we can not help you.
+            If this is a 🐛 Bug Report, please provide a **minimum reproducible example** to help us debug it.
 
-            If this is a custom training ❓ Question, please provide as much information as possible, including dataset images, training logs, screenshots, and a public link to online [W&B logging](https://github.com/ultralytics/yolov5/wiki/Train-Custom-Data#visualize) if available.
-
-            For business inquiries or professional support requests please visit https://ultralytics.com or email support@ultralytics.com.
+            If this is a custom training ❓ Question, please provide as much information as possible, including dataset image examples and training logs, and verify you are following our [Tips for Best Training Results](https://github.com/ultralytics/yolov5/wiki/Tips-for-Best-Training-Results).
 
             ## Requirements
 
@@ -55,3 +53,13 @@ jobs:
 
             If this badge is green, all [YOLOv5 GitHub Actions](https://github.com/ultralytics/yolov5/actions) Continuous Integration (CI) tests are currently passing. CI tests verify correct operation of YOLOv5 [training](https://github.com/ultralytics/yolov5/blob/master/train.py), [validation](https://github.com/ultralytics/yolov5/blob/master/val.py), [inference](https://github.com/ultralytics/yolov5/blob/master/detect.py), [export](https://github.com/ultralytics/yolov5/blob/master/export.py) and [benchmarks](https://github.com/ultralytics/yolov5/blob/master/benchmarks.py) on MacOS, Windows, and Ubuntu every 24 hours and on every commit.
 
+            ## Introducing YOLOv8 🚀
+
+            We're excited to announce the launch of our latest state-of-the-art (SOTA) object detection model for 2023 - [YOLOv8](https://github.com/ultralytics/ultralytics) 🚀!
+
+            Designed to be fast, accurate, and easy to use, YOLOv8 is an ideal choice for a wide range of object detection, image segmentation and image classification tasks. With YOLOv8, you'll be able to quickly and accurately detect objects in real-time, streamline your workflows, and achieve new levels of accuracy in your projects.
+
+            Check out our [YOLOv8 Docs](https://docs.ultralytics.com/) for details and get started with:
+            ```bash
+            pip install ultralytics
+            ```

.github/workflows/stale.yml

@@ -9,7 +9,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v8
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: |

.pre-commit-config.yaml

@@ -1,9 +1,7 @@
-# Define hooks for code formations
-# Will be applied on any updated commit files if a user has installed and linked commit hook
-
-default_language_version:
-  python: python3.8
+# Ultralytics YOLO 🚀, GPL-3.0 license
+# Pre-commit hooks. For more information see https://github.com/pre-commit/pre-commit-hooks/blob/main/README.md
 
+exclude: 'docs/'
 # Define bot property if installed via https://github.com/marketplace/pre-commit-ci
 ci:
   autofix_prs: true
@@ -15,28 +13,28 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
-      # - id: end-of-file-fixer
+      - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: check-case-conflict
       - id: check-yaml
-      - id: check-toml
-      - id: pretty-format-json
       - id: check-docstring-first
+      - id: double-quote-string-fixer
+      - id: detect-private-key
 
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.3.1
     hooks:
       - id: pyupgrade
         name: Upgrade code
-        args: [ --py37-plus ]
+        args: [--py37-plus]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.11.4
+    rev: 5.12.0
     hooks:
       - id: isort
         name: Sort imports
 
-  - repo: https://github.com/pre-commit/mirrors-yapf
+  - repo: https://github.com/google/yapf
     rev: v0.32.0
     hooks:
       - id: yapf
@@ -50,15 +48,22 @@ repos:
         additional_dependencies:
           - mdformat-gfm
           - mdformat-black
-        exclude: "README.md|README.zh-CN.md"
-
-  - repo: https://github.com/asottile/yesqa
-    rev: v1.4.0
-    hooks:
-      - id: yesqa
+        # exclude: "README.md|README.zh-CN.md|CONTRIBUTING.md"
 
   - repo: https://github.com/PyCQA/flake8
     rev: 6.0.0
     hooks:
       - id: flake8
         name: PEP8
+
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.2
+    hooks:
+      - id: codespell
+        args:
+          - --ignore-words-list=crate,nd,strack,dota
+
+  #- repo: https://github.com/asottile/yesqa
+  #  rev: v1.4.0
+  #  hooks:
+  #    - id: yesqa

CONTRIBUTING.md

@@ -23,13 +23,13 @@ Select `requirements.txt` to update by clicking on it in GitHub.
 
 ### 2. Click 'Edit this file'
 
-Button is in top-right corner.
+The button is in the top-right corner.
 
 <p align="center"><img width="800" alt="PR_step2" src="https://user-images.githubusercontent.com/26833433/122260844-06f46280-ced4-11eb-9eec-b8a24be519ca.png"></p>
 
 ### 3. Make Changes
 
-Change `matplotlib` version from `3.2.2` to `3.3`.
+Change the `matplotlib` version from `3.2.2` to `3.3`.
 
 <p align="center"><img width="800" alt="PR_step3" src="https://user-images.githubusercontent.com/26833433/122260853-0a87e980-ced4-11eb-9fd2-3650fb6e0842.png"></p>
 
@@ -62,7 +62,7 @@ To allow your work to be integrated as seamlessly as possible, we advise you to:
 If you spot a problem with YOLOv5 please submit a Bug Report!
 
 For us to start investigating a possible problem we need to be able to reproduce it ourselves first. We've created a few
-short guidelines below to help users provide what we need in order to get started.
+short guidelines below to help users provide what we need to get started.
 
 When asking a question, people will be better able to provide help if you provide **code** that they can easily
 understand and use to **reproduce** the problem. This is referred to by community members as creating
@@ -76,14 +76,14 @@ the problem should be:
 In addition to the above requirements, for [Ultralytics](https://ultralytics.com/) to provide assistance your code
 should be:
 
-- ✅ **Current** – Verify that your code is up-to-date with current
+- ✅ **Current** – Verify that your code is up-to-date with the current
   GitHub [master](https://github.com/ultralytics/yolov5/tree/master), and if necessary `git pull` or `git clone` a new
   copy to ensure your problem has not already been resolved by previous commits.
 - ✅ **Unmodified** – Your problem must be reproducible without any modifications to the codebase in this
   repository. [Ultralytics](https://ultralytics.com/) does not provide support for custom code ⚠️.
 
 If you believe your problem meets all of the above criteria, please close this issue and raise a new one using the 🐛
-**Bug Report** [template](https://github.com/ultralytics/yolov5/issues/new/choose) and providing
+**Bug Report** [template](https://github.com/ultralytics/yolov5/issues/new/choose) and provide
 a [minimum reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) to help us better
 understand and diagnose your problem.