Ankle/yolov5_birdproject
1
0 Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity
1,491 Commits 1 Branch 0 Tags
a820b43aca3816c9552e9beaf14a77955742b0ec
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Jocher a820b43aca Automatic Chinese fonts plotting (#4951) 
* Automatic Chinese fonts plotting

* Default PIL=False
 2021-09-27 13:48:15 -07:00
Glenn Jocher c5ba2abb4a Update Dockerfile (#4935) 2021-09-26 19:16:14 -07:00
Glenn Jocher 5a8e4343d8 Scope check_file() search space (#4933) 
`check_file()` is now limited to searching opt-in directories: /data, /models, /utils. This prevents large non-project directories like /.git and /venv from being searched, which may cause `check_file()` to slow significantly.
 2021-09-26 17:11:46 -07:00
Glenn Jocher 793383232f Update default Albumentations (#4931) 2021-09-26 12:10:33 -07:00
Glenn Jocher d856c48298 Validate best.pt on train end (#4889) 
* Validate best.pt on train end

* 0.7 iou for COCO only

* pass callbacks

* active model.float() if not half

* print Validating best.pt...

* add newline
 2021-09-26 11:54:53 -07:00
Glenn Jocher e687873436 Add Slack Forum badge to README (#4930) 
Add badge with link to join the new YOLOv5 Slack Forum!
https://join.slack.com/t/ultralytics/shared_invite/zt-w29ei8bp-jczz7QYUmDtgo6r6KcMIAg
 2021-09-26 10:54:55 -07:00
Glenn Jocher 39c17ce0b9 Fix root referenced before assignment (#4920) 
* Fix `root` referenced before assignment

Fix for bug introduced by #4919 discovered on VOC autodownload:
```
python train.py --data VOC.yaml
```

* Cleanup
 2021-09-25 09:16:14 -07:00
Glenn Jocher a64a4c839f Replace os.system('unzip file.zip') -> ZipFile.extractall() (#4919) 
* Replace `os.system('unzip file.zip')` -> `ZipFile.extractall()`

* Cleanup
 2021-09-25 08:52:36 -07:00
Glenn Jocher 8ad9e4ed5b Annotator check_font() RANK -1 remove progress (#4864) 
* Annotator `check_font()` RANK -1 remove progress

* Cleanup
 2021-09-20 13:57:23 +02:00
Glenn Jocher 2b3109eeb0 Fix DDP destruction LOGGER.info() (#4863) 2021-09-20 13:12:48 +02:00
Glenn Jocher 2809616345 Update Dockerfile (#4862) 2021-09-20 13:10:41 +02:00
Glenn Jocher 40d1c80503 Update Dockerfile (#4861) 2021-09-20 12:22:24 +02:00
Glenn Jocher 9ef94940aa Update greetings.yml (#4856) 2021-09-18 18:43:26 +02:00
Glenn Jocher 4c839eeb10 Simplify check_requirements() usage (#4855) 
* Simplify `check_requirements()` usage

* remove assert, print()
 2021-09-18 18:34:30 +02:00
Glenn Jocher 4d1a2ac87e Update sys.path.append(str(ROOT)) (#4852) 
* Update `sys.path.append(str(ROOT))`

* Cleanup
 2021-09-18 15:02:08 +02:00
Glenn Jocher 3732f9ac8a Refactor argparser printing to print_args() (#4850) 
* Refactor argparser printing to `print_args()`

* Cleanup
 2021-09-18 14:16:19 +02:00
Glenn Jocher 84bfa89236 Consolidate init_seeds() (#4849) 2021-09-18 13:28:42 +02:00
Glenn Jocher 4fdaec0449 Single cache_version definition (#4846) 
Defines dataset labels *.cache version in a single place, fixing a bug introduced in #4845.
 2021-09-17 18:01:52 +02:00
Glenn Jocher fe39562a5f Sorted datasets update to cache_labels() (#4845) 
PR should produce datasets sorted alphabetically by filename. Cache version incremented to 0.5. 

Note: will force a one-time re-caching of existing datasets on first-use.
 2021-09-17 17:35:45 +02:00
Glenn Jocher 3a822a22ce PIL.ImageDraw.text(anchor=...) removal, reduce to >=7.1.2 (#4842) 
* Unpin Pillow

* Update requirements.txt

* Update plots.py
 2021-09-17 13:02:37 +02:00
Glenn Jocher e83792e65c Created using Colaboratory 2021-09-17 11:40:47 +02:00
Glenn Jocher 850f98f508 Created using Colaboratory 2021-09-17 11:39:00 +02:00
Glenn Jocher 27a4736e96 Fix val.py study plot (#4831) 
* Fix val.py study plot

* call plot_val_study

* Rename plot_study_txt to plot_val_study
 2021-09-16 17:55:58 +02:00
Glenn Jocher 6b44ecd53d Fix 'PyTorch starting from' for URL weights (#4828) 
Follows #4823
 2021-09-16 14:38:35 +02:00
Glenn Jocher 0dc725e3dc Refactor forward() method profiling (#4816) 2021-09-16 09:47:34 +02:00
Glenn Jocher 621b6d5ba8 Evolution --resume fix (#4802) 
Also disable `/weights` dir creation when evolving as no weights are saved and empty folder causes user expectations of weights.
 2021-09-15 13:13:33 +02:00
Glenn Jocher b74dd4ba4f Add --int8 argument (#4799) 
* Add `--int8` argument

* parents[0] bug fix

* Fix order
 2021-09-15 11:33:46 +02:00
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
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
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
Glenn Jocher 548745181a EarlyStopper updates (#4679) 2021-09-05 19:09:53 +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
Glenn Jocher 3a72d4a7e3 Update check_git_status() warning (#4610) 2021-08-30 17:05:45 +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
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
Glenn Jocher 11f85e7e71 Auto-fix corrupt JPEGs (#4548) 
* Autofix corrupt JPEGs

This PR automatically re-saves corrupt JPEGs and trains with the resaved images. WARNING: this will overwrite the existing corrupt JPEGs in a dataset and replace them with correct JPEGs, though the filesize may increase and the image contents may not be exactly the same due to lossy JPEG compression schemes. Results may vary by JPEG decoder and hardware.

Current behavior is to exclude corrupt JPEGs from training with a warning to the user, but many users have been complaining about large parts of their dataset being excluded from training.

* Clarify re-save reason
 2021-08-26 15:51:04 +02:00
Glenn Jocher 2da6444c92 Fix for python models/yolo.py --profile (#4541) 
Profiling fix copies input to Detect layer to circumvent inplace changes to the feature maps.
 2021-08-25 21:23:28 +02:00
Glenn Jocher 79af1144c2 Automatic TFLite uint8 determination (#4515) 
* Auto TFLite uint8 detection

This PR automatically determines if TFLite models are uint8 quantized rather than accepting a manual argument.

The quantization determination is based on @zldrobit comment https://github.com/ultralytics/yolov5/pull/1127#issuecomment-901713847

* Cleanup
 2021-08-23 17:05:53 +02:00
Glenn Jocher 7b1643b5b5 Add install=True argument to check_requirements (#4512) 
* Add `install=True` argument to `check_requirements`

* Update general.py
 2021-08-23 14:38:30 +02:00
Glenn Jocher d1182c4f29 check_requirements(('coremltools',)) (#4478) 
* `check_requirements(('coremltools',))`

* Update ci-testing.yml

* Update ci-testing.yml
 2021-08-18 21:16:57 +02:00
Glenn Jocher 6dd7dd8dd3 Fix default --weights yolov5s.pt (#4458) 2021-08-17 23:29:07 +02:00
Glenn Jocher f3e3f7603f TFLite prep (#4436) 2021-08-16 17:25:06 +02:00
Glenn Jocher 19d03a955c Remove DDP process group timeout (#4422) 2021-08-15 18:32:41 +02:00
Glenn Jocher 4e65052f28 Created using Colaboratory 2021-08-15 16:41:57 +02:00
Glenn Jocher 01cdb7671b Add SPPF() layer (#4420) 
* Add `SPPF()` layer

* Cleanup

* Add credit
 2021-08-15 14:28:35 +02:00
Glenn Jocher 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
Glenn Jocher bb0aed1ba6 Created using Colaboratory 2021-08-14 21:12:05 +02:00
Glenn Jocher 2da4e7acf7 Merge PIL and OpenCV in plot_one_box(use_pil=False) (#4416) 
* Merge PIL and OpenCV box plotting functions

* Add ASCII check to plot_one_box

* Cleanup

* Cleanup2
 2021-08-14 17:44:15 +02:00
Glenn Jocher 63e09fdc48 Remove encoding='ascii' (#4413) 
* Remove `encoding='ascii'`

* Reinstate `encoding='ascii'` in emojis()
 2021-08-14 13:47:20 +02:00
Glenn Jocher 4e8c81a368 Add yolov5s-ghost.yaml (#4412) 
* Add yolov5s-ghost.yaml

* Finish C3Ghost

* Add C3Ghost to list

* Add C3Ghost to number of repeats if statement

* Fixes

* Cleanup
 2021-08-14 12:55:22 +02:00
Glenn Jocher e086347377 Update plots.py (#4407) 2021-08-14 12:50:27 +02:00
Glenn Jocher 57c342a6a5 Simplify ONNX inference command (#4405) 2021-08-13 13:22:13 +02:00
Glenn Jocher 3e7c59ad3b Fix rename utils.google_utils to utils.downloads (#4393) 2021-08-11 23:40:47 +02:00
Glenn Jocher 11e4aebfef Update README.md (#4387) 2021-08-11 18:33:34 +02:00
Glenn Jocher b27f69f108 Created using Colaboratory 2021-08-11 18:32:06 +02:00
Glenn Jocher ce7deec440 int(mlc) (#4385) 2021-08-11 17:32:13 +02:00
Glenn Jocher 86c7150cfd Update newline (#4308) 2021-08-04 17:41:38 +02:00
Glenn Jocher e78aeac973 Evolve in CSV format (#4307) 
* Update evolution to CSV format

* Update

* Update

* Update

* Update

* Update

* reset args

* reset args

* reset args

* plot_results() fix

* Cleanup

* Cleanup2
 2021-08-04 17:13:38 +02:00
Glenn Jocher 4103ce9ad0 Simplify callbacks (#4289) 2021-08-04 13:17:35 +02:00
Glenn Jocher 388016e9e3 Update 'results saved to' string (#4275) 2021-08-02 15:48:53 +02:00
Glenn Jocher 587c4b4b81 Add DWConvClass() (#4274) 
* Add `DWConvClass()`

* Cleanup

* Cleanup2
 2021-08-02 15:36:30 +02:00
Glenn Jocher 9c6732f61c Update variables (#4273) 2021-08-02 15:13:55 +02:00
Glenn Jocher 306fc0119a Update Autoshape forward header (#4271) 2021-08-02 12:42:23 +02:00
Glenn Jocher 53bfcbe0ae Update AP calculation (#4260) 
* Update AP calculation

* Cleanup

* Remove original
 2021-08-01 20:36:00 +02:00
Glenn Jocher d8f18834a2 Update profile() for CUDA Memory allocation (#4239) 
* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Update profile()

* Cleanup
 2021-07-30 18:17:19 +02:00
Glenn Jocher 9468657502 Update profiler (#4236) 2021-07-30 16:00:47 +02:00
Glenn Jocher 8d3c3ef45c Fix weight decay comment (#4228) 2021-07-30 01:35:39 +02:00
Glenn Jocher 1a10b0ecd2 Created using Colaboratory 2021-07-30 01:04:36 +02:00
Glenn Jocher 083c13da45 Created using Colaboratory 2021-07-30 00:58:14 +02:00