zjc
/
yolov5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,804 Commits 5 Branches 0 Tags 33 MiB
Commit Graph

1804 Commits

Author SHA1 Message Date
Glenn Jocher aa1859909c
Update ci-testing.yml (#4772) 2021-09-12 23:40:28 +02:00
Glenn Jocher b161edf873
Update ci-testing.yml (#4770) 2021-09-12 17:55:41 +02:00
Glenn Jocher c3a93d783d
Add TensorFlow formats to `export.py` (#4479) 
* Initial commit

* Remove unused export_torchscript return

* ROOT variable

* Add prefix to fcn arg

* fix ROOT

* check_yaml into run()

* interim fixes

* imgsz=(320, 320)

* Hardcode tf_raw_resize False

* Finish opt elimination

* Update representative_dataset_gen()

* Update export.py with TF methods

* SiLU and GraphDef fixes

* file_size() directory handling feature

* export fixes

* add lambda: to representative_dataset

* Detect training False default

* Fuse false for TF models

* Embed agnostic NMS arguments

* Remove lambda

* TensorFlow.js export success

* Add pb to Usage

* Add *_tfjs_model/ to ignore files

* prepend YOLOv5 to function headers

* Remove end --- comments

* parameterize tfjs export pb file

* update run() data default /ROOT

* update --include help

* update imports

* return ct_model

* Consolidate TFLite export

* pb prerequisite to tfjs

* TF modules CamelCase

* Remove exports from tf.py and cleanup

* pass agnostic NMS arguments

* CI

* CI

* ignore *_web_model/

* Add tensorflow to CI dependencies

* CI tensorflow-cpu

* Update requirements.txt

* Remove tensorflow check_requirement

* CI coreml tfjs

* export only onnx torchscript

* reorder exports torchscript first
 2021-09-12 15:52:24 +02:00
Glenn Jocher c47be26f34
Replace `path.absolute()` with `path.resolve()` (#4763) 2021-09-11 22:46:33 +02:00
Glenn Jocher cd810c8286
Centralize `user_config_dir()` decision making (#4755) 2021-09-11 16:32:08 +02:00
Glenn Jocher 22ee6fb7c1
Update `is_writeable()` for 2 methods (#4744) 
* Writeable test

* Fix

* Cleanup
 2021-09-10 17:52:33 +02:00
Glenn Jocher ff35292520
Add TF and TFLite models to `.dockerignore` (#4748) 2021-09-10 17:52:21 +02:00
Glenn Jocher 6c554b75ea
Add TF and TFLite models to `.gitignore` (#4747) 2021-09-10 17:51:22 +02:00
Glenn Jocher a144536f88
Fix `is_writeable()` for 3 OS support (#4743) 
* Fix `is_writeable()` for 3 OS support

* Update general.py
 2021-09-10 17:06:22 +02:00
Josh Veitch-Michaelis 19e28e3bfe
Add `callbacks` to train function in W&B sweep (#4742) 
* add callbacks to train function in wandb sweep

Fix following https://github.com/ultralytics/yolov5/pull/4688 which modified the function signature to `train`

* Cleanup

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2021-09-10 16:28:52 +02:00
Glenn Jocher 7af1b4c266
Improved `detect.py` timing (#4741) 
* Improved detect.py timing

* Eliminate 1 time_sync() call

* Inference-only time

* dash

* #Save section

* Cleanup
 2021-09-10 14:34:09 +02:00
Glenn Jocher c5360f6e70
Fix `--data from_HUB.zip` (#4732) 
@KalenMike
 2021-09-09 18:01:59 +02:00
Glenn Jocher 4a025ae97f
Fix `user_config_dir()` for GCP/AWS functions (#4726) 
* Fix `user_config_dir()` for GCP/AWS functions

Compatability fix for GCP functions and AWS lambda for user config directory in https://github.com/ultralytics/yolov5/pull/4628

* Windows skip check
 2021-09-09 17:57:46 +02:00
Zegorax 2d9411dbb8
Scope `onnx-simplifier` requirements check (#4730) 
* Changed onnx-simplifier check behavior

Export.py has been updated to check for onnx-simplifier requirement only when the --simplify argument is added.
Allows for better flexibility and one less requirement if simplify is not needed.

* Fix single-element tuples

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2021-09-09 16:49:10 +02:00
Jean-Baptiste Martin 1cad0ce2c7
Allow `multi_label` option for NMS with PyTorch Hub (#4728) 
* Allow specifying multi_label option for NMS when using torch hub

* Reformat

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2021-09-09 15:32:04 +02:00
JD Costa deb434aefa
Make CONFIG_DIR configurable per environment variable (#4727) 2021-09-09 15:29:18 +02:00
ELHoussineT 0d8a184237
Add `crops = results.crops()` dictionary (#4676) 
* adding get cropped functionality

* Add target logic in existing functions

* Crops cleanup

* Add dictionary keys: conf, cls, box

* Bug fixes - avoid return after first image

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2021-09-08 19:42:28 +02:00
Glenn Jocher 8e94bf62d9
Add `user_config_dir('Ultralytics')` (#4715) 
* Add `user_config_dir`

* Linux to .config
 2021-09-08 18:13:59 +02:00
Glenn Jocher 25a7e1dae5
Update `check_yaml()` comment (#4713) 
* Update `check_yaml()` comment

* Cleanup
 2021-09-08 16:01:03 +02:00
Glenn Jocher f984cce52a
Fix `check_suffix()` (#4712) 
Fix a bug when `file=''`
 2021-09-08 15:06:31 +02:00
Glenn Jocher a2b3c71636
Add suffix checks (#4711) 
* Add suffix checks

* Cleanup

* Cleanup2

* Cleanup3
 2021-09-08 14:36:12 +02:00
Zhiqiang Wang 8e5f9ddbdb
Remove redundant `ComputeLoss` code (#4701) 2021-09-08 12:48:33 +02:00
Kalen Michael 2317f86ca4
Optimised Callback Class to Reduce Code and Fix Errors (#4688) 
* added callbacks

* added back callback to main

* added save_dir to callback output

* reduced code count

* updated callbacks

* added default callback class to main, added missing parameters to on_model_save

* Glenn updates

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
 2021-09-07 18:32:15 +02:00
Glenn Jocher 548745181a
EarlyStopper updates (#4679) 2021-09-05 19:09:53 +02:00
imyhxy f64fab5825
Fixed 'meta' and 'hyp' may out of order when using evolve (#4657) 
* Fixed 'meta' and 'hyp' may out of order when using evolve

* Update gitignore
 2021-09-05 17:43:09 +02:00
Glenn Jocher fad57c29cd
Fix `is_coco` on missing `data['val']` key (#4642) 2021-09-01 16:30:14 +02:00
Glenn Jocher 234e8ae6fa
Fix for `plot_evolve()` string argument (#4639) 2021-09-01 15:00:13 +02:00
Glenn Jocher de534e9221
Fix 3 for Arial.ttf redownloads with hub inference (#4629) 
Fix 3 for Arial.ttf redownloads with hub inference, follow-on to #4628.
 2021-08-31 20:54:10 +02:00
Glenn Jocher a4e8f78c5e
Fix 2 for Arial.ttf redownloads with hub inference (#4628) 2021-08-31 20:05:17 +02:00
Glenn Jocher ba0f80874f
Fix for Arial.ttf redownloads with hub inference (#4627) 2021-08-31 15:01:41 +02:00
Glenn Jocher 50a9828679
DDP `torch.jit.trace()` `--sync-bn` fix (#4615) 
* Remove assert

* debug0

* trace=not opt.sync

* sync to sync_bn fix

* Cleanup
 2021-08-30 18:35:07 +02:00
Glenn Jocher bb5ebc290e
Close `matplotlib` plots after opening (#4612) 
* Close plots

* Replace fig.close() for plt.close()
 2021-08-30 17:22:21 +02:00
Ayush Chaurasia 11e7c7b48d
W&B: Don't log models in evolve operation (#4611) 2021-08-30 17:07:20 +02:00
Glenn Jocher 3a72d4a7e3
Update `check_git_status()` warning (#4610) 2021-08-30 17:05:45 +02:00
Yukun Xia 35fe031461
Fix: add P2 layer 21 to yolov5-p2.yaml `Detect()` inputs (#4608) 
Layer 21 includes the information of xsmall objects
 2021-08-30 15:46:33 +02:00
Glenn Jocher e7d1842a98
Auto-download Arial.ttf on init (#4606) 
* Auto-download Arial.ttf on init

* Fix ROOT
 2021-08-30 14:58:22 +02:00
Glenn Jocher bb4da083d1 Created using Colaboratory 2021-08-30 14:33:53 +02:00
Glenn Jocher dc13820c9d
TensorBoard `on_train_end()` speed improvements (#4605) 2021-08-30 13:01:41 +02:00
Glenn Jocher b894e69dfc
Update mosaic plots font size (#4596) 2021-08-29 18:05:49 +02:00
Glenn Jocher bfad364455 Created using Colaboratory 2021-08-29 17:56:35 +02:00
Glenn Jocher dbbc6b5c48
Re-order `plots.py` to class-first (#4595) 2021-08-29 17:44:51 +02:00
Glenn Jocher e5e5ebc799
Auto-UTF handling (#4594) 2021-08-29 17:15:18 +02:00
Glenn Jocher de44376d1b
Create `Annotator()` class (#4591) 
* Add Annotator() class

* Download Arial

* 2x for loop

* Cleanup

* tuple 2 list

* max_size=1920

* bold logging results to

* tolist()

* im = annotator.im

* PIL save in detect.py

* Smart asarray in detect.py

* revert to cv2.imwrite

* Cleanup

* Return result asarray

* Add `Profile()` profiler

* CamelCase Timeout

* Resize after mosaic

* pillow>=8.0.0

* daemon imwrite

* Add cv2 support

* Remove plot_wh_methods and plot_one_box

* pil=False for hubconf.py annotations

* im.shape bug fix

* colorstr common.py

* join daemons

* Update t.daemon

* Removed daemon saving
 2021-08-29 16:46:13 +02:00
Takumi Karasawa 7b35971ba5
Fix bug in `plot_one_box` when label is `None` (#4588) 2021-08-29 15:08:27 +02:00
Glenn Jocher bbfafeabdb
Add `Profile()` profiler (#4587) 
* Add `Profile()` profiler

* CamelCase Timeout
 2021-08-29 13:49:04 +02:00
Glenn Jocher d7aa3f153d
Remove `image_weights` DDP code (#4579) 
* Initial commit

* Update
 2021-08-28 19:17:21 +02:00
Glenn Jocher 93cc015748
Add EarlyStopping feature (#4576) 
* Add EarlyStopping feature

* Add comment

* Cleanup

* Cleanup2

* debug

* debug2

* debug3

* debug3

* debug4

* debug5

* debug6

* debug7

* debug8

* debug9

* debug10

* debug11

* debug12

* Cleanup

* Add TODO for known DDP issue
 2021-08-28 19:03:52 +02:00
Glenn Jocher 8b18b66304
ONNX opset 13 (#4566) 2021-08-27 16:00:39 +02:00
Glenn Jocher 8ac96b7975
Fix for AP calculation limits 0.0 - 1.0 (#4563) 
This PR brings alignment in AP computation practices with Detectron2 and MMDetection. 

Problem first noted by @yusiyoh in https://github.com/ultralytics/yolov5/issues/4546
 2021-08-27 13:23:29 +02:00
Glenn Jocher e899d6e8fb
Fix for corrupt JPEGs auto-fix PR (#4560) 
Auto-fix corrupt JPEGs PR introduced a bug whereby the f.seek() operation read all of the bytes in the image, resulting in the PIL image having nothing to read upon the .save() operation. 

Fix was to re-open the image using PIL before saving.
 2021-08-27 13:01:21 +02:00