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

YOLOv5 v7.0 release updates #10245

Merged
merged 17 commits into from
Nov 22, 2022
Merged

YOLOv5 v7.0 release updates #10245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3e5bbba
YOLOv5 v7.0 splash image update
glenn-jocher Nov 21, 2022
c566358
Update tutorial.ipynb
glenn-jocher Nov 21, 2022
d409020
Update tutorial.ipynb
glenn-jocher Nov 21, 2022
49ae4f6
Update tutorial.ipynb
glenn-jocher Nov 21, 2022
2e5100f
readme segmentation section
glenn-jocher Nov 21, 2022
4b55d24
readme segmentation section
glenn-jocher Nov 21, 2022
2f5c55e
readme segmentation section
glenn-jocher Nov 21, 2022
7df19bd
readme segmentation section
glenn-jocher Nov 21, 2022
28e2dd6
readme segmentation section
glenn-jocher Nov 21, 2022
f9fe827
Update README.md
glenn-jocher Nov 21, 2022
cd917a3
Update README.md
glenn-jocher Nov 21, 2022
b4d0ca5
Update tutorial.ipynb
glenn-jocher Nov 21, 2022
3d99d75
Update README.md
glenn-jocher Nov 22, 2022
fbc3af7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 22, 2022
10b93e4
Update README.md
glenn-jocher Nov 22, 2022
637eec4
Update README.md
glenn-jocher Nov 22, 2022
fa4aa0d
Update download URLs to 7.0 assets
glenn-jocher Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/README_cn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div align="center">
<p>
<a align="center" href="https://ultralytics.com/yolov5" target="_blank">
<img width="850" src="https://github.com/ultralytics/assets/blob/master/yolov5/v62/splash_readme.png"></a>
<img width="850" src="https://raw.githubusercontent.com/ultralytics/assets/master/yolov5/v70/splash.png"></a>
</p>

[English](../README.md) | 简体中文
Expand Down
114 changes: 94 additions & 20 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions classify/tutorial.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"<div align=\"center\">\n",
"\n",
" <a href=\"https://ultralytics.com/yolov5\" target=\"_blank\">\n",
" <img width=\"1024\", src=\"https://github.com/ultralytics/assets/raw/master/yolov5/v62/splash_readme.png\"></a>\n",
" <img width=\"1024\", src=\"https://raw.githubusercontent.com/ultralytics/assets/master/yolov5/v70/splash.png\"></a>\n",
"\n",
"\n",
"<br>\n",
Expand Down Expand Up @@ -1452,7 +1452,8 @@
"accelerator": "GPU",
"colab": {
"name": "YOLOv5 Classification Tutorial",
"provenance": []
"provenance": [],
"toc_visible": true
},
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
Expand Down
5 changes: 3 additions & 2 deletions data/scripts/download_weights.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
python - <<EOF
from utils.downloads import attempt_download

p5 = ['n', 's', 'm', 'l', 'x'] # P5 models
p5 = list('nsmlx') # P5 models
p6 = [f'{x}6' for x in p5] # P6 models
cls = [f'{x}-cls' for x in p5] # classification models
seg = [f'{x}-seg' for x in p5] # classification models

for x in p5 + p6 + cls:
for x in p5 + p6 + cls + seg:
attempt_download(f'weights/yolov5{x}.pt')

EOF
2 changes: 1 addition & 1 deletion segment/tutorial.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"<div align=\"center\">\n",
"\n",
" <a href=\"https://ultralytics.com/yolov5\" target=\"_blank\">\n",
" <img width=\"1024\", src=\"https://github.com/ultralytics/assets/raw/master/yolov5/v62/splash_readme.png\"></a>\n",
" <img width=\"1024\", src=\"https://raw.githubusercontent.com/ultralytics/assets/master/yolov5/v70/splash.png\"></a>\n",
"\n",
"\n",
"<br>\n",
Expand Down
2 changes: 1 addition & 1 deletion tutorial.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
"<div align=\"center\">\n",
"\n",
" <a href=\"https://ultralytics.com/yolov5\" target=\"_blank\">\n",
" <img width=\"1024\", src=\"https://github.com/ultralytics/assets/raw/master/yolov5/v62/splash_readme.png\"></a>\n",
" <img width=\"1024\", src=\"https://raw.githubusercontent.com/ultralytics/assets/master/yolov5/v70/splash.png\"></a>\n",
"\n",
"\n",
"<br>\n",
Expand Down
8 changes: 4 additions & 4 deletions utils/downloads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ def safe_download(file, url, url2=None, min_bytes=1E0, error_msg=''):
LOGGER.info('')


def attempt_download(file, repo='ultralytics/yolov5', release='v6.2'):
# Attempt file download from GitHub release assets if not found locally. release = 'latest', 'v6.2', etc.
def attempt_download(file, repo='ultralytics/yolov5', release='v7.0'):
# Attempt file download from GitHub release assets if not found locally. release = 'latest', 'v7.0', etc.
from utils.general import LOGGER

def github_assets(repository, version='latest'):
# Return GitHub repo tag (i.e. 'v6.2') and assets (i.e. ['yolov5s.pt', 'yolov5m.pt', ...])
# Return GitHub repo tag (i.e. 'v7.0') and assets (i.e. ['yolov5s.pt', 'yolov5m.pt', ...])
if version != 'latest':
version = f'tags/{version}' # i.e. tags/v6.2
version = f'tags/{version}' # i.e. tags/v7.0
response = requests.get(f'https://github.com/gitapi/repos/{repository}/releases/{version}').json() # github api
return response['tag_name'], [x['name'] for x in response['assets']] # tag, assets

Expand Down