mirrors/yolov5
1
0
Fork 0
mirror of https://github.com/ultralytics/yolov5.git synced 2025-06-03 14:49:29 +08:00
Code Issues Projects Releases Wiki Activity
2,357 Commits 10 Branches 10 Tags
Commit Graph

264 Commits

Author SHA1 Message Date
Glenn Jocher
cee5959c74
Code refactor (#7923) 
* Code refactor for general.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update restapi.py

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2022-05-22 15:24:08 +02:00
Glenn Jocher
eb1217f3ac
Add PyTorch AMP check (#7917) 
* Add PyTorch AMP check

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Cleanup

* Cleanup

* Cleanup

* Robust for DDP

* Fixes

* Add amp enabled boolean to check_train_batch_size

* Simplify

* space to prefix

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2022-05-22 13:41:18 +02:00
Glenn Jocher
f00071416f
Refactor collections and fstrings (#7821) 
* Update torch_utils.py

* Additional code refactoring

* tuples to sets

* Cleanup
 2022-05-15 16:38:26 +02:00
Glenn Jocher
3356f2609c
Add Python version output (#7814) 2022-05-14 18:30:47 +02:00
Glenn Jocher
4a295b1a89
Add @threaded decorator (#7813) 
* Add `@threaded` decorator

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2022-05-14 16:12:08 +02:00
Glenn Jocher
c4862fcd31
Update Dockerfile-cpu to force python3.9 (#7675) 
* Update

* Update

* Do not install torch

* Pillow>9.1

* Update Dockerfile-cpu

* Update Dockerfile-cpu

* Update Dockerfile-cpu

* Update Dockerfile-cpu

* Update Dockerfile-cpu

* Update Dockerfile-cpu

* Update Dockerfile-cpu

* Update Dockerfile-cpu

* Update Dockerfile-cpu

* Update Dockerfile

* fix emoji

* reduce scipy

* add libpython3.9

* Update Dockerfile
 2022-05-02 20:53:02 -07:00
Glenn Jocher
1a3ecb8b38
increment_path() robustness improvements (#7628) 
Improved robustness to filename edge cases like `data/images/zidane.23.jpg` that currently fail. May resolve https://github.com/ultralytics/yolov5/issues/7432
 2022-04-28 14:00:43 -07:00
Glenn Jocher
7043872f25
PyTorch Hub _verbose=False fix2 (#7550) 
* PyTorch Hub `_verbose=False` fix2

* Update downloads.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update hubconf.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2022-04-23 11:26:25 -07:00
Glenn Jocher
f62609eb52
Update check_requirements() with cmds=() argument (#7543) 2022-04-22 14:31:05 -07:00
Joseph Kocherhans
b77c8d9d72
Added YOLOv5_AUTOINSTALL environment variable (#7505) 
* Added a way to skip dependency auto-installation.

Setting the environment variable `YOLOv5_AUTOINSTALL=False` will
skip installing any missing dependencies as if the user had passed
`install=False` to `check_requirements`.

* Cleanup

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2022-04-20 12:08:22 -07:00
Glenn Jocher
ab5b917494
check_fonts() download to CONFIG_DIR fix (#7489) 
Follows https://github.com/ultralytics/yolov5/pull/7488. Correct bug where fonts were downloading to current working directory rather than global CONFIG_DIR
 2022-04-19 17:50:02 -07:00
Glenn Jocher
c9042dc2ad
Improved non-latin Annotator() plotting (#7488) 
* Improved non-latin labels Annotator plotting

May resolve https://github.com/ultralytics/yolov5/issues/7460

* Update train.py

* Update train.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add progress arg

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2022-04-19 17:32:15 -07:00
Glenn Jocher
014acde79d
Update git_describe() (#7402) 
* Update `git_describe()`

Add .git path check to avoid `fatal: not a git repository (or any of the parent directories): .git` printout

* Update general.py
 2022-04-12 17:26:53 +02:00
Glenn Jocher
32661f75ac
Add retry=3 to download() (#7313) 
* Add `retry=3` to `download()`

* Update general.py

* Update general.py

* Update general.py

* Update VOC.yaml

* Update VisDrone.yaml
 2022-04-06 13:12:41 +02:00
Max Strobel
741fac815e
fix: disable usage of root logger (#7296) 
* fix: disable usage of root logger

`logging.basicConfig` configures Python's root logger. This prohibits
fine control of logging, overwrites logging configuration done outside
the package, and is not best practice. Instead, the used logger is now
configured directly, and the root logger is untouched.

Example:
    If yolov5 is used as part of another project with some sophisticated
    logging, the internal `logging.basicConfig` call overwrites all the
    external configuration.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update general.py

* Update general.py

* Comment kaggle

* Uncomment kaggle

Co-authored-by: Maximilian Strobel <Maximilian.Strobel@infineon.com>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2022-04-05 17:38:13 +02:00
Glenn Jocher
2181ef371e
Update cv2.imread() patch with flags argument (#7287) 2022-04-05 11:49:32 +02:00
Glenn Jocher
ffcbd8ca97
Export with official nn.SiLU() (#7256) 
* Update

* Update time_limit
 2022-04-03 18:45:05 +02:00
Glenn Jocher
a19406b39d
Update minimum Python>=3.7.0 (#7247) 2022-04-02 15:05:00 +02:00
Glenn Jocher
2c3221844b
CLI fire prep updates (#7229) 
* CLI fire prep updates

* revert unintentional TF export change
 2022-03-31 17:11:43 +02:00
Jirka Borovec
c3d5ac151e
precommit: yapf (#5494) 
* precommit: yapf

* align isort

* fix

# Conflicts:
#	utils/plots.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update setup.cfg

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update setup.cfg

* Update setup.cfg

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update wandb_utils.py

* Update augmentations.py

* Update setup.cfg

* Update yolo.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update val.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* simplify colorstr

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* val run fix

* export.py last comma

* Update export.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update hubconf.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* PyTorch Hub tuple fix

* PyTorch Hub tuple fix2

* PyTorch Hub tuple fix3

* Update setup

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2022-03-31 16:52:34 +02:00
Glenn Jocher
3373aab56c
NMS unused variable fix (#7161) 
* NMS unused variable fix

* Update general.py
 2022-03-26 16:52:58 +01:00
Glenn Jocher
26bfd44465
Adjust NMS time limit warning to batch size (#7156) 2022-03-26 11:45:28 +01:00
Zengyf-CVer
a4c661873f
Fix detect.py --view-img for non-ASCII paths (#7093) 
* Update detect.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update general.py

* Update detect.py

* Update general.py

* Update general.py

* Update general.py

* Update general.py

* Update general.py

* Update general.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update general.py

* Update general.py

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2022-03-25 13:40:55 +01:00
RcINS
d115bbf509
Fix cv2.imwrite on non-ASCII paths (#7139) 
* Fix imwrite on non-ASCII paths

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update general.py

* Update __init__.py

* Update __init__.py

* Update datasets.py

* Update hubconf.py

* Update detect.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update general.py

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2022-03-25 13:25:30 +01:00
Glenn Jocher
c3ae4e4af6
Multi-threaded VisDrone and VOC downloads (#7108) 
* Multi-threaded VOC download

* Update VOC.yaml

* Update

* Update general.py

* Update general.py
 2022-03-23 01:19:37 +01:00
Glenn Jocher
3f634d43c8
Conditional Timeout() by OS (disable on Windows) (#7013) 
* Conditional `Timeout()` by OS (disable on Windows)

* Update general.py
 2022-03-16 15:33:54 +01:00
Glenn Jocher
6dd82c0252
Move git_describe() to general.py (#6918) 
* Move `git_describe()` to general.py

* Move `git_describe()` to general.py
 2022-03-09 18:22:53 +01:00
Glenn Jocher
e6e36aac10
Update bytes to GB with bitshift (#6886) 2022-03-07 19:26:37 +01:00
Glenn Jocher
c161557563
Default OMP_NUM_THREADS=8 (#6770) 2022-02-25 00:09:14 +01:00
Glenn Jocher
2692e67c5f
Updated VOC hyperparameters (#6732) 
* Update hyps

* Update hyp.VOC.yaml

* Update pathlib

* Update hyps

* Update hyps

* Update hyps

* Update hyps
 2022-02-22 12:11:18 +01:00
Glenn Jocher
c21da596f3
Fix hyp_evolve.yaml indexing bug (#6604) 
* Fix `hyp_evolve.yaml` indexing bug

Bug caused hyp_evolve.yaml to display latest generation result rather than best generation result.

* Update plots.py

* Update general.py

* Update general.py

* Update general.py
 2022-02-10 14:51:29 +01:00
Glenn Jocher
9c513ca629
Add DATASETS_DIR global in general.py (#6578) 2022-02-08 22:20:44 +01:00
Jirka Borovec
cba4303d32
Fix 6 Flake8 issues (#6541) 
* F541

* F821

* F841

* E741

* E302

* E722

* Apply suggestions from code review

* Update general.py

* Update datasets.py

* Update export.py

* Update plots.py

* Update plots.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2022-02-05 15:22:59 +01:00
Glenn Jocher
c3e599cfda
Update val_batch*.jpg for Chinese fonts (#6526) 
* Update plots for Chinese fonts

* make is_chinese() non-str safe

* Add global FONT

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update general.py

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2022-02-03 19:09:24 +01:00
Glenn Jocher
6445a8137e
Resolve dataset paths (#6489) 2022-02-01 15:54:51 +01:00
Glenn Jocher
d5966c93f1
Namespace VERBOSE env variable to YOLOv5_VERBOSE (#6428) 
* Verbose updates

* Verbose updates
 2022-01-25 17:57:27 -05:00
Jonathan Samelson
ed9bac8392
Rename logger from 'utils.logger' to 'yolov5' (#6421) 
* Gave a more explicit name to the logger

* Cleanup

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2022-01-25 07:21:06 -08:00
johnk2hawaii
9708cf56ea
New environment variable VERBOSE (#6353) 
New environment variable `VERBOSE`
 2022-01-19 14:32:19 -10:00
Glenn Jocher
af001349e4
Add is_kaggle() function (#6285) 
* Add `is_kaggle()` function

Return True if environment is Kaggle Notebook.

* Remove root loggers only if is_kaggle() == True

* Update general.py
 2022-01-13 12:39:42 -10:00
Glenn Jocher
b4a29b5a8d
Update NMS max_wh=7680 for 8k images (#6178) 2022-01-03 10:54:52 -08:00
Glenn Jocher
b8a4babd60
Simplify set_logging() indexing (#6042) 2021-12-20 17:42:52 +01:00
Glenn Jocher
0db9d5b6a2
Kaggle LOGGER fix (#6041) 2021-12-20 17:30:46 +01:00
Glenn Jocher
407a905747
Check TensorRT>=8.0.0 version (#6021) 
* Check TensorRT>=8.0.0 version

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2021-12-17 14:59:46 +01:00
Glenn Jocher
8f875d93a2
Refactor NUM_THREADS (#5954) 2021-12-11 14:32:18 +01:00
iumyx2612
a42af30d8a
Update strip_optimizer() (#5949) 
Replace 'training_result' with 'best_fitness' in strip_optimizer() to match key with ckpt from train.py
 2021-12-10 18:06:27 +01:00
Glenn Jocher
7bf04d9bbf
AutoShape() models as DetectMultiBackend() instances (#5845) 
* Update AutoShape()

* autodownload ONNX

* Cleanup

* Finish updates

* Add Usage

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* fix device

* Update hubconf.py

* Update common.py

* smart param selection

* autodownload all formats

* autopad only pytorch models

* new_shape edits

* stride tensor fix

* Cleanup
 2021-12-04 15:00:07 +01:00
Glenn Jocher
7c6bae0ae6
Remove NCOLS from tqdm (#5804) 
* Remove NCOLS from tqdm

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2021-11-26 13:37:28 +01:00
Glenn Jocher
4ca4aec46f
Do not save hyp.yaml and opt.yaml on evolve (#5775) 
* Do not save hyp.yaml and opt.yaml on evolve

* Update general.py
 2021-11-24 23:25:51 +01:00
Glenn Jocher
61c50199a2
Update train, val tqdm to fixed width (#5367) 
* Update tqdm for fixed width

* Update val.py

* Update val.py

* Try ncols= in train.py

* NCOLS

* NCOLS

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* bar_format

* position 0 leave true

* exp0

* auto

* auto

* Cleanup

* Cleanup

* Cleanup

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2021-11-10 15:47:38 +01:00
Ayman Saleh
27bf4282d3
Fix check_requirements() resource warning allocation open file (#5602) 
* Fix to resource warning allocation; utilize file.open within a context manager

* rename fh to f

in keeping with naming convention

Co-authored-by: Ayman Saleh <aymansaleh@Aymans-MacBook-Pro-2.local>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2021-11-10 12:51:30 +01:00