1
0
mirror of https://github.com/ultralytics/yolov5.git synced 2025-06-03 14:49:29 +08:00

80 Commits

Author SHA1 Message Date
Glenn Jocher
61ea23c3fe
Implement @torch.no_grad() decorator ()
* `@torch.no_grad()` decorator

* Update detect.py
2021-05-24 13:23:09 +02:00
Adrian Holovaty
3f74cd9ed1
Parameterize max_det + inference default at 1000 ()
* 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
Glenn Jocher
25f8ab835e
detect.py streaming source --save-crop bug fix ()
* detect.py streaming source --save-crop bug fix

Possible fix for .

* () parenthesis
2021-05-10 16:39:37 +02:00
Glenn Jocher
91547edec1
Update detect.py ()
* Update detect.py

* Update detect.py
2021-05-09 13:01:58 +02:00
Glenn Jocher
a833ee2a46
Update check_requirements() exclude list () 2021-04-29 21:16:23 +02:00
Glenn Jocher
57812df68c
New Colors() class () 2021-04-28 16:05:14 +02:00
albinxavi
aa78069c58
Change default value of hide-conf argument to false () 2021-04-25 14:18:14 +02:00
albinxavi
eae28a93b0
Change default value of hide label argument to False () 2021-04-24 19:58:02 +02:00
Maximilian Peters
f662c18507
Add detect.py --hide-conf --hide-labels --line-thickness options ()
* command line option for line thickness and hiding labels

* command line option for line thickness and hiding labels

* command line option for line thickness and hiding labels

* command line option for line thickness and hiding labels

* command line option for line thickness and hiding labels

* command line option for hiding confidence values

* Update detect.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2021-04-23 21:07:48 +02:00
fcakyon
b40dd99167
Explicit opt function arguments ()
* more explicit function arguments

* fix typo in detect.py

* revert import order

* revert import order

* remove default value
2021-04-22 18:17:30 +02:00
Burhan
c949fc86d1
Detection cropping+saving feature addition for detect.py and PyTorch Hub ()
* 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
Ben Milanko
e2b7bc0b32
YouTube Livestream Detection ()
* Youtube livestream detection

* dependancy update to auto install pafy

* Remove print

* include youtube_dl in deps

* PEP8 reformat

* youtube url check fix

* reduce lines

* add comment

* update check_requirements

* stream framerate fix

* Update README.md

* cleanup

* PEP8

* remove cap.retrieve() failure code

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2021-04-11 18:53:40 +02:00
Glenn Jocher
ad05e37d99
Save webcam results, add --nosave option ()
This updates the default detect.py behavior to automatically save all inference images/videos/webcams unless the new argument --nosave is used (python detect.py --nosave) or unless a list of streaming sources is passed (python detect.py --source streams.txt)
2021-03-25 14:09:49 +01:00
Glenn Jocher
0d891c601e
check_requirements() exclude pycocotools, thop ()
Exclude non-critical packages from dependency checks in detect.py. pycocotools and thop in particular are not required for inference.

Issue first raised in https://github.com/ultralytics/yolov5/issues/1944 and also raised in https://github.com/ultralytics/yolov5/discussions/2556
2021-03-23 14:25:55 +01:00
Glenn Jocher
26c2e54c8f
Add check_imshow() ()
* Add check_imshow()

* Update general.py

* Update general.py
2021-02-16 13:56:47 -08:00
ab-101
c32b0aff76
Update detect.py ()
Without this cv2.imshow opens a window but nothing is visible
2021-02-08 23:13:40 -08:00
Glenn Jocher
a18efc3a73
Add variable-stride inference support () 2021-01-30 13:47:23 -08:00
Glenn Jocher
2a835c79a9
Update run-once lines () 2021-01-27 16:01:24 -08:00
Glenn Jocher
aac33f87ad
Update inference multiple-counting ()
* Update inference multiple-counting

* update github check
2021-01-22 15:39:08 -08:00
Glenn Jocher
e77c77f580
Add check_requirements() ()
* Add check_requirements()

* add import

* parameterize filename

* add to detect, test
2021-01-06 16:35:40 -08:00
Rohan Dubey
7dddb1d928
Remove unused code ()
* Add files via upload

* Add files via upload
2021-01-04 13:04:13 -08:00
Glenn Jocher
d5289b54c4
clean_str() function addition ()
* clean_str() function addition

* cleanup

* add euro symbol €

* add closing exclamation (spanish)

* cleanup
2020-12-17 17:20:20 -08:00
Glenn Jocher
54043a9fa4
Streaming --save-txt bug fix ()
* Streaming --save-txt bug fix

* cleanup
2020-12-11 15:45:32 -08:00
Glenn Jocher
95fa65339f
Cat apriori to autolabels () 2020-11-23 13:38:47 +01:00
Glenn Jocher
bd29a1c946
PosixPath to str webcam bug fix () 2020-11-18 10:03:41 +01:00
Glenn Jocher
f5429260ca
PyTorch Hub and autoShape update ()
* PyTorch Hub and autoShape update

