Update to v5 2

.dockerignore

@@ -7,17 +7,18 @@ output
 coco
 storage.googleapis.com
 
+*.ttf
 data/samples/*
-**/results*.txt
+**/results*.csv
 *.jpg
 
 # Neural Network weights -----------------------------------------------------------------------------------------------
-**/*.weights
 **/*.pt
 **/*.pth
 **/*.onnx
 **/*.mlmodel
 **/*.torchscript
+**/*.torchscript.pt
 
 
 # Below Copied From .gitignore -----------------------------------------------------------------------------------------
@@ -49,6 +50,7 @@ sdist/
 var/
 wheels/
 *.egg-info/
+# wandb/
 .installed.cfg
 *.egg
 

.github/FUNDING.yml

@@ -0,0 +1,5 @@
+# These are supported funding model platforms
+
+github: glenn-jocher
+patreon: ultralytics
+open_collective: ultralytics

.github/ISSUE_TEMPLATE/--bug-report.md → .github/ISSUE_TEMPLATE/bug-report.md

@@ -1,27 +1,30 @@
 ---
-name: "\U0001F41BBug report"
+name: "🐛 Bug report"
 about: Create a report to help us improve
 title: ''
 labels: bug
 assignees: ''
 
 ---
 
-Before submitting a bug report, please be aware that your issue **must be reproducible** with all of the following, otherwise it is non-actionable, and we can not help you:
- - **Current repo**: run `git fetch && git status -uno` to check and `git pull` to update repo
- - **Common dataset**: coco.yaml or coco128.yaml
- - **Common environment**: Colab, Google Cloud, or Docker image. See https://github.com/ultralytics/yolov5#environments
-
-If this is a custom dataset/training question you **must include** your `train*.jpg`, `test*.jpg` and `results.png` figures, or we can not help you. You can generate these with `utils.plot_results()`.
+Before submitting a bug report, please be aware that your issue **must be reproducible** with all of the following,
+otherwise it is non-actionable, and we can not help you:
 
+- **Current repo**: run `git fetch && git status -uno` to check and `git pull` to update repo
+- **Common dataset**: coco.yaml or coco128.yaml
+- **Common environment**: Colab, Google Cloud, or Docker image. See https://github.com/ultralytics/yolov5#environments
+
+If this is a custom dataset/training question you **must include** your `train*.jpg`, `val*.jpg` and `results.png`
+figures, or we can not help you. You can generate these with `utils.plot_results()`.
 
 ## 🐛 Bug
-A clear and concise description of what the bug is.
 
+A clear and concise description of what the bug is.
 
 ## To Reproduce (REQUIRED)
 
 Input:
+
 ```
 import torch
 
@@ -30,6 +33,7 @@ c = a / 0
 ```
 
 Output:
+
 ```
 Traceback (most recent call last):
   File "/Users/glennjocher/opt/anaconda3/envs/env1/lib/python3.7/site-packages/IPython/core/interactiveshell.py", line 3331, in run_code
@@ -39,17 +43,17 @@ Traceback (most recent call last):
 RuntimeError: ZeroDivisionError
 ```
 
-
 ## Expected behavior
-A clear and concise description of what you expected to happen.
 
+A clear and concise description of what you expected to happen.
 
 ## Environment
-If applicable, add screenshots to help explain your problem.
 
- - OS: [e.g. Ubuntu]
- - GPU [e.g. 2080 Ti]
+If applicable, add screenshots to help explain your problem.
 
+- OS: [e.g. Ubuntu]
+- GPU [e.g. 2080 Ti]
 
 ## Additional context
+
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/--feature-request.md → .github/ISSUE_TEMPLATE/feature-request.md

@@ -1,5 +1,5 @@
 ---
-name: "\U0001F680Feature request"
+name: "🚀 Feature request"
 about: Suggest an idea for this project
 title: ''
 labels: enhancement
@@ -8,11 +8,13 @@ assignees: ''
 ---
 
 ## 🚀 Feature
+
 <!-- A clear and concise description of the feature proposal -->
 
 ## Motivation
 
-<!-- Please outline the motivation for the proposal. Is your feature request related to a problem? e.g., I'm always frustrated when [...]. If this is related to another GitHub issue, please link here too -->
+<!-- Please outline the motivation for the proposal. Is your feature request related to a problem? 
+e.g., I'm always frustrated when [...]. If this is related to another GitHub issue, please link here too -->
 
 ## Pitch
 

.github/ISSUE_TEMPLATE/-question.md → .github/ISSUE_TEMPLATE/question.md

@@ -9,5 +9,4 @@ assignees: ''
 
 ## ❔Question
 
-
 ## Additional context

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: pip
+    directory: "/"
+    schedule:
+      interval: weekly
+      time: "04:00"
+    open-pull-requests-limit: 10
+    reviewers:
+      - glenn-jocher
+    labels:
+      - dependencies

.github/workflows/ci-testing.yml

@@ -1,10 +1,13 @@
+# YOLOv5 🚀 by Ultralytics, GPL-3.0 license
+
 name: CI CPU testing
 
-on:  # https://help.github.com/en/actions/reference/events-that-trigger-workflows
+on: # https://help.github.com/en/actions/reference/events-that-trigger-workflows
   push:
+    branches: [master, develop]
   pull_request:
-  schedule:
-    - cron: "0 0 * * *"
+    # The branches below must be a subset of the branches above
+    branches: [master, develop]
 
 jobs:
   cpu-tests:
@@ -45,7 +48,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -qr requirements.txt -f https://download.pytorch.org/whl/cpu/torch_stable.html
-          pip install -q onnx
+          pip install -q onnx onnx-simplifier coremltools  # for export
           python --version
           pip --version
           pip list
@@ -63,14 +66,15 @@ jobs:
           di=cpu # inference devices  # define device
 
           # train
-          python train.py --img 256 --batch 8 --weights weights/${{ matrix.model }}.pt --cfg models/${{ matrix.model }}.yaml --epochs 1 --device $di
+          python train.py --img 128 --batch 16 --weights ${{ matrix.model }}.pt --cfg ${{ matrix.model }}.yaml --epochs 1 --device $di
           # detect
-          python detect.py --weights weights/${{ matrix.model }}.pt --device $di
-          python detect.py --weights runs/exp0/weights/last.pt --device $di
-          # test
-          python test.py --img 256 --batch 8 --weights weights/${{ matrix.model }}.pt --device $di
-          python test.py --img 256 --batch 8 --weights runs/exp0/weights/last.pt --device $di
+          python detect.py --weights ${{ matrix.model }}.pt --device $di
+          python detect.py --weights runs/train/exp/weights/last.pt --device $di
+          # val
+          python val.py --img 128 --batch 16 --weights ${{ matrix.model }}.pt --device $di
+          python val.py --img 128 --batch 16 --weights runs/train/exp/weights/last.pt --device $di
 
-          python models/yolo.py --cfg models/${{ matrix.model }}.yaml  # inspect
-          python models/export.py --img 256 --batch 1 --weights weights/${{ matrix.model }}.pt  # export
+          python hubconf.py  # hub
+          python models/yolo.py --cfg ${{ matrix.model }}.yaml  # inspect
+          python export.py --img 128 --batch 1 --weights ${{ matrix.model }}.pt --include onnx torchscript  # export
         shell: bash

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,54 @@
+# This action runs GitHub's industry-leading static analysis engine, CodeQL, against a repository's source code to find security vulnerabilities. 
+# https://github.com/github/codeql-action
+
+name: "CodeQL"
+
+on:
+  schedule:
+    - cron: '0 0 1 * *'  # Runs at 00:00 UTC on the 1st of every month
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        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@v2
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+      # 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@v1
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
+
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
+
+      #- run: |
+      #   make bootstrap
+      #   make release
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/greetings.yml

@@ -1,3 +1,5 @@
+# YOLOv5 🚀 by Ultralytics, GPL-3.0 license
+
 name: Greetings
 
 on: [pull_request_target, issues]
@@ -10,26 +12,49 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           pr-message: |
-            Hello @${{ github.actor }}, thank you for submitting a PR! To allow your work to be integrated as seamlessly as possible, we advise you to:
-            - Verify your PR is **up-to-date with origin/master.** If your PR is behind origin/master update by running the following, replacing 'feature' with the name of your local branch:
+            👋 Hello @${{ github.actor }}, thank you for submitting a 🚀 PR! To allow your work to be integrated as seamlessly as possible, we advise you to:
+            - ✅ Verify your PR is **up-to-date with origin/master.** If your PR is behind origin/master an automatic [GitHub actions](https://github.com/ultralytics/yolov5/blob/master/.github/workflows/rebase.yml) rebase may be attempted by including the /rebase command in a comment body, or by running the following code, replacing 'feature' with the name of your local branch:
             ```bash
             git remote add upstream https://github.com/ultralytics/yolov5.git
             git fetch upstream
             git checkout feature  # <----- replace 'feature' with local branch name
             git rebase upstream/master
             git push -u origin -f
             ```
-            - Verify all Continuous Integration (CI) **checks are passing**.
-            - Reduce changes to the absolute **minimum** required for your bug fix or feature addition. _"It is not daily increase but daily decrease, hack away the unessential. The closer to the source, the less wastage there is."_  -Bruce Lee
+            - ✅ Verify all Continuous Integration (CI) **checks are passing**.
+            - ✅ Reduce changes to the absolute **minimum** required for your bug fix or feature addition. _"It is not daily increase but daily decrease, hack away the unessential. The closer to the source, the less wastage there is."_  -Bruce Lee
 
           issue-message: |
-            Hello @${{ github.actor }}, thank you for your interest in our work! Please visit our [Custom Training Tutorial](https://github.com/ultralytics/yolov5/wiki/Train-Custom-Data) to get started, and see our [Jupyter Notebook](https://github.com/ultralytics/yolov5/blob/master/tutorial.ipynb) <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>, [Docker Image](https://hub.docker.com/r/ultralytics/yolov5), and [Google Cloud Quickstart Guide](https://github.com/ultralytics/yolov5/wiki/GCP-Quickstart) for example environments.
+            👋 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 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 Glenn Jocher at [email protected].
+
+            ## Requirements
+
+            [**Python>=3.6.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:
+            ```bash
+            $ git clone https://github.com/ultralytics/yolov5
+            $ cd yolov5
+            $ pip install -r requirements.txt
+            ```
+
+            ## Environments
+
+            YOLOv5 may be run in any of the following up-to-date verified environments (with all dependencies including [CUDA](https://developer.nvidia.com/cuda)/[CUDNN](https://developer.nvidia.com/cudnn), [Python](https://www.python.org/) and [PyTorch](https://pytorch.org/) preinstalled):
+
+            - **Google Colab and Kaggle** notebooks with free GPU: <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> <a href="https://www.kaggle.com/ultralytics/yolov5"><img src="https://kaggle.com/static/images/open-in-kaggle.svg" alt="Open In Kaggle"></a>
+            - **Google Cloud** Deep Learning VM. See [GCP Quickstart Guide](https://github.com/ultralytics/yolov5/wiki/GCP-Quickstart)
+            - **Amazon** Deep Learning AMI. See [AWS Quickstart Guide](https://github.com/ultralytics/yolov5/wiki/AWS-Quickstart)
+            - **Docker Image**. See [Docker Quickstart Guide](https://github.com/ultralytics/yolov5/wiki/Docker-Quickstart) <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>
+
 
-            If this is a bug report, please provide screenshots and **minimum viable code to reproduce your issue**, otherwise we can not help you.
+            ## Status
 
-            If this is a custom model or data training question, please note Ultralytics does **not** provide free personal support. As a leader in vision ML and AI, we do offer professional consulting, from simple expert advice up to delivery of fully customized, end-to-end production solutions for our clients, such as:
-            - **Cloud-based AI** systems operating on **hundreds of HD video streams in realtime.**
-            - **Edge AI** integrated into custom iOS and Android apps for realtime **30 FPS video inference.**
-            - **Custom data training**, hyperparameter evolution, and model exportation to any destination.
+            ![CI CPU testing](https://github.com/ultralytics/yolov5/workflows/CI%20CPU%20testing/badge.svg)
 
-            For more information please visit https://www.ultralytics.com.
+            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 ([train.py](https://github.com/ultralytics/yolov5/blob/master/train.py)), validation ([val.py](https://github.com/ultralytics/yolov5/blob/master/val.py)), inference ([detect.py](https://github.com/ultralytics/yolov5/blob/master/detect.py)) and export ([export.py](https://github.com/ultralytics/yolov5/blob/master/export.py)) on MacOS, Windows, and Ubuntu every 24 hours and on every commit.
+

.github/workflows/stale.yml

@@ -1,3 +1,5 @@
+# YOLOv5 🚀 by Ultralytics, GPL-3.0 license
+
 name: Close stale issues
 on:
   schedule:
@@ -7,11 +9,29 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v1
+      - uses: actions/stale@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
-          stale-pr-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
+          stale-issue-message: |
+            👋 Hello, this issue has been automatically marked as stale because it has not had recent activity. Please note it will be closed if no further activity occurs.
+
+            Access additional [YOLOv5](https://ultralytics.com/yolov5) 🚀 resources:
+            - **Wiki** – https://github.com/ultralytics/yolov5/wiki
+            - **Tutorials** – https://github.com/ultralytics/yolov5#tutorials
+            - **Docs** – https://docs.ultralytics.com
+
+            Access additional [Ultralytics](https://ultralytics.com) ⚡ resources:
+            - **Ultralytics HUB** – https://ultralytics.com
+            - **Vision API** – https://ultralytics.com/yolov5
+            - **About Us** – https://ultralytics.com/about
+            - **Join Our Team** – https://ultralytics.com/work
+            - **Contact Us** – https://ultralytics.com/contact
+
+            Feel free to inform us of any other **issues** you discover or **feature requests** that come to mind in the future. Pull Requests (PRs) are also always welcomed!
+
+            Thank you for your contributions to YOLOv5 🚀 and Vision AI ⭐!
+
+          stale-pr-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions YOLOv5 🚀 and Vision AI ⭐.'
           days-before-stale: 30
           days-before-close: 5
           exempt-issue-labels: 'documentation,tutorial'