Commit Graph
1206 Commits
Author SHA1 Message Date
Glenn Jocher 7a565f130a Update dataset_stats() (#3593)
@KalenMike this is a PR to add image filenames and labels to our stats dictionary and to save the dictionary to JSON. Save location is next to the train labels.cache file. The single JSON contains all stats for entire dataset.

Usage example:
```python
from utils.datasets import *

dataset_stats('coco128.yaml', verbose=True)
```
2021-06-12 13:26:41 +02:00
Glenn Jocher 4984cf54be train.py GPU memory fix (#3590)
* train.py GPU memory fix

* ema

* cuda

* cuda

* zeros input

* to device

* batch index 0
2021-06-11 20:24:03 +02:00
Glenn Jocher e8c5237403 ConfusionMatrix normalize=True fix (#3587) 2021-06-11 11:46:05 +02:00
Glenn Jocher ec2da4a82c Add ConfusionMatrix normalize=True flag (#3586) 2021-06-11 11:37:08 +02:00
Glenn Jocher 46e1fdfbc6 Update stale.yml (#3585) 2021-06-11 11:23:39 +02:00
Glenn Jocher 5c32bd3080 Created using Colaboratory 2021-06-10 16:01:34 +02:00
Glenn Jocher 53ed872c28 Update export.py, yolo.py sys.path.append() (#3579) 2021-06-10 15:35:22 +02:00
Glenn Jocher 095197bd4a Ignore Seaborn plot warnings (#3576)
* Ignore Seaborn plot warnings

* Update plots.py

* Update metrics.py
2021-06-10 13:51:29 +02:00
Glenn Jocher 4695ca8314 Refactoring cleanup (#3565)
* Refactoring cleanup

* Update test.py
2021-06-09 22:50:27 +02:00
Glenn Jocher 0e5cfdbea7 Refactor models/export.py arguments (#3564)
* Refactor models/export.py arguments

* cleanup

* cleanup
2021-06-09 22:43:46 +02:00
Glenn Jocher 66cf5c28c1 Refactor detect.py arguments (#3559)
* Refactor detect.py arguments

@SkalskiP @KalenMike

* unused ok

* comment arguments
2021-06-09 22:19:34 +02:00
Glenn Jocher a9553c04a7 Refactor test.py arguments (#3558)
* remove opt from test()

* pass kwargs

* update comments

* revert accidental default change

* multiple --img options

* add comments
2021-06-09 21:36:10 +02:00
dependabot[bot] c6deb73a89 Bump pip from 18.1 to 19.2 in /utils/google_app_engine (#3561)
Bumps [pip](https://github.com/pypa/pip) from 18.1 to 19.2.
- [Release notes](https://github.com/pypa/pip/releases)
- [Changelog](https://github.com/pypa/pip/blob/main/NEWS.rst)
- [Commits](https://github.com/pypa/pip/compare/18.1...19.2)

---
updated-dependencies:
- dependency-name: pip
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-09 21:14:09 +02:00
Glenn Jocher 4ef9261870 Remove redundant speed/study half argument (#3557) 2021-06-09 16:30:01 +02:00
Glenn Jocher 5948f20a3d Update test.py profiling (#3555)
* Update test.py profiling

* half_precision to half

* inplace
2021-06-09 16:25:17 +02:00
Glenn Jocher 8b5086c21b Multi-GPU default to single device 0 (#3554)
* Multi-GPU default to single device 0

* Multi-GPU default to single device 0

* add space
2021-06-09 15:31:47 +02:00
Glenn Jocher 63157d214d Remove is_coco argument from test() (#3553) 2021-06-09 15:09:51 +02:00
Glenn Jocher 958ab92dc1 Remove opt from create_dataloader()` (#3552) 2021-06-09 13:14:56 +02:00
Glenn Jocher 0cfc5b2c18 Update README.md (#3550)
Add permanent splash URL and update hyperlink from iOS landing page to Ultralytics YOLOv5 landing page at https://ultralytics.com/yolov5
2021-06-09 11:49:25 +02:00
Glenn Jocher f8ec71e1c2 Update check_python(minimum=3.6.2) (#3548) 2021-06-09 11:34:15 +02:00
Glenn Jocher ef0b5c9d29 On-demand pycocotools pip install (#3547) 2021-06-09 11:22:21 +02:00
Glenn Jocher 1b5edb6f8e Update dataset_stats() for HUB (#3536)
* Update `dataset_stats()` for HUB 

Cleanup of b6fdd2e

* autodownload flag

* Update general.py

* cleanup
2021-06-09 10:56:11 +02:00
Glenn Jocher b6fdd2e5e5 Create dataset_stats() for HUB 2021-06-08 23:09:45 +02:00
Glenn Jocher ac8691e208 Created using Colaboratory 2021-06-08 19:01:52 +02:00
Glenn Jocher 78cf488556 Created using Colaboratory 2021-06-08 18:54:33 +02:00
Glenn Jocher c6b51f4189 Update FP16 --half argument for test.py and detect.py (#3532)
* Update FP16 `--half` argument for test.py and detect.py

* Update detect.py
2021-06-08 18:47:13 +02:00
Glenn Jocher 8d52c1c5c5 Update datasets.py (#3531)
Minor updates to https://github.com/ultralytics/yolov5/pull/3505, inplace accumulation.
2021-06-08 18:36:40 +02:00
Glenn Jocher ed651873ff Merge branch 'develop' 2021-06-08 18:14:18 +02:00
Dean MarkandGlenn Jocher 28bff22df8 Use multi-threading in cache_labels (#3505)
* Use multi threading in cache_labels

* PEP8 reformat

* Add num_threads

* changed ThreadPool.imap_unordered to Pool.imap_unordered

* Remove inplace additions

* Update datasets.py

refactor initial desc

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2021-06-08 18:00:21 +02:00
+1 f3c3d2ce5d Merge develop branch into master (#3518)
* update ci-testing.yml (#3322)

* update ci-testing.yml

* update greetings.yml

* bring back os matrix

* update ci-testing.yml (#3322)

* update ci-testing.yml

* update greetings.yml

* bring back os matrix

* Enable direct `--weights URL` definition (#3373)

* Enable direct `--weights URL` definition

@KalenMike this PR will enable direct --weights URL definition. Example use case:
```
python train.py --weights https://storage.googleapis.com/bucket/dir/model.pt
```

* cleanup

* bug fixes

* weights = attempt_download(weights)

* Update experimental.py

* Update hubconf.py

* return bug fix

* comment mirror

* min_bytes

* Update tutorial.ipynb (#3368)

add Open in Kaggle badge

* `cv2.imread(img, -1)` for IMREAD_UNCHANGED (#3379)

* Update datasets.py

* comment

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>

* COCO evolution fix (#3388)

* COCO evolution fix

* cleanup

* update print

* print fix

* Create `is_pip()` function (#3391)

Returns `True` if file is part of pip package. Useful for contextual behavior modification.

```python
def is_pip():
    # Is file in a pip package?
    return 'site-packages' in Path(__file__).absolute().parts
```

* Revert "`cv2.imread(img, -1)` for IMREAD_UNCHANGED (#3379)" (#3395)

This reverts commit 21a9607e00.

* Update FLOPs description (#3422)

* Update README.md

* Changing FLOPS to FLOPs.

Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>

* Parse URL authentication (#3424)

* Parse URL authentication

* urllib.parse.unquote()

* improved error handling

* improved error handling

* remove %3F

* update check_file()

* Add FLOPs title to table (#3453)

* Suppress jit trace warning + graph once (#3454)

* Suppress jit trace warning + graph once

Suppress harmless jit trace warning on TensorBoard add_graph call. Also fix multiple add_graph() calls bug, now only on batch 0.

* Update train.py

* Update MixUp augmentation `alpha=beta=32.0` (#3455)

Per VOC empirical results https://github.com/ultralytics/yolov5/issues/3380#issuecomment-853001307 by @developer0hye

* Add `timeout()` class (#3460)

* Add `timeout()` class

* rearrange order

* Faster HSV augmentation (#3462)

remove datatype conversion process that can be skipped

* Add `check_git_status()` 5 second timeout (#3464)

* Add check_git_status() 5 second timeout

This should prevent the SSH Git bug that we were discussing @KalenMike

* cleanup

* replace timeout with check_output built-in timeout

* Improved `check_requirements()` offline-handling (#3466)

Improve robustness of `check_requirements()` function to offline environments (do not attempt pip installs when offline).

* Add `output_names` argument for ONNX export with dynamic axes (#3456)

* Add output names & dynamic axes for onnx export

Add output_names and dynamic_axes names for all outputs in torch.onnx.export. The first four outputs of the model will have names output0, output1, output2, output3

* use first output only + cleanup

Co-authored-by: Samridha Shrestha <samridha.shrestha@g42.ai>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>

* Revert FP16 `test.py` and `detect.py` inference to FP32 default (#3423)

* fixed inference bug ,while use half precision

* replace --use-half with --half

* replace space and PEP8 in detect.py

* PEP8 detect.py

* update --half help comment

* Update test.py

* revert space

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>

* Add additional links/resources to stale.yml message (#3467)

* Update stale.yml

* cleanup

* Update stale.yml

* reformat

* Update stale.yml HUB URL (#3468)

* Stale `github.actor` bug fix (#3483)

* Explicit `model.eval()` call `if opt.train=False` (#3475)

* call model.eval() when opt.train is False

call model.eval() when opt.train is False

* single-line if statement

* cleanup

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>

* check_requirements() exclude `opencv-python` (#3495)

Fix for 3rd party or contrib versions of installed OpenCV as in https://github.com/ultralytics/yolov5/issues/3494.

* Earlier `assert` for cpu and half option (#3508)

* early assert for cpu and half option

early assert for cpu and half option

* Modified comment

Modified comment

* Update tutorial.ipynb (#3510)

* Reduce test.py results spacing (#3511)

* Update README.md (#3512)

* Update README.md

Minor modifications

* 850 width

* Update greetings.yml

revert greeting change as PRs will now merge to master.

Co-authored-by: Piotr Skalski <SkalskiP@users.noreply.github.com>
Co-authored-by: SkalskiP <piotr.skalski92@gmail.com>
Co-authored-by: Peretz Cohen <pizzaz93@users.noreply.github.com>
Co-authored-by: tudoulei <34886368+tudoulei@users.noreply.github.com>
Co-authored-by: chocosaj <chocosaj@users.noreply.github.com>
Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
Co-authored-by: Yonghye Kwon <developer.0hye@gmail.com>
Co-authored-by: Sam_S <SamSamhuns@users.noreply.github.com>
Co-authored-by: Samridha Shrestha <samridha.shrestha@g42.ai>
Co-authored-by: edificewang <609552430@qq.com>
2021-06-08 10:22:10 +02:00
Glenn Jocher c058a61e3b Update greetings.yml
revert greeting change as PRs will now merge to master.
2021-06-08 10:11:06 +02:00
Glenn Jocher abb2a96e91 Update README.md (#3512)
* Update README.md

Minor modifications

* 850 width
2021-06-08 00:39:02 +02:00
Glenn Jocher d986145b9a Reduce test.py results spacing (#3511) 2021-06-07 23:21:34 +02:00
Glenn Jocher eede7dc48c Update tutorial.ipynb (#3510) 2021-06-07 22:52:16 +02:00
Yonghye Kwon 8d1ddc93c7 Earlier assert for cpu and half option (#3508)
* early assert for cpu and half option

early assert for cpu and half option

* Modified comment

Modified comment
2021-06-07 18:56:41 +02:00
Glenn Jocher 3f03acb3db check_requirements() exclude opencv-python (#3507)
Duplicate of #3495 merged to `develop`. This PR will be merged to `master`.

Fixes https://github.com/ultralytics/yolov5/issues/3494.
2021-06-07 15:38:51 +02:00
Glenn Jocher 90b7895d65 check_requirements() exclude opencv-python (#3495)
Fix for 3rd party or contrib versions of installed OpenCV as in https://github.com/ultralytics/yolov5/issues/3494.
2021-06-07 10:03:47 +02:00
Yonghye KwonandGlenn Jocher a1c3572bc9 Explicit model.eval() call if opt.train=False (#3475)
* call model.eval() when opt.train is False

call model.eval() when opt.train is False

* single-line if statement

* cleanup

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2021-06-06 18:39:36 +02:00
Glenn Jocher cf4f95bc5f Stale github.actor bug fix (#3483) 2021-06-06 18:06:24 +02:00
Glenn Jocher 3597d280ee Update stale.yml HUB URL (#3468) 2021-06-04 23:49:43 +02:00
Glenn Jocher 739451da5a Add additional links/resources to stale.yml message (#3467)
* Update stale.yml

* cleanup

* Update stale.yml

* reformat
2021-06-04 23:45:24 +02:00
edificewangandGlenn Jocher b31229ae89 Revert FP16 test.py and detect.py inference to FP32 default (#3423)
* fixed inference bug ,while use half precision

* replace --use-half with --half

* replace space and PEP8 in detect.py

* PEP8 detect.py

* update --half help comment

* Update test.py

* revert space

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2021-06-04 22:28:34 +02:00
044daafd9d Add output_names argument for ONNX export with dynamic axes (#3456)
* Add output names & dynamic axes for onnx export

Add output_names and dynamic_axes names for all outputs in torch.onnx.export. The first four outputs of the model will have names output0, output1, output2, output3

* use first output only + cleanup

Co-authored-by: Samridha Shrestha <samridha.shrestha@g42.ai>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2021-06-04 22:01:58 +02:00
Glenn Jocher 317f2ccc9d Improved check_requirements() offline-handling (#3466)
Improve robustness of `check_requirements()` function to offline environments (do not attempt pip installs when offline).
2021-06-04 21:34:36 +02:00
Glenn Jocher 563ea9475a Add check_git_status() 5 second timeout (#3464)
* Add check_git_status() 5 second timeout

This should prevent the SSH Git bug that we were discussing @KalenMike

* cleanup

* replace timeout with check_output built-in timeout
2021-06-04 21:17:36 +02:00
Yonghye Kwon c37f072ba7 Faster HSV augmentation (#3462)
remove datatype conversion process that can be skipped
2021-06-04 20:02:20 +02:00
Glenn Jocher d40481acc5 Add timeout() class (#3460)
* Add `timeout()` class

* rearrange order
2021-06-04 15:23:33 +02:00
Glenn Jocher 8e3b4a0bf3 Update MixUp augmentation alpha=beta=32.0 (#3455)
Per VOC empirical results https://github.com/ultralytics/yolov5/issues/3380#issuecomment-853001307 by @developer0hye
2021-06-04 12:47:53 +02:00
Glenn Jocher 4aa2959101 Suppress jit trace warning + graph once (#3454)
* Suppress jit trace warning + graph once

Suppress harmless jit trace warning on TensorBoard add_graph call. Also fix multiple add_graph() calls bug, now only on batch 0.

* Update train.py
2021-06-04 12:37:41 +02:00
Glenn Jocher af2bc3a1c3 Add FLOPs title to table (#3453) 2021-06-04 11:46:40 +02:00