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
1e112ced79
YOLOv5 OpenVINO PyTorch Hub inference fix ( #7826 )
...
Resolves bug report #7817
2022-05-16 00:56:44 +02:00
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
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
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
d5966c93f1
Namespace `VERBOSE` env variable to `YOLOv5_VERBOSE` ( #6428 )
...
* Verbose updates
* Verbose updates
2022-01-25 17:57:27 -05:00
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
e8ef8fb1ca
`pretrained=False` fix ( #5966 )
...
* `pretriained=False` fix
Fix for https://github.com/ultralytics/yolov5/issues/5964
* CI speed improvement
2021-12-13 13:32:27 +01:00
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
46daa7b78d
Remove `.autoshape()` method ( #5694 )
2021-11-20 01:11:36 +01:00
e189fa15ea
`intersect_dicts()` in hubconf.py fix ( #5542 )
2021-11-06 15:41:17 +01:00
0155548384
precommit: isort ( #5493 )
...
* precommit: isort
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Update isort config
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Update name
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>
2021-11-04 17:24:25 +01:00
956be8e642
YOLOv5 release v6.0 ( #5141 )
...
* Update P5 models
* Update P6 models
* Update with GFLOPs and Params
* Update with GFLOPs and Params
* Update README
* Update
* Update README
* Update
* Update
* Add times
* Update README
* Update results
* Update results
* Update results
* Update hyps
* Update plots
* Update plots
* Update README.md
* Add nano models to hubconf.py
2021-10-11 23:47:18 -07:00
4c839eeb10
Simplify `check_requirements()` usage ( #4855 )
...
* Simplify `check_requirements()` usage
* remove assert, print()
2021-09-18 18:34:30 +02:00
c47be26f34
Replace `path.absolute()` with `path.resolve()` ( #4763 )
2021-09-11 22:46:33 +02:00
dbc06ce292
Update hubconf.py attempt_load import ( #4428 )
2021-08-16 10:58:02 +02:00
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
2683b18079
Update Hub Path inputs ( #4200 )
2021-07-28 16:55:39 +02:00
5d66e48723
Train from `--data path/to/dataset.zip` feature ( #4185 )
...
* Train from `--data path/to/dataset.zip` feature
* Update dataset_stats()
* cleanup
* cleanup2
2021-07-28 02:04:10 +02:00
411842e058
Fix `torch.hub.list('ultralytics/yolov5')` pathlib bug ( #3921 )
2021-07-07 16:08:42 +02:00
61047a2b4f
Save PyTorch Hub models to `/root/hub/cache/dir` ( #3904 )
...
* Create hubconf.py
* Add save_dir variable
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2021-07-07 13:41:46 +02:00
6a3ee7cf03
Hub models `map_location=device` ( #3894 )
...
* Hub models `map_location=device`
* cleanup
2021-07-05 16:20:46 +02:00
ef0b5c9d29
On-demand `pycocotools` pip install ( #3547 )
2021-06-09 11:22:21 +02:00
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#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
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
b133baa336
Add `device` argument to PyTorch Hub models ( #3104 )
...
* Allow to manual selection of device for torchhub models
* single line device
nested torch.device(torch.device(device)) ok
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2021-05-16 17:41:26 +02:00
06372b1465
Scope all hubconf.py imports for torch.hub.list() ( #3145 )
...
* Scope all hubconf.py imports for torch.hub.list()
* Update hubconf.py
2021-05-12 20:28:26 +02:00
1935266951
Scope imports for torch.hub.list() improvement ( #3144 )
2021-05-12 20:18:32 +02:00
31ee54c28c
Hubconf.py bug fix ( #3007 )
2021-05-01 18:15:17 +02:00
7c89c829e3
cleanup
2021-05-01 17:48:12 +02:00
c1a44ed9c5
Update hubconf.py for unified loading ( #3005 )
2021-05-01 17:35:02 +02:00
d08575ee5e
PyTorch Hub load directly when possible ( #2986 )
2021-04-30 14:59:51 +02:00
a833ee2a46
Update check_requirements() exclude list ( #2974 )
2021-04-29 21:16:23 +02:00
c0d3f80544
Add verbose option to pytorch hub models ( #2926 )
...
* Add verbose and update print to logging
* Fix positonal param
* Revert auto formatting changes
* Update hubconf.py
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2021-04-25 22:01:05 +02:00
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
0f395b3e3b
YOLOv5 v5.0 Release patch 1 ( #2764 )
...
* torch.jit.trace(model, img, strict=False)
* Update check_file()
* Update hubconf.py
* Update README.md
2021-04-11 23:11:43 +02:00
f5b8f7d54c
YOLOv5 v5.0 Release ( #2762 )
2021-04-11 19:23:47 +02:00
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
866bc7d640
Speed profiling improvements ( #2648 )
...
* Speed profiling improvements
* Update torch_utils.py
deepcopy() required to avoid adding elements to model.
* Update torch_utils.py
2021-03-29 15:19:07 +02:00
ee169834bd
PyTorch Hub custom model to CUDA device fix ( #2636 )
...
Fix for #2630 raised by @Pro100rus32
2021-03-28 17:22:00 +02:00
8ace1b1b99
YOLOv5 PyTorch Hub models >> check_requirements() ( #2588 )
...
* YOLOv5 PyTorch Hub models >> check_requirements()
Update YOLOv5 PyTorch Hub requirements.txt path to cache path.
* Update hubconf.py
2021-03-24 16:23:54 +01:00
2bcc89d762
YOLOv5 PyTorch Hub models >> check_requirements() ( #2577 )
...
* Update hubconf.py with check_requirements()
Dependency checks have been missing from YOLOv5 PyTorch Hub model loading, causing errors in some cases when users are attempting to import hub models in unsupported environments. This should examine the YOLOv5 requirements.txt file and pip install any missing or version-conflict packages encountered.
This is highly experimental (!), please let us know if this creates problems in your custom workflows.
* Update hubconf.py
2021-03-24 15:42:00 +01:00
9b11f0c58b
PyTorch Hub models default to CUDA:0 if available ( #2472 )
...
* PyTorch Hub models default to CUDA:0 if available
* device as string bug fix
2021-03-14 23:16:17 -07:00
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
fab5085674
EMA bug fix 2 ( #2330 )
...
* EMA bug fix 2
* update
2021-03-01 17:13:34 -08:00
db28ce61ac
Improved hubconf.py CI tests ( #2251 )
2021-02-19 12:35:38 -08:00
9a3da79b4a
Update requirements.txt ( #2021 )
...
* Update requirements.txt
* Update ci-testing.yml
* Update hubconf.py
2021-01-23 12:51:04 -08:00
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
e92245a38c
Simplified PyTorch hub for custom models ( #1677 )
2020-12-12 11:42:27 -08:00
f7a923b446
Simplified PyTorch hub for custom models ( #1677 )
2020-12-12 11:37:53 -08:00
Glenn Jocher
Jirka Borovec
RcINS
Omid Sadeghnezhad
johnohagan
Christoph Gerum
NanoCode012