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,187 Commits 10 Branches 10 Tags
Commit Graph

110 Commits

Author SHA1 Message Date
Glenn Jocher
8f28ea4945
emoji-safe default logging (#8888) 
* emoji-safe default logging

* implement everywhere
 2022-08-06 12:30:08 +02:00
Glenn Jocher
20f1b7ea08
smart_optimizer() improved reporting (#8887) 
Update smart_optimizer() weight_decay reporting
 2022-08-06 11:30:54 +02:00
Glenn Jocher
a75a1105a1
Self-contained checkpoint --resume (#8839) 
* Single checkpoint resume

* Update train.py

* Add hyp

* Add hyp

* Add hyp

* FIX

* avoid resume on url data

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

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

* avoid resume on url data

* avoid resume on url data

* Update

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2022-08-03 21:28:22 +02:00
Glenn Jocher
08c8c3e00a
New smart_resume() (#8838) 
* New `smart_resume()`

* Update torch_utils.py

* Update torch_utils.py

* Update torch_utils.py

* fix
 2022-08-02 15:13:58 +02:00
Glenn Jocher
9cf5fd5ac3
assert torch!=1.12.0 for DDP training (#8621) 
* assert torch!=1.12.0 for DDP training

* [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-07-18 15:05:58 +02:00
Glenn Jocher
51fb467b63
Refactor optimizer initialization (#8607) 
* Refactor optimizer initialization

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

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

* Update train.py

* Update train.py

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2022-07-17 11:43:52 +02:00
Glenn Jocher
29d79a6360
Do not prefer Apple MPS (#8446) 
Require explicit request for MPS, i.e.
```bash
python detect.py --device mps
```

Reverts https://github.com/ultralytics/yolov5/pull/8210 for preferring MPS if available. 

Note that torch MPS is experiencing ongoing compatibility issues in https://github.com/pytorch/pytorch/issues/77886
 2022-07-02 18:35:45 +02:00
Glenn Jocher
303f3785ae
Prefer MPS over CPU if available (#8210) 
* Prefer MPS over CPU if available

* Update torch_utils.py
 2022-06-17 18:28:29 +02:00
Glenn Jocher
c215878f11
YOLOv5 Apple Metal Performance Shader (MPS) support (#7878) 
* Apple Metal Performance Shader (MPS) device support

Following https://pytorch.org/blog/introducing-accelerated-pytorch-training-on-mac/

Should work with Apple M1 devices with PyTorch nightly installed with command `--device mps`. Usage examples:
```bash
python train.py --device mps
python detect.py --device mps
python val.py --device mps
```

* Update device strategy to fix MPS issue
 2022-05-24 13:34:32 +02:00
xylieong
f43cd53d44
Added Windows cmd to count GPU devices (#7891) 
* Added Windows cmd to count GPU devices

* Cleanup

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2022-05-19 15:48:44 +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
pre-commit-ci[bot]
7882950577
[pre-commit.ci] pre-commit suggestions (#7279) 
* [pre-commit.ci] pre-commit suggestions

updates:
- [github.com/asottile/pyupgrade: v2.31.0 → v2.31.1](https://github.com/asottile/pyupgrade/compare/v2.31.0...v2.31.1)
- [github.com/pre-commit/mirrors-yapf: v0.31.0 → v0.32.0](https://github.com/pre-commit/mirrors-yapf/compare/v0.31.0...v0.32.0)

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

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

* Update yolo.py

* Update activations.py

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

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

* Update activations.py

* Update tf.py

* Update tf.py

* [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>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2022-04-04 22:47:00 +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
6134ec5d94
Model summary pathlib fix (#7104) 
Stems not working correctly for YOLOv5l with current .rstrip() implementation. After fix:
```
YOLOv5l summary: 468 layers, 46563709 parameters, 46563709 gradients, 109.3 GFLOPs
```
 2022-03-22 20:05:07 +01:00
Glenn Jocher
a600baed8e
Update model summary to display model name (#7101) 2022-03-22 15:41:19 +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
0f819919ad
Update EMA decay tau (#6769) 
* Update EMA

* Update EMA

* ratio invert

* fix ratio invert

* fix2 ratio invert

* warmup iterations to 100

* ema_k

* implement tau

* implement tau
 2022-02-25 12:33:09 +01:00
Glenn Jocher
4de8b24881
Suppress torch AMP-CPU warnings (#6706) 
This is a torch bug, but they seem unable or unwilling to fix it so I'm creating a suppression in YOLOv5. 

Resolves https://github.com/ultralytics/yolov5/issues/6692
 2022-02-19 16:48:33 +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
d8b5beb0b0
Fix2 select_device() for Multi-GPU (#6461) 
* Fix2 select_device() for Multi-GPU

* Cleanup

* Cleanup

* Simplify error message

* Improve assert

* Update torch_utils.py
 2022-01-28 08:18:01 +01:00
Glenn Jocher
856d4e5733
Fix select_device() for Multi-GPU (#6434) 
* Fix `select_device()` for Multi-GPU

Possible fix for https://github.com/ultralytics/yolov5/issues/6431

* Update torch_utils.py

* Update torch_utils.py

* Update torch_utils.py

* Update torch_utils.py

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update
 2022-01-26 23:47:00 +01:00
imyhxy
4e841b9b16
Reuse de_parallel() rather than is_parallel() (#6354) 2022-01-20 10:50:17 -10:00
Glenn Jocher
436ffc417a
select_device() cleanup (#6302) 
* `select_device()` cleanup

* Update torch_utils.py

* Update torch_utils.py

* Update torch_utils.py

* Update torch_utils.py

* Update torch_utils.py
 2022-01-14 15:48:15 -10:00
Henry
a1a9c6884c
Fixing bug multi-gpu training (#6299) 
* Fixing bug multi-gpu training

This solves this issue: https://github.com/ultralytics/yolov5/issues/6297#issue-1103853348

* Update torch_utils.py for pep8
 2022-01-14 10:11:06 -10:00
Glenn Jocher
e7bf38277f
Fix device count check (#6290) 
* Fix device count check()

* Update torch_utils.py

* Update torch_utils.py

* Update hubconf.py
 2022-01-13 21:23:03 -10:00
Felix You
c45f9f678d
Make select_device() robust to batch_size=-1 (#5940) 
* Find out a bug. When set batch_size = -1 to use the autobatch.

reproduce:

* Fix type conflict

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2021-12-10 15:27:20 +01:00
Glenn Jocher
7ebb5e5da6
Add notebook_init() to utils/__init__.py (#5488) 
* Update __init__.py

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

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

* notebook_init

* notebook_init

* notebook_init

* notebook_init

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

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

* notebook_init

* Created using Colaboratory

* [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-09 23:03:19 +01:00
Glenn Jocher
3883261143
New DetectMultiBackend() class (#5549) 
* New `DetectMultiBackend()` class

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

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

* pb to pt fix

* Cleanup

* explicit apply_classifier path

* Cleanup2

* Cleanup3

* Cleanup4

* Cleanup5

* Cleanup6

* val.py MultiBackend inference

* warmup fix

* to device fix

* pt fix

* device fix

* Val cleanup

* COCO128 URL to assets

* half fix

* detect fix

* detect fix 2

* remove half from DetectMultiBackend

* training half handling

* training half handling 2

* training half handling 3

* Cleanup

* Fix CI error

* Add torchscript _extra_files

* Add TorchScript

* Add CoreML

* CoreML cleanup

* New `DetectMultiBackend()` class

* pb to pt fix

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

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

* Cleanup

* explicit apply_classifier path

* Cleanup2

* Cleanup3

* Cleanup4

* Cleanup5

* Cleanup6

* val.py MultiBackend inference

* warmup fix

* to device fix

* pt fix

* device fix

* Val cleanup

* COCO128 URL to assets

* half fix

* detect fix

* detect fix 2

* remove half from DetectMultiBackend

* training half handling

* training half handling 2

* training half handling 3

* Cleanup

* Fix CI error

* Add torchscript _extra_files

* Add TorchScript

* Add CoreML

* CoreML cleanup

* revert default to pt

* Add Usage examples

* Cleanup val

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2021-11-09 16:45:02 +01:00
Glenn Jocher
79bca2bf64
LOGGER consolidation (#5569) 
* Logger consolidation

* [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-08 16:32:15 +01:00
Glenn Jocher
e189fa15ea
intersect_dicts() in hubconf.py fix (#5542) 2021-11-06 15:41:17 +01:00
Glenn Jocher
5866646cc8
Fix float zeros format (#5491) 
* Fix float zeros format

* 255 to integer
 2021-11-03 23:36:53 +01:00
Glenn Jocher
84a8099b75
Update torch_utils.py import LOGGER (#5483) 2021-11-03 17:17:38 +01:00
Glenn Jocher
df30426c03
Improve GPU name (#5478) 
* Improve GPU name

* Update torch_utils.py

* Update torch_utils.py

* Update torch_utils.py

* Update torch_utils.py
 2021-11-03 16:59:53 +01:00
Glenn Jocher
5d4258fac5
Fix MixConv2d() remove shortcut + apply depthwise (#5410) 2021-10-30 13:38:51 +02:00
Jirka Borovec
ed887b5976
Add pre-commit CI actions (#4982) 
* define pre-commit

* add CI code

* configure

* apply pre-commit

* fstring

* apply MD

* pre-commit

* Update torch_utils.py

* Update print strings

* notes

* Cleanup code-format.yml

* Update setup.cfg

* Update .pre-commit-config.yaml

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2021-10-28 18:35:01 +02:00
Glenn Jocher
ca19df5f7f
Add autobatch feature for best batch-size estimation (#5092) 
* Autobatch

* fix mem

* fix mem2

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update train.py

* print result

* Cleanup print result

* swap fix in call

* to 64

* use total

* fix

* fix

* fix

* fix

* fix

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Cleanup printing

* Update final printout

* Update autobatch.py

* Update autobatch.py

* Update autobatch.py
 2021-10-25 13:56:13 +02:00
Glenn Jocher
441b47c443
More informative EarlyStopping() message (#5303) 2021-10-22 20:02:19 +02:00
Glenn Jocher
84bfa89236
Consolidate init_seeds() (#4849) 2021-09-18 13:28:42 +02:00
Glenn Jocher
548745181a
EarlyStopper updates (#4679) 2021-09-05 19:09:53 +02:00
Glenn Jocher
93cc015748
Add EarlyStopping feature (#4576) 
* Add EarlyStopping feature

* Add comment

* Cleanup

* Cleanup2

* debug

* debug2

* debug3

* debug3

* debug4

* debug5

* debug6

* debug7

* debug8

* debug9

* debug10

* debug11

* debug12

* Cleanup

* Add TODO for known DDP issue
 2021-08-28 19:03:52 +02:00
Glenn Jocher
19d03a955c
Remove DDP process group timeout (#4422) 2021-08-15 18:32:41 +02:00
Glenn Jocher
24bea5e4b7
Standardize headers and docstrings (#4417) 
* Implement new headers

* Reformat 1

* Reformat 2

* Reformat 3 - math

* Reformat 4 - yaml
 2021-08-14 21:17:51 +02:00
imyhxy
771ac6c53d
Fixed logging level in distributed mode (#4284) 
Co-authored-by: fkwong <huangfuqiang@transai.cn>
 2021-08-03 13:11:42 +02:00
Glenn Jocher
d8f18834a2
Update profile() for CUDA Memory allocation (#4239) 
* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Cleanup
 2021-07-30 18:17:19 +02:00
Glenn Jocher
9468657502
Update profiler (#4236) 2021-07-30 16:00:47 +02:00
Glenn Jocher
f7d8562060
val.py refactor (#4053) 
* val.py refactor

* cleanup

* cleanup

* cleanup

* cleanup

* save after eval

* opt.imgsz bug fix

* wandb refactor

* dataloader to train_loader

* capitalize global variables

* runs/hub/exp to runs/detect/exp

* refactor wandb logging

* Refactor wandb operations (#4061)

Co-authored-by: Ayush Chaurasia <ayush.chaurarsia@gmail.com>
 2021-07-19 10:43:01 +02:00
Glenn Jocher
6a3ee7cf03
Hub models map_location=device (#3894) 
* Hub models `map_location=device`

* cleanup
 2021-07-05 16:20:46 +02:00
Glenn Jocher
fad27c0046
Update DDP for torch.distributed.run with gloo backend (#3680) 
* Update DDP for `torch.distributed.run`

* Add LOCAL_RANK

* remove opt.local_rank

* backend="gloo|nccl"

* print

* print

* debug

* debug

* os.getenv

* gloo

* gloo

* gloo

* cleanup

* fix getenv

* cleanup

* cleanup destroy

* try nccl

* return opt

* add --local_rank

* add timeout

* add init_method

* gloo

* move destroy

* move destroy

* move print(opt) under if RANK

* destroy only RANK 0

* move destroy inside train()

* restore destroy outside train()

* update print(opt)

* cleanup

* nccl

* gloo with 60 second timeout

* update namespace printing
 2021-06-19 16:30:25 +02:00