* comment x for imgs

* reduce comment
2020-11-16 23:09:55 +01:00
Glenn Jocher
fe341fa44d
Utils reorganization ()
* Utils reorganization

* Add new utils files

* cleanup

* simplify

* reduce datasets.py

* remove evolve.sh

* loadWebcam cleanup
2020-11-14 11:50:32 +01:00
Glenn Jocher
c4addd7761
Unified '/project/name' results saving ()
* Project/name update

* Update ci-testing.yml

* address project with path separator failure mode

* Project/name update

* address project with path separator failure mode

* Update ci-testing.yml

* detect.py default --name bug fix

* missing rstrip PR

* train/exp0 to train/exp
2020-11-12 23:37:46 +01:00
weida wang
04081f8102
Trailing --save-txt whitespace bug fix ()
* update Write results

* Update detect.py

* Update test.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2020-11-12 17:37:16 +01:00
Khiem Doan
1c8464e199
Use pathlib instead of low-level module ()
* Use pathlib instead of low-level module

* Use pathlib instead of low-level module

* Update detect.py

* Update test.py

* reformat

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2020-11-10 13:01:19 +01:00
Glenn Jocher
81d320109f
--save-txt store_true fix () 2020-11-08 19:53:48 +01:00
Glenn Jocher
4821d076e2
Increment train, test, detect runs/ ()
* Increment train, test, detect runs/

* Update ci-testing.yml

* inference/images to data/images

* move images

* runs/exp to runs/train/exp

* update 'results saved to %s' str
2020-11-08 19:39:05 +01:00
oleg
19c8b2c9b9
Adding --save-dir and --save-conf options to test.py ()
* Adding --output and --save-conf options to test.py

* Update help fields

* Update test.py

* Make arguments and comments uniform with test.py

* Remove previous and print save_dir on finish

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2020-10-25 16:50:21 +01:00
Osama Akhtar
83deec133d
Add confidence score to label txt files ()
* add contrast to conf/class against bbox rectangle color

* added feature to save conf in txt labels

* Update general.py

* Update detect.py

* Update detect.py

* Update detect.py

save_conf variable removed as only used once, so we can use opt.save_conf instead.

* Update detect.py

* Update detect.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2020-10-20 14:20:27 +02:00
Glenn Jocher
3b57cb5641
Simplified inference () 2020-10-15 20:10:08 +02:00
Glenn Jocher
4d3680c81d
Minor import and spelling updates () 2020-10-13 17:24:27 +02:00
Frederik
d11504aee1
Remove image open on macos ()
* added option to not open on save

* Update detect.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2020-10-07 16:16:10 +02:00
stone99
b8f656742d
feat: add rtmp support ()
* feat: add rtmp support

* Update detect.py

pass tuple to source.startswith()

Co-authored-by: ryan.fu <ryan.fu@aylaasia.com>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2020-09-22 11:37:49 -07:00
Glenn Jocher
82ed33a052 generalize webcam detection with opt.source.isnumeric() (yolov3 ) 2020-08-25 11:07:38 -07:00
Glenn Jocher
f5da528d28 reformat code 2020-08-14 11:53:44 -07:00
NanoCode012
0892c44bc4
Fix Logging ()
* Add logging setup

* Fix fusing layers message

* Fix logging does not have end

* Add logging

* Change logging to use logger

* Update yolo.py

I tried this in a cloned branch, and everything seems to work fine

* Update yolo.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2020-08-12 14:18:19 -07:00
Glenn Jocher
7875f4c1fb reverse plotting low to high confidence 2020-08-12 13:50:16 -07:00
Glenn Jocher
9f482cbcb8 utils.general comment updates/bug fixes 2020-08-11 20:11:44 -07:00
hopesala
d0d3dd1040
Update detect.py ()
* Update detect.py

Update print info for relative path and absolute
otherwise the info below is misleading

Results saved to /workspace//output_path

* Update detect.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2020-08-05 12:01:24 -07:00
lorenzomammana
728efa6576
Fix missing imports ()
* Fix missing imports

* Update detect.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
2020-08-04 12:22:15 -07:00
Jirka Borovec
d5b6416c87
Explicit Imports ()
* expand imports

* optimize

* miss

* fix
2020-08-02 15:47:36 -07:00
Glenn Jocher
43a616a955 PyTorch 1.6.0 compatability updates 2020-07-28 15:38:56 -07:00
Glenn Jocher
fe094333e8
Update utils.py strip_optimizer() ()
Follow-on update that I missed adding into PR 509.
2020-07-24 19:30:37 -07:00
Glenn Jocher
02445d176d improved model.yaml source tracking 2020-07-13 14:35:47 -07:00
Glenn Jocher
78c9420e09 --classes bug fix 2020-07-13 13:27:46 -07:00