Skip to content
Snippets Groups Projects
Unverified Commit 1d7b0a79 authored by Kai Chen's avatar Kai Chen Committed by GitHub
Browse files

Rewrite dataset evaluation (#2042)


* move evaluation part to datasets

* use dataset.evaluate() in testing scripts

* remove redundant codes

* fix some log formats

* update config with evaludation

* move evaluation below dataset

* remove coco_utils.py and fix test_robustness

Co-authored-by: default avatarJerry Jiarui XU <xvjiarui0826@gmail.com>
parent 6acee79e
No related branches found
No related tags found
No related merge requests found
Showing
with 20 additions and 1 deletion
...@@ -218,6 +218,7 @@ data = dict( ...@@ -218,6 +218,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric=['bbox', 'segm'])
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
...@@ -237,7 +238,6 @@ log_config = dict( ...@@ -237,7 +238,6 @@ log_config = dict(
# dict(type='TensorboardLoggerHook') # dict(type='TensorboardLoggerHook')
]) ])
# yapf:enable # yapf:enable
evaluation = dict(interval=1)
# runtime settings # runtime settings
total_epochs = 12 total_epochs = 12
dist_params = dict(backend='nccl') dist_params = dict(backend='nccl')
......
...@@ -98,6 +98,7 @@ data = dict( ...@@ -98,6 +98,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric='bbox')
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.01, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.01, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -223,6 +223,7 @@ data = dict( ...@@ -223,6 +223,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric=['bbox', 'segm'])
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -225,6 +225,7 @@ data = dict( ...@@ -225,6 +225,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric=['bbox', 'segm'])
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.01, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.01, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -223,6 +223,7 @@ data = dict( ...@@ -223,6 +223,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric=['bbox', 'segm'])
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -225,6 +225,7 @@ data = dict( ...@@ -225,6 +225,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric=['bbox', 'segm'])
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -225,6 +225,7 @@ data = dict( ...@@ -225,6 +225,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric=['bbox', 'segm'])
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -204,6 +204,7 @@ data = dict( ...@@ -204,6 +204,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric='bbox')
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -213,6 +213,7 @@ data = dict( ...@@ -213,6 +213,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric='bbox')
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.01, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.01, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -204,6 +204,7 @@ data = dict( ...@@ -204,6 +204,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric='bbox')
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -206,6 +206,7 @@ data = dict( ...@@ -206,6 +206,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric='bbox')
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -206,6 +206,7 @@ data = dict( ...@@ -206,6 +206,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric='bbox')
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -152,6 +152,7 @@ data = dict( ...@@ -152,6 +152,7 @@ data = dict(
'annotations/instancesonly_filtered_gtFine_val.json', 'annotations/instancesonly_filtered_gtFine_val.json',
img_prefix=data_root + 'val/', img_prefix=data_root + 'val/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric='bbox')
# optimizer # optimizer
# lr is set for a batch size of 8 # lr is set for a batch size of 8
optimizer = dict(type='SGD', lr=0.01, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.01, momentum=0.9, weight_decay=0.0001)
......
...@@ -166,6 +166,7 @@ data = dict( ...@@ -166,6 +166,7 @@ data = dict(
'annotations/instancesonly_filtered_gtFine_val.json', 'annotations/instancesonly_filtered_gtFine_val.json',
img_prefix=data_root + 'val/', img_prefix=data_root + 'val/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric=['bbox', 'segm'])
# optimizer # optimizer
# lr is set for a batch size of 8 # lr is set for a batch size of 8
optimizer = dict(type='SGD', lr=0.01, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.01, momentum=0.9, weight_decay=0.0001)
......
...@@ -225,6 +225,7 @@ data = dict( ...@@ -225,6 +225,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric=['bbox', 'segm'])
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -206,6 +206,7 @@ data = dict( ...@@ -206,6 +206,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric='bbox')
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -147,6 +147,7 @@ data = dict( ...@@ -147,6 +147,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric='bbox')
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -149,6 +149,7 @@ data = dict( ...@@ -149,6 +149,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric='bbox')
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -151,6 +151,7 @@ data = dict( ...@@ -151,6 +151,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric='bbox')
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
...@@ -147,6 +147,7 @@ data = dict( ...@@ -147,6 +147,7 @@ data = dict(
ann_file=data_root + 'annotations/instances_val2017.json', ann_file=data_root + 'annotations/instances_val2017.json',
img_prefix=data_root + 'val2017/', img_prefix=data_root + 'val2017/',
pipeline=test_pipeline)) pipeline=test_pipeline))
evaluation = dict(interval=1, metric='bbox')
# optimizer # optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001) optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0001)
optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2)) optimizer_config = dict(grad_clip=dict(max_norm=35, norm_type=2))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment