Commit Graph
695 Commits
Author SHA1 Message Date
Glenn Jocher b57abb17f2 Move trainloader functions to class methods (#6559)
* Move trainloader functions to class methods

* results = ThreadPool(NUM_THREADS).imap(self.load_image, range(n))

* Cleanup
2022-02-07 18:59:26 +01:00
Jirka BorovecandGlenn Jocher 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 Jocherandpre-commit-ci[bot] 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 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
Glenn Jocher fe7de6a82d Revert "Remove dataset_stats() autodownload capability (#6303)" (#6442)
This reverts commit 3119b2f27c.
2022-01-26 19:10:59 +01:00
toschi23 3b7ac28ed1 Add *.asf video support (#6436) 2022-01-26 14:26:02 +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 SamelsonandGlenn Jocher 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
Glenn Jocher 482af479c0 Add detect.py GIF video inference (#6410)
* Add detect.py GIF video inference

* Cleanup
2022-01-24 13:11:11 -08:00
MatthiasandGlenn Jocher 8efe97719c Add stop_training=False flag to callbacks (#6365)
* New flag 'stop_training' in util.callbacks.Callbacks class to prematurely stop training from callback handler

* Removed most of the new  checks, leaving only the one after calling 'on_train_batch_end'

* Cleanup

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2022-01-22 16:37:21 -10:00
Ayush ChaurasiaandGlenn Jocher 9bcc32a5bf Flush callbacks when on --evolve (#6374)
* log best.pt metrics at train end

* update

* Update __init__.py

* flush callbacks when using evolve

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2022-01-20 13:22:47 -10:00
sitecao e1893c894a DEVICE_COUNT instead of WORLD_SIZE to calculate nw (#6324) 2022-01-20 13:06:26 -10:00
imyhxy 4e841b9b16 Reuse de_parallel() rather than is_parallel() (#6354) 2022-01-20 10:50:17 -10:00
johnk2hawaii 9708cf56ea New environment variable VERBOSE (#6353)
New environment variable `VERBOSE`
2022-01-19 14:32:19 -10:00
Glenn Jocher fd55271c04 Console corrupted -> corrupt (#6338)
* Console corrupted -> corrupt 

Minor style changes.

* Update export.py
2022-01-18 10:49:26 -10:00
Glenn Jocher 3119b2f27c Remove dataset_stats() autodownload capability (#6303)
* Remove `dataset_stats()` autodownload capability

@kalenmike security update per Slack convo

* Update datasets.py
2022-01-18 10:04:49 -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
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 9e9219fe17 Fix nan-robust stream FPS (#6198)
Fix for Webcam stop working suddenly (Issue #6197)
2022-01-04 19:32:42 -08:00
Glenn Jocher b4a29b5a8d Update NMS max_wh=7680 for 8k images (#6178) 2022-01-03 10:54:52 -08:00
affa284352 Refactor/reduce G/C/D/IoU if: else statements (#6087)
* Refactor the code to reduece else

* Update metrics.py

* Cleanup

Co-authored-by: Cmos <gen.chen@ubisoft.com>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2021-12-30 13:59:29 -08:00
Awsaf 7b6938d5b5 Log best results (#6085)
* log best result in summary

* comment added

* add space for `flake8`

* log `best/epoch`

* fix `dimension` for epoch

ValueError: all the input arrays must have same number of dimensions

* log `best/` in `utils.logger.__init__`

* fix pre-commit

1. missing whitespace around operator
2.  over-indented
2021-12-30 13:47:53 -08:00
Ayush ChaurasiaandGlenn Jocher 9155eb8641 W&B: Log best results after training ends (#6120)
* log best.pt metrics at train end

* update

* Update __init__.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2021-12-30 11:43:19 -08:00
Ayush ChaurasiaandGlenn Jocher db6ec66a60 W&B: track batch size after autobatch (#6039)
* track batch size after autobatch

* remove redundant import

* Update __init__.py

* Update __init__.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2021-12-23 14:23:50 +01:00
JieLiand李杰 afa5cfb0f8 Reduce G/D/CIoU logic operations (#6074)
Consider that the default value is CIOU,adjust the order of judgment could reduce the number of judgments.
And “elif CIoU:” didn't need 'if'.

Co-authored-by: 李杰 <360751194@qq.comqq.com>
2021-12-23 11:53:00 +01: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 Jocherandpre-commit-ci[bot] 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 da9a1b719b Allow --weights URL (#5991) 2021-12-15 15:27:08 +01:00
Mrinal Jain b7d18f3636 Increase ar_thr from 20 to 100 for better detection on slender (high aspect ratio) objects (#5556)
* Making `ar_thr` available as a hyperparameter

* Disabling ar_thr as hyperparameter and computing from the dataset instead

* Fixing bug in ar_thr computation

* Fix `ar_thr` to 100
2021-12-15 14:42:23 +01:00
Glenn Jocher c9a46a60e0 Update callbacks.py with __init__() (#5979)
Add __init__() function.
2021-12-14 15:47:49 +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
Felix YouandGlenn Jocher 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 c77a5a84e3 Absolute '/content/sample_data' (#5922) 2021-12-08 17:31:31 +01:00
Glenn Jocher a3d5f1d3e3 Revert "Update plot_lr_scheduler() (#5864)" (#5920)
This reverts commit 360eec6910.
2021-12-08 16:46:24 +01:00
Glenn Jocherandpre-commit-ci[bot] 7d56d45124 Add hardware checks to notebook_init() (#5919)
* Update notebook

* Update notebook

* update string

* update string

* Updates

* Updates

* Updates

* check both ipython and psutil

* remove sample_data if is_colab

* cleanup

* [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-08 14:57:03 +01:00
Ayush Chaurasia 3f152e5807 Update wandb_utils.py (#5908) 2021-12-07 16:09:11 +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 d885799c71 Update nl after cutout() (#5873) 2021-12-03 15:28:14 +01:00
Can 360eec6910 Update plot_lr_scheduler() (#5864)
shallow copy modify originals
2021-12-03 13:37:45 +01:00
Glenn Jocher 00e308f7be Update TorchScript suffix to *.torchscript (#5856) 2021-12-02 16:06:45 +01:00
gggmt 1679aacdc7 Update LoadImages ret_val=False handling (#5852)
Video errors may occur.
2021-12-02 10:57:39 +01:00
Yu Zhang e8f8f2b903 Avoid inplace modifyingimgs in LoadStreams (#5850)
When OpenCV retrieving image fail, original code would modify source images **inplace**, which may result in plotting bounding boxes on a black image. That is, before inference, source image `im0s[i]` is OK, but after inference before `Process predictions`,  `im0s[i]` may have been changed.
2021-12-02 10:51:19 +01:00
Glenn Jocher bc484579d7 Handle non-TTY wandb.errors.UsageError (#5839)
* `try: except (..., wandb.errors.UsageError)`

* bug fix
2021-12-01 15:38:02 +01:00
Glenn Jocher 5ca5dd4c87 Update dataset_stats() to cv2.INTER_AREA (#5821) 2021-11-29 13:15:36 +01:00