mirrors
/
yolov5
mirror of https://github.com/ultralytics/yolov5.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,222 Commits
10 Branches
10 Tags
584 MiB
Commit Graph

52 Commits (3ce0db89b05e62b352befdadc33a148088a33e03)

Author SHA1 Message Date
Adrian Holovaty 3f74cd9ed1
Parameterize max_det + inference default at 1000 (#3215) 
* Added max_det parameters in various places

* 120 character line

* PEP8

* 120 character line

* Update inference default to 1000 instances

* Update inference default to 1000 instances

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2021-05-17 22:47:44 +02:00
Yonghye Kwon be86c21c73
rename class autoShape -> AutoShape (#3173) 
* rename class autoShape -> AutoShape

follow other class naming convention

* rename class autoShape -> AutoShape

follow other classes' naming convention

* rename class autoShape -> AutoShape
 2021-05-16 15:46:45 +02:00
Glenn Jocher 57812df68c
New Colors() class (#2963) 2021-04-28 16:05:14 +02:00
Burhan c949fc86d1
Detection cropping+saving feature addition for detect.py and PyTorch Hub (#2827) 
* Update detect.py

* Update detect.py

* Update greetings.yml

* Update cropping

* cleanup

* Update increment_path()

* Update common.py

* Update detect.py

* Update detect.py

* Update detect.py

* Update common.py

* cleanup

* Update detect.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2021-04-20 23:51:08 +02:00
Glenn Jocher c15e25c40f
PyTorch Hub cv2 .save() .show() bug fix (#2831) 
* PyTorch Hub cv2 .save() .show() bug fix

cv2.rectangle() was failing on non-contiguous np array inputs. This checks for contiguous arrays and applies is necessary:
```python
imgs[i] = im if im.data.contiguous else np.ascontiguousarray(im)  # update
```

* Update plots.py

```python
assert im.data.contiguous, 'Image not contiguous. Apply np.ascontiguousarray(im) to plot_on_box() input image.'
```

* Update hubconf.py

Expand CI tests to OpenCV image.
 2021-04-18 13:47:40 +02:00
Glenn Jocher b5de52c4cd
torch.cuda.amp bug fix (#2750) 
PR https://github.com/ultralytics/yolov5/pull/2725 introduced a very specific bug that only affects multi-GPU trainings. Apparently the cause was using the torch.cuda.amp decorator in the autoShape forward method. I've implemented amp more traditionally in this PR, and the bug is resolved.
 2021-04-09 18:19:49 +02:00
Glenn Jocher fca5e2a48f
autocast enable=torch.cuda.is_available() (#2748) 2021-04-09 13:34:49 +02:00
Glenn Jocher c03d590320
Add Hub results.pandas() method (#2725) 
* Add Hub results.pandas() method

New method converts results from torch tensors to pandas DataFrames with column names.

This PR may partially resolve issue https://github.com/ultralytics/yolov5/issues/2703

```python
results = model(imgs)

print(results.pandas().xyxy[0])
         xmin        ymin        xmax        ymax  confidence  class    name
0   57.068970  391.770599  241.383545  905.797852    0.868964      0  person
1  667.661255  399.303589  810.000000  881.396667    0.851888      0  person
2  222.878387  414.774231  343.804474  857.825073    0.838376      0  person
3    4.205386  234.447678  803.739136  750.023376    0.658006      5     bus
4    0.000000  550.596008   76.681190  878.669922    0.450596      0  person
```

* Update comments 

torch example input now shown resized to size=640 and also now a multiple of P6 stride 64 (see https://github.com/ultralytics/yolov5/issues/2722#issuecomment-814785930)

* apply decorators

* PEP8

* Update common.py

* pd.options.display.max_columns = 10

* Update common.py
 2021-04-07 16:28:07 +02:00
Glenn Jocher ec8979f1d2
Updated filename attributes for YOLOv5 Hub BytesIO (#2718) 
Fix 2 for 'Model predict with forward will fail if PIL image does not have filename attribute' #2702
 2021-04-06 13:18:56 +02:00
Glenn Jocher 74276d5189
Updated filename attributes for YOLOv5 Hub results (#2708) 
Proposed fix for 'Model predict with forward will fail if PIL image does not have filename attribute' #2702
 2021-04-05 22:20:09 +02:00
Glenn Jocher 17300a4c7b
autoShape forward im = np.asarray(im) # to numpy (#2689) 
Slight speedup.
 2021-04-02 12:36:38 +02:00
Glenn Jocher 2af059c0d8
PyTorch Hub model.save() increment as runs/hub/exp (#2684) 
* PyTorch Hub model.save() increment as runs/hub/exp

This chane will align PyTorch Hub results saving with the existing unified results saving directory structure of

runs/
  /train
  /detect
  /test
  /hub
    /exp
    /exp2
    ...

* cleanup
 2021-04-02 11:55:10 +02:00
Ding Yiwei 1148e2ea63
Add TransformerLayer, TransformerBlock, C3TR modules (#2333) 
* yolotr

* transformer block

* Remove bias in Transformer

* Remove C3T

* Remove a deprecated class

* put the 2nd LayerNorm into the 2nd residual block

* move example model to models/hub, rename to -transformer

* Add module comments and TODOs

* Remove LN in Transformer

* Add comments for Transformer

* Solve the problem of MA with DDP

* cleanup

* cleanup find_unused_parameters

* PEP8 reformat

Co-authored-by: DingYiwei <846414640@qq.com>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2021-04-01 17:26:53 +02:00
Glenn Jocher 2bf34f50fd
PyTorch Hub amp.autocast() inference (#2641) 
I think this should help speed up CUDA inference, as currently models may be running in FP32 inference mode on CUDA devices unnecesarily.
 2021-03-28 20:23:40 +02:00
Glenn Jocher 005d7a8c54
Update Detections() self.n comment (#2620) 
```python
        self.n = len(self.pred)  # number of images (batch size)
```
 2021-03-26 21:19:15 +01:00
Glenn Jocher a57f23d18b
Update detections() self.t = tuple() (#2617) 
* Update detections() self.t = tuple()

Fix multiple results.print() bug.

* Update experimental.py

* Update yolo.py
 2021-03-26 13:23:11 +01:00
Glenn Jocher 1c132a1f94
Update Detections() times=None (#2570) 
Fix for results.tolist() method breaking after YOLOv5 Hub profiling PRshttps://github.com/ultralytics/yolov5/pull/2460 https://github.com/ultralytics/yolov5/pull/2459 and
 2021-03-23 14:10:47 +01:00
Ayush Chaurasia e8fc97aa38
Improved W&B integration (#2125) 
* Init Commit

* new wandb integration

* Update

* Use data_dict in test

* Updates

* Update: scope of log_img

* Update: scope of log_img

* Update

* Update: Fix logging conditions

* Add tqdm bar, support for .txt dataset format

* Improve Result table Logger

* Init Commit

* new wandb integration

* Update

* Use data_dict in test

* Updates

* Update: scope of log_img

* Update: scope of log_img

* Update

* Update: Fix logging conditions

* Add tqdm bar, support for .txt dataset format

* Improve Result table Logger

* Add dataset creation in training script

* Change scope: self.wandb_run

* Add wandb-artifact:// natively

you can now use --resume with wandb run links

* Add suuport for logging dataset while training

* Cleanup

* Fix: Merge conflict

* Fix: CI tests

* Automatically use wandb config

* Fix: Resume

* Fix: CI

* Enhance: Using val_table

* More resume enhancement

* FIX : CI

* Add alias

* Get useful opt config data

* train.py cleanup

* Cleanup train.py

* more cleanup

* Cleanup| CI fix

* Reformat using PEP8

* FIX:CI

* rebase

* remove uneccesary changes

* remove uneccesary changes

* remove uneccesary changes

* remove unecessary chage from test.py

* FIX: resume from local checkpoint

* FIX:resume

* FIX:resume

* Reformat

* Performance improvement

* Fix local resume

* Fix local resume

* FIX:CI

* Fix: CI

* Imporve image logging

* (:(:Redo CI tests:):)

* Remember epochs when resuming

* Remember epochs when resuming

* Update DDP location

Potential fix for #2405

* PEP8 reformat

* 0.25 confidence threshold

* reset train.py plots syntax to previous

* reset epochs completed syntax to previous

* reset space to previous

* remove brackets

* reset comment to previous

* Update: is_coco check, remove unused code

* Remove redundant print statement

* Remove wandb imports

* remove dsviz logger from test.py

* Remove redundant change from test.py

* remove redundant changes from train.py

* reformat and improvements

* Fix typo

* Add tqdm tqdm progress when scanning files, naming improvements

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2021-03-23 00:44:50 +01:00
Glenn Jocher f813f6dcc8
autoShape() speed profiling update (#2460) 2021-03-13 20:00:03 -08:00
Glenn Jocher 569757ecc0
Add autoShape() speed profiling (#2459) 
* Add autoShape() speed profiling

* Update common.py

* Create README.md

* Update hubconf.py

* cleanuip
 2021-03-13 19:50:34 -08:00
Glenn Jocher c09964c27c
Update inference default to multi_label=False (#2252) 
* Update inference default to multi_label=False

* bug fix

* Update plots.py

* Update plots.py
 2021-02-19 15:39:09 -08:00
Yann Defretin 5f42643a53
Unified hub and detect.py box and labels plotting (#2243) 2021-02-19 12:38:05 -08:00
Glenn Jocher db28ce61ac
Improved hubconf.py CI tests (#2251) 2021-02-19 12:35:38 -08:00
Glenn Jocher 9d87307784
YOLOv5 Hub URL inference bug fix (#2250) 
* Update common.py

* Update common.py

* Update common.py
 2021-02-19 11:22:42 -08:00
Daniel Khromov 3e560e2fae
YOLOv5 PyTorch Hub results.save() method retains filenames (#2194) 
* save results with name

* debug

* save original imgs names

* Update common.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2021-02-12 15:37:51 -08:00
Glenn Jocher 404749a33c
PyTorch Hub results.save('path/to/dir') (#2179) 2021-02-10 16:10:43 -08:00
Glenn Jocher 2fc4760257
Update autoshape .print() and .save() (#2022) 2021-01-22 16:38:06 -08:00
Glenn Jocher aac33f87ad
Update inference multiple-counting (#2019) 
* Update inference multiple-counting

* update github check
 2021-01-22 15:39:08 -08:00
Glenn Jocher 1d1c0567a4
PyTorch Hub results.render() (#1897) 2021-01-10 20:06:11 -08:00
Glenn Jocher 69be8e738f
YOLOv5 v4.0 Release (#1837) 
* Update C3 module

* Update C3 module

* Update C3 module

* Update C3 module

* update

* update

* update

* update

* update

* update

* update

* update

* update

* updates

* updates

* updates

* updates

* updates

* updates

* updates

* updates

* updates

* updates

* update

* update

* update

* update

* updates

* updates

* updates

* updates

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update datasets

* update

* update

* update

* update attempt_downlaod()

* merge

* merge

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* parameterize eps

* comments

* gs-multiple

* update

* max_nms implemented

* Create one_cycle() function

* update

* update

* update

* update

* update

* update

* update

* update study.png

* update study.png

* Update datasets.py
 2021-01-04 19:54:09 -08:00
NanoCode012 14b0abe2d0
autoShape() default for PyTorch Hub models (#1692) 
* Add autoshape parameter

* Remove autoshape call in ReadMe

* Update hubconf.py

* file/URI inputs and autoshape check passthrough

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2020-12-26 19:58:26 -08:00
Glenn Jocher 799724108f
Update C3 module (#1705) 2020-12-15 22:13:08 -08:00
Glenn Jocher fa8f1fb0e9
Simplify autoshape() post-process (#1653) 
* Simplify autoshape() post-process

* cleanup

* cleanup
 2020-12-09 07:44:06 -08:00
Glenn Jocher ba48f867ea
Add bias to Classify() (#1601) 2020-12-04 15:06:33 +01:00
Glenn Jocher 199c9c7874
Detection() device bug fix (#1455) 2020-11-19 13:45:36 +01:00
Glenn Jocher 225845e781
Update test.py for IoU in native image-space (#1439) 
* Update test.py for IoU in native image-space

* remove redundant

* gn to device

* remove output scale_coords

* --img-size correction

* update

* native-space labels

* pred to predn

* remove clip_coords()
 2020-11-18 22:50:21 +01:00
Glenn Jocher f5429260ca
PyTorch Hub and autoShape update (#1415) 
* PyTorch Hub and autoShape update

* comment x for imgs

* reduce comment
 2020-11-16 23:09:55 +01:00
Glenn Jocher 15a10609fe
autoshape() update for PIL greyscale inputs (#1279) 
* autoshape update for PIL greyscale inputs

* autoshape update for PIL greyscale inputs
 2020-11-04 14:20:11 +01:00
Glenn Jocher 3b57cb5641
Simplified inference (#1153) 2020-10-15 20:10:08 +02:00
Glenn Jocher c4cb78570c add NMS to pretrained pytorch hub models 2020-09-18 18:17:11 -07:00
Glenn Jocher 916d4aad9a
v3.0 Release (#725) 
* initial commit

* remove yolov3-spp from test.py study

* update study --img range

* update mAP

* cleanup and speed updates

* update README plot
 2020-08-13 14:25:05 -07:00
Jirka Borovec d5b6416c87
Explicit Imports (#498) 
* expand imports

* optimize

* miss

* fix
 2020-08-02 15:47:36 -07:00
Glenn Jocher a97c3f94ec update common.py Classify() 2020-07-16 23:59:51 -07:00
Glenn Jocher 5387d4747d update common.py add Classify() 2020-07-16 17:18:41 -07:00
Glenn Jocher 1fca7a7f24 autopad() update in common.py 2020-07-01 19:15:59 -07:00
Glenn Jocher b5659d1195 module updates 2020-07-01 11:44:49 -07:00
Glenn Jocher e071b8dd3a update models/common.py for Conv() flexible padding 2020-06-24 13:12:23 -07:00
Glenn Jocher a814720403 PyTorch Hub updates 2020-06-10 19:11:11 -07:00
Glenn Jocher ff02ae0869 module updates 2020-06-08 22:13:01 -07:00
Glenn Jocher 12b0c046d5 model fusion and onnx export 2020-06-07 13:42:33 -07:00