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

154 Commits

Author SHA1 Message Date
Glenn Jocher
a34b376d0f
Link fuse() to AutoShape() for Hub models (#8599) 2022-07-16 23:46:23 +02:00
Colin Wong
f8722b4429
Raise error on suffix-less model path (#8561) 
Raise error on invalid model
 2022-07-13 11:13:01 +02:00
Colin Wong
be42a24d23
Properly expose batch_size from OpenVINO similarly to TensorRT (#8514) 
Properly expose `batch_size` from OpenVINO

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2022-07-07 23:53:09 +02:00
Glenn Jocher
9d7bc06ae7
Revert "Expose OpenVINO batch_size similarly to TensorRT" (#8510) 
Revert "Expose OpenVINO `batch_size` similarly to TensorRT (#8437)"

This reverts commit da2ee3934e2572d700000cc1e5fdac615ba4dd79.
 2022-07-07 20:13:42 +02:00
Colin Wong
da2ee3934e
Expose OpenVINO batch_size similarly to TensorRT (#8437) 2022-07-01 22:15:09 +02:00
Glenn Jocher
d94b4705a6
TRT --half fix autocast images to FP16 (#8435) 
* TRT `--half` fix autocast images to FP16

Resolves bug raised in https://github.com/ultralytics/yolov5/issues/7822

* Update common.py
 2022-07-01 15:41:14 +02:00
Glenn Jocher
724d5b21b7
device_name="MYRIAD" for Intel NCS2 comment (#8327) 
Display device_name="MYRIAD" for Intel NCS2 option per user question in https://github.com/ultralytics/yolov5/issues/8154
 2022-06-24 14:18:58 +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
27911dc824
OpenVINO metadata fix2 (#7954) 
* Bug Fixed: OpenVINO metadata

* Bug Fixed: OpenVINO metadata

* Update export.py

* Update export.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2022-05-24 13:19:25 +02:00
Glenn Jocher
0dd66e2dc7
OpenVINO metadata fix (#7952) 
* Rename OpenVINO meta.yaml to model name

* Rename OpenVINO meta.yaml to model name

* Rename OpenVINO meta.yaml to model name

* fix
 2022-05-24 11:59:59 +02:00
xylieong
a3a652c933
Add OpenVINO metadata to export (#7947) 
* Write .yaml file when exporting model to openvino

Write .yaml file automatically when exporting model to openvino to be used during inference

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

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

* Update export.py

* Update export.py

* Load metadata on inference

* Update common.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-05-24 11:30:36 +02:00
Glenn Jocher
eb1217f3ac
Add PyTorch AMP check (#7917) 
* Add PyTorch AMP check

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

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

* Cleanup

* Cleanup

* Cleanup

* Robust for DDP

* Fixes

* Add amp enabled boolean to check_train_batch_size

* Simplify

* space to prefix

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2022-05-22 13:41:18 +02:00
Glenn Jocher
5774a1514d
Add DWConvTranspose2d() module (#7881) 
* Add DWConvTranspose2d() module

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

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

* Add DWConvTranspose2d() module

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

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

* Fix

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

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

* Fix

* Fix

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2022-05-20 16:13:40 +02:00
Nanohana
05d4fc9db4
Replace openvino-dev with OpenVINO Runtime inference (#7843) 
* Uses OpenVINO runtime instead of openvino-dev

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

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

* export with openvino package

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

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

* Revert export.py

* Update common.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-05-16 21:03:02 +02:00
Glenn Jocher
fb7fa5be8b
New TensorFlow TFCrossConv() module (#7827) 
* New TensorFlow `TFCrossConv()` module

* Move from experimental to common

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

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

* Add C3x

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

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

* Add to C3x to yolo.py

* Add to C3x to tf.py

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

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

* TFC3x bug fix

* TFC3x bug fix

* TFC3x bug fix

* Add TFDWConv g==c1==c2 check

* Add comment

* 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>
 2022-05-16 17:02:16 +02:00
Glenn Jocher
9d8ed37df7
Rename utils/datasets.py > utils/dataloaders.py (#7799) 2022-05-13 14:34:16 +02:00
Glenn Jocher
950a85d9f6
TensorRT PyTorch Hub inference fix (#7560) 
Solution proposed in https://github.com/ultralytics/yolov5/issues/7128 to TRT PyTorch Hub CUDA illegal memory errors.
 2022-04-24 12:45:56 -07:00
Glenn Jocher
c16671fc74
Add print(results) override for PyTorch Hub results (#7559) 2022-04-24 12:07:05 -07:00
Glenn Jocher
be67572279
Enable results.print() when _verbose=False (#7558) 
Follows implementation of _verbose flag for PyTorch Hub models. Currently these are so silent that result.print() does nothing 😂
 2022-04-24 11:30:40 -07:00
rglkt
aa542ce6a6
DetectMultiBackend() default stride=32 (#7342) 
* set common default stride as 32

* restore default stride, and set it on argument optional

* fix wrong use of opt

* fix missing parameter of stride

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

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

* fix format of parameters

* Update val.py

* Update common.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-04-09 19:11:55 +02:00
Glenn Jocher
3bb233a7fb
Add ONNX export metadata (#7353) 2022-04-09 13:27:49 +02:00
Glenn Jocher
5f97001ed4
Context manager open(file) as f fixes (#7289) 
* Flask context manager `open()` fix

* Additional read context manager fixes
 2022-04-05 12:54:25 +02:00
Glenn Jocher
8bc839ed8e
TorchScript single-output fix (#7261) 2022-04-03 22:51:11 +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
ee77632393
Revert C3() change (#7172) 2022-03-28 02:31:00 +02:00
Glenn Jocher
1832264dd6 Update 2022-03-28 02:26:44 +02:00
Glenn Jocher
a0a4adf6de
Add PyTorch Hub results.save(labels=False) option (#7129) 
Resolves https://github.com/ultralytics/yolov5/issues/388#issuecomment-1077121821
 2022-03-24 11:31:22 +01:00
Glenn Jocher
ecc2c7ba73
Remove named arguments where possible (#7105) 
* Remove named arguments where possible

Speed improvements.

* Update yolo.py

* Update yolo.py

* Update yolo.py
 2022-03-22 20:44:07 +01:00
Glenn Jocher
0529b77232
Update common.py lists for tuples (#7063) 
Improved profiling.
 2022-03-20 18:03:37 +01:00
Mrinal Jain
4effd064b1
Consistent saved_model output format (#7032) 2022-03-18 12:29:24 +01:00
Glenn Jocher
932dc78496
YOLOv5 Export Benchmarks for GPU (#6963) 
* Add benchmarks.py GPU support

* Updates

* Updates

* Updates

* Updates

* Add --half

* Add TRT requirements

* Cleanup

* Add TF to warmup types

* Update export.py

* Update export.py

* Update benchmarks.py
 2022-03-14 15:07:13 +01:00
Glenn Jocher
701e1177ac
Tensor initialization on device improvements (#6959) 
* Update common.py speed improvements

Eliminate .to() ops where possible for reduced data transfer overhead. Primarily affects warmup and PyTorch Hub inference.

* Updates

* Updates

* Update detect.py

* Update val.py
 2022-03-12 14:00:48 +01:00
Glenn Jocher
52c1399fdc
DetectMultiBackend() return device update (#6958) 
Fixes ONNX validation that returns outputs on CPU.
 2022-03-12 13:16:29 +01:00
Glenn Jocher
b94b59e199
DetectMultiBackend() --half handling (#6945) 
* DetectMultiBackend() `--half` handling

* CI fixes

* rename .half to .fp16 to avoid conflict

* warmup fix

* val update

* engine update

* engine update
 2022-03-11 16:31:52 +01:00
Glenn Jocher
84efa62b2d
Fix PyTorch Hub export inference shapes (#6949) 
May resolve https://github.com/ultralytics/yolov5/issues/6947
 2022-03-11 16:18:40 +01:00
DavidB
596de6d5a0
Default FP16 TensorRT export (#6798) 
* Assert engine precision #6777

* Default to FP32 inputs for TensorRT engines

* Default to FP16 TensorRT exports #6777

* Remove wrong line #6777

* Automatically adjust detect.py input precision #6777

* Automatically adjust val.py input precision #6777

* Add missing colon

* Cleanup

* Cleanup

* Remove default trt_fp16_input definition

* Experiment

* Reorder detect.py if statement to after half checks

* Update common.py

* Update export.py

* Cleanup

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2022-03-06 21:21:16 +01:00
Raffaele Galliera
a297efc383
Edge TPU inference fix (#6686) 
* refactor: use edgetpu flag

* fix: remove bitwise and assignation to tflite

* Cleanup and fix tflite

* Cleanup

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2022-02-19 15:10:07 +01:00
Glenn Jocher
56697c43ff
Fix CoreML P6 inference (#6700) 
* Fix CoreML P6 inference

* [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-02-18 20:38:33 +01:00
Jiacong Fang
66e5d794c7
Fix TF exports >= 2GB (#6292) 
* Fix exporting saved_model: pb exceeds 2GB

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

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

* Replace TF v1.x API with TF v2.x API for saved_model export

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

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

* Clean up

* Remove lambda in tf.function()

* Revert "Remove lambda in tf.function()" to be compatible with TF v2.4

This reverts commit 46c7931f11dfdea6ae340c77287c35c30b9e0779.

* Fix for pre-commit.ci

* Cleanup1

* Cleanup2

* Backwards compatibility update

* Update common.py

* Update common.py

* Cleanup3

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-02-18 16:36:45 +01:00
Glenn Jocher
a45e472358
YOLOv5 Export Benchmarks (#6613) 
* Add benchmarks.py

* Update

* Add requirements

* Updates

* Updates

* Updates

* Updates

* Updates

* Updates

* dataset autodownload from root

* Update

* Redirect to /dev/null

* sudo --help

* Cleanup

* Add exports pd df

* Updates

* Updates

* Updates

* Cleanup

* dir handling fix

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

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

* Cleanup

* Cleanup2

* Cleanup3

* Cleanup model_type

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2022-02-12 16:05:43 +01:00
Glenn Jocher
dc7e093071
Edge TPU TF imports fix (#6542) 
* Edge TPU TF imports fix

Fix for https://github.com/ultralytics/yolov5/issues/6535#issuecomment-1030631526

* Update common.py
 2022-02-05 15:45:44 +01:00
Glenn Jocher
079b36d72b
Edge TPU tf.lite.experimental.load_delegate fix (#6536) 
* Edge TPU `tf.lite.experimental.load_delegate` fix

Fix attempt for #6535

* [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-02-04 09:30:01 +01:00
Glenn Jocher
77977e0791
CoreML inference fix list() -> sorted() (#6496) 2022-02-01 22:34:15 +01:00
Glenn Jocher
b884ea36c4
Simplify TF normalized to pixels (#6494) 2022-02-01 21:17:56 +01:00
Motoki Kimura
16563ac5b5
Prefer tflite_runtime for TFLite inference if installed (#6406) 
* import tflite_runtime if tensorflow not installed

* rename tflite to tfli

* Attempt tflite_runtime for all TFLite workflows

Also rename tfli to tfl

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2022-01-25 07:24:24 -08:00
Glenn Jocher
33a67b4918
Update P2-P7 models/hub variants (#6230) 
* Update p2-p7 `models/hub` variants

* Update common.py

* AutoAnchor camelcase corrections
 2022-01-06 11:08:09 -08:00
Glenn Jocher
5402753a53
Edge TPU compiler comment (#6196) 
* Edge TPU compiler comment

* 7 to 8 fix
 2022-01-04 19:36:12 -08:00
Glenn Jocher
b5b56a3c88
Add CoreML inference (#6195) 
* Add Apple CoreML inference

* Cleanup
 2022-01-04 17:49:09 -08:00
Glenn Jocher
7b31a531b4
Add tensorrt>=7.0.0 checks (#6193) 
* Add `tensorrt>=7.0.0` checks

* Update export.py

* Update common.py

* Update export.py
 2022-01-04 13:39:13 -08:00
Glenn Jocher
5bd6a97b18
Global export format sort (#6182) 
* Global export sort

* Cleanup
 2022-01-03 20:08:15 -08:00