Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master branch #8

Merged
merged 122 commits into from
Jul 14, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
a85e6d0
add parser arg for hyp yaml file
alexstoken Jun 16, 2020
d9f446c
add save yaml of opt and hyp to tensorboard log_dir in train()
alexstoken Jun 16, 2020
4418809
change weights dir (wdir) to be unique to each run, under log_dir
alexstoken Jun 16, 2020
490f1e7
add save_dir arg to plot_lr_scheduler, default to current dir.
alexstoken Jun 16, 2020
25e51bc
add util function to get most recent last.pt file
alexstoken Jun 16, 2020
a448c3b
add logic for resuming and getting hyp for resume run
alexstoken Jun 16, 2020
333f678
add update default hyp dict with provided yaml
alexstoken Jun 16, 2020
5f2eeba
remove old print statements
alexstoken Jun 16, 2020
d342917
Fix get_latest_run() to search inside 'weights' subfolders
alexstoken Jun 17, 2020
3263a20
Fix get_latest_run to search 'search_dir' recursivly
alexstoken Jun 17, 2020
ade023c
Fix hyp file read in and dict update.
alexstoken Jun 17, 2020
3b2b330
Move results.txt from weights/ to log_dir
alexstoken Jun 17, 2020
945307b
Add save_dir to plot_lr_scheduler and plot_labels
alexstoken Jun 17, 2020
9b7386f
Add save_dir arg to test.test, use arg as location for saving batch jpgs
alexstoken Jun 17, 2020
c8152c8
Syntax fixes
alexstoken Jun 17, 2020
e572bb0
Add plot_results save location to log_dir
alexstoken Jun 21, 2020
ccf0af1
Revert coco128.yaml to initial commit
alexstoken Jun 24, 2020
d64ad0f
Remove --resume functionality and related checks/logic.
alexstoken Jun 24, 2020
7edbf65
Fix help message for cfg files
alexstoken Jun 24, 2020
7abf202
Mode all optimizer settings to 'hyp.yaml', integrate proper momentum …
alexstoken Jun 24, 2020
bc4ef48
Default optimizer SGD
alexstoken Jun 24, 2020
611aacf
Turn opt into dictionary before sending it to yaml
alexstoken Jun 24, 2020
d1ca6f2
Delete equip_hyp.yaml
alexstoken Jun 24, 2020
2d396be
Fix bug in --help from percent sign in help string
alexstoken Jun 24, 2020
de19165
Fix yaml saving (don't sort keys), reorder --opt keys, bug fix hyp di…
alexstoken Jun 24, 2020
e18e681
Merge branch 'master' into advanced_logging
alexstoken Jun 27, 2020
b57f83d
[bug fix] potential problem if img fed to model is in rectangular shape
wanghaoyang0106 Jul 3, 2020
69c0d2d
Merge branch 'master' of https://github.com/ultralytics/yolov5
wanghaoyang0106 Jul 3, 2020
956511d
fix LR bug
Laughing-q Jul 5, 2020
b7fe1d0
Merge pull request #300 from Laughing-q/master
glenn-jocher Jul 5, 2020
2541f77
update detect.py
glenn-jocher Jul 5, 2020
8c43a69
Update README.md
glenn-jocher Jul 5, 2020
997ba7b
import yaml in yolo.py
glenn-jocher Jul 5, 2020
38f5c1a
pruning and sparsity initial commit
glenn-jocher Jul 5, 2020
5ba1de0
update experimental.py with Ensemble() module
glenn-jocher Jul 5, 2020
04bdbe4
fuse update
glenn-jocher Jul 6, 2020
a40f615
.half() bug fix
glenn-jocher Jul 6, 2020
a62333e
test.py .fuse() update
glenn-jocher Jul 6, 2020
6b95d6d
.to(device) bug fix
glenn-jocher Jul 6, 2020
121d90b
update fuse_conv_and_bn()
glenn-jocher Jul 6, 2020
f517ba8
Merge branch 'master' into advanced_logging
alexstoken Jul 6, 2020
5ac517b
Remove duplicate `verbose` arg in test.py
alexstoken Jul 7, 2020
8b6dbb7
Add optimizer choice to hyp file
alexstoken Jul 7, 2020
52bac22
Add in --resume functionality with option to specify path or to get m…
alexstoken Jul 7, 2020
95f0a56
Bug fix to get_latest_run when recent run is named
alexstoken Jul 7, 2020
4364751
Colab example/test of new features
alexstoken Jul 7, 2020
e6e7e7f
Delete advanced_logging_test.ipynb
alexstoken Jul 7, 2020
e8cf24b
Initial model ensemble capability #318
glenn-jocher Jul 7, 2020
a9918fb
updated coreml conversion to do pixel scaling between 0.0 and 1.0
dlawrences Jul 8, 2020
7c4d3cf
Merge pull request #1 from dlawrences/dev/coreml_convert_pxscaling
dlawrences Jul 8, 2020
cd66092
Merge pull request #321 from dlawrences/master
glenn-jocher Jul 8, 2020
31b07b3
Merge pull request #275 from wanghaoyang0106/master
glenn-jocher Jul 8, 2020
1b9e28e
Update requirements.txt
glenn-jocher Jul 8, 2020
16f6834
update train.py and experimental.py
glenn-jocher Jul 8, 2020
c654d18
Update utils.py
glenn-jocher Jul 8, 2020
cbe39a1
Update utils.py
glenn-jocher Jul 8, 2020
c3d3e6b
Update test.py
glenn-jocher Jul 8, 2020
22ab1c2
Update test.py
glenn-jocher Jul 8, 2020
6b134d9
Update train.py
glenn-jocher Jul 8, 2020
abb024d
Delete new_hyp.yaml
glenn-jocher Jul 8, 2020
dc5e183
Merge branch 'master' into advanced_logging
glenn-jocher Jul 9, 2020
0fef3f6
Merge pull request #104 from alexstoken/advanced_logging
glenn-jocher Jul 9, 2020
bf6f415
hyperparameter printout update
glenn-jocher Jul 9, 2020
94342ac
Handle multiple datasets
lorenzomammana Jul 9, 2020
54a9e4f
Refactor code to reduce duplication
lorenzomammana Jul 9, 2020
f9bab6b
Update datasets.py
glenn-jocher Jul 9, 2020
47bf173
Update datasets.py
glenn-jocher Jul 9, 2020
13a09fa
Update datasets.py
glenn-jocher Jul 9, 2020
9d63140
Move hyp and opt yaml save to top of train()
alexstoken Jul 9, 2020
2b6209a
Merge pull request #338 from alexstoken/hyp_save_bugfix
glenn-jocher Jul 9, 2020
24c5a94
--resume EMA fix #292
glenn-jocher Jul 9, 2020
72d5b58
disable LR plot to suppress warning message
glenn-jocher Jul 9, 2020
603ea0b
update log_dir to runs/exp #107
glenn-jocher Jul 9, 2020
2110f5e
update log_dir to runs/exp #107
glenn-jocher Jul 9, 2020
dd33d2a
Update datasets.py
glenn-jocher Jul 9, 2020
dd8e742
Merge pull request #334 from lorenzomammana/feature-multiple-datasets…
glenn-jocher Jul 9, 2020
cb527d3
new nc=len(names) check
glenn-jocher Jul 10, 2020
e16e9e4
new nc=len(names) check
glenn-jocher Jul 10, 2020
f310ca3
Update issue templates
glenn-jocher Jul 10, 2020
520f5de
Label caching foundational re-write #306
glenn-jocher Jul 10, 2020
41ab1b2
Merge pull request #1 from ultralytics/master
Laughing-q Jul 10, 2020
d40e478
--rect test bug patch
glenn-jocher Jul 10, 2020
51a161d
Update train.py
Laughing-q Jul 10, 2020
6649770
--rect test bug fix
glenn-jocher Jul 10, 2020
59beae9
add if isfile() to get_hash()
glenn-jocher Jul 10, 2020
17b9d7c
Merge pull request #344 from Laughing-q/master
glenn-jocher Jul 10, 2020
1c13e67
evolution bug fix #346
glenn-jocher Jul 10, 2020
c494a11
Merge remote-tracking branch 'origin/master'
glenn-jocher Jul 10, 2020
1e9cf6a
add file sizes to ckpt ops
glenn-jocher Jul 10, 2020
1531795
avoid git status check in Docker bug fix #342
glenn-jocher Jul 10, 2020
41bb70b
update create_pretrained()
glenn-jocher Jul 10, 2020
9006b85
update export.py torchscript file extension
glenn-jocher Jul 10, 2020
d3e786e
google_utils.py bug fix #355
glenn-jocher Jul 11, 2020
01a67a9
Merge remote-tracking branch 'origin/master'
glenn-jocher Jul 11, 2020
d6f6b33
update datasets.py for image size check during caching
glenn-jocher Jul 11, 2020
98fc483
train.py results.txt to bucket bug fix
glenn-jocher Jul 11, 2020
224e9a1
Merge remote-tracking branch 'origin/master'
glenn-jocher Jul 11, 2020
5de4e25
update tensorboard metric
glenn-jocher Jul 11, 2020
a586751
multi-gpu ckpt filesize bug fix #253
glenn-jocher Jul 11, 2020
01a73ec
multi-gpu ckpt filesize bug fix #253
glenn-jocher Jul 11, 2020
f7a6d6c
remove https:// prefix from curl commands fix #355
glenn-jocher Jul 11, 2020
80d5775
Update README.md
glenn-jocher Jul 11, 2020
6e3c3b6
expired pytorch hub cache bug fix #365
glenn-jocher Jul 11, 2020
8797246
Merge remote-tracking branch 'origin/master'
glenn-jocher Jul 11, 2020
a5818b2
expired pytorch hub cache bug fix #365
glenn-jocher Jul 11, 2020
9d7c778
Created using Colaboratory
glenn-jocher Jul 11, 2020
1b1681b
Created using Colaboratory
glenn-jocher Jul 11, 2020
8b38e6f
update dataset comments
glenn-jocher Jul 12, 2020
41ff83a
update torch_utils.py to FP16 EMA
glenn-jocher Jul 12, 2020
0afbb8d
update test.py model.half()
glenn-jocher Jul 12, 2020
eae3330
update datasets.py LoadImages() path improvements and Mixup
glenn-jocher Jul 12, 2020
8412d44
update datasets.py to add detect.py --source glob_command feature
glenn-jocher Jul 12, 2020
e169edf
Update README.md
glenn-jocher Jul 12, 2020
094079b
update detect.py --class argument #387
glenn-jocher Jul 13, 2020
ea34f84
Merge remote-tracking branch 'origin/master'
glenn-jocher Jul 13, 2020
140d84c
comment updates
glenn-jocher Jul 13, 2020
78c9420
--classes bug fix #387
glenn-jocher Jul 13, 2020
c80b249
update Dockerfile
glenn-jocher Jul 13, 2020
02445d1
improved model.yaml source tracking
glenn-jocher Jul 13, 2020
2b18924
yolo.py bug fix
glenn-jocher Jul 13, 2020
2377e5f
FP16 EMA bug fix
glenn-jocher Jul 13, 2020
a1c8406
EMA and non_blocking=True
glenn-jocher Jul 14, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update log_dir to runs/exp ultralytics#107
  • Loading branch information
glenn-jocher committed Jul 9, 2020
commit 603ea0bfdc9b0db3b367fbe7cac5ba6f9a50a49f
2 changes: 1 addition & 1 deletion train.py
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ def train(hyp):
# Train
if not opt.evolve:
print('Start Tensorboard with "tensorboard --logdir=runs", view at http://localhost:6006/')
tb_writer = SummaryWriter(comment=opt.name)
tb_writer = SummaryWriter(log_dir=increment_dir('runs/exp', opt.name))
if opt.hyp: # update hyps
with open(opt.hyp) as f:
hyp.update(yaml.load(f, Loader=yaml.FullLoader))
Expand Down
10 changes: 10 additions & 0 deletions utils/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,16 @@ def output_to_target(output, width, height):
return np.array(targets)


def increment_dir(dir, comment=''):
# Increments a directory runs/exp1 --> runs/exp2_comment
n = 0 # number
d = sorted(glob.glob(dir + '*')) # directories
if len(d):
d = d[-1].replace(dir, '')
n = int(d[:d.find('_')]) + 1 # increment
return dir + str(n) + ('_' + comment if comment else '')


# Plotting functions ---------------------------------------------------------------------------------------------------
def butter_lowpass_filtfilt(data, cutoff=1500, fs=50000, order=5):
# https://stackoverflow.com/questions/28536191/how-to-filter-smooth-with-scipy-numpy
Expand Down