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.

Sign up for GitHub

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

[Fix] Fix test benchmark #1040

Merged
merged 10 commits into from
Aug 23, 2022
Merged

[Fix] Fix test benchmark #1040

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8942fd0
support multi dataset in test stage
LeoXing1996 Aug 17, 2022
a28f14a
fix bug of liif and srcnn
LeoXing1996 Aug 18, 2022
4cbc0a7
change test config position + fix liif bug
LeoXing1996 Aug 18, 2022
d747e64
fix some configs
LeoXing1996 Aug 19, 2022
148a619
fix test configs
LeoXing1996 Aug 22, 2022
78051cb
refactor readmes
LeoXing1996 Aug 22, 2022
f3a3c3e
update readmes
LeoXing1996 Aug 22, 2022
1176211
fix lint
LeoXing1996 Aug 22, 2022
6bd41e1
revise test config for basicvsr
LeoXing1996 Aug 22, 2022
7c6519a
update readme of tof, basicvsr and iconvsr
LeoXing1996 Aug 23, 2022
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
fix bug of liif and srcnn
  • Loading branch information
@LeoXing1996
LeoXing1996 committed Aug 22, 2022
commit a28f14a05e7b5bf242b60baea06c3ad71fc4721b
282 changes: 132 additions & 150 deletions .dev_scripts/create_ceph_configs.py
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .dev_scripts/test_benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def create_test_job_batch(commands, model_info, args, port, script_name):
print(f'WARNING: {fname}: {checkpoint} not found.')
return None

job_name = f'{args.job_name}_{fname}'
job_name = f'{args.job_name}_{fname}'.strip('_')
work_dir = Path(args.work_dir) / fname
work_dir.mkdir(parents=True, exist_ok=True)
result_file = work_dir / 'result.pkl'
Expand Down
1 change: 0 additions & 1 deletion configs/_base_/image_srx3_test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
]

# test config

test_cfg = dict(type='MultiTestLoop')
test_dataloader = [
set5_dataloader,
Expand Down
45 changes: 23 additions & 22 deletions configs/_base_/models/base_liif.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
dict(type='GenerateCoordinateAndCell', sample_quantity=2304),
dict(type='PackEditInputs')
]
valid_pipeline = [
val_pipeline = [
dict(
type='LoadImageFromFile',
key='gt',
Expand All @@ -41,23 +41,24 @@
dict(type='GenerateCoordinateAndCell', reshape_gt=False),
dict(type='PackEditInputs')
]
test_pipeline = [
dict(
type='LoadImageFromFile',
key='gt',
color_type='color',
channel_order='rgb',
imdecode_backend='cv2'),
dict(
type='LoadImageFromFile',
key='img',
color_type='color',
channel_order='rgb',
imdecode_backend='cv2'),
dict(type='ToTensor', keys=['img', 'gt']),
dict(type='GenerateCoordinateAndCell', scale=scale_test, reshape_gt=False),
dict(type='PackEditInputs')
]
# test_pipeline = [
# dict(
# type='LoadImageFromFile',
# key='gt',
# color_type='color',
# channel_order='rgb',
# imdecode_backend='cv2'),
# dict(
# type='LoadImageFromFile',
# key='img',
# color_type='color',
# channel_order='rgb',
# imdecode_backend='cv2'),
# dict(type='ToTensor', keys=['img', 'gt']),
# dict(type='GenerateCoordinateAndCell', scale=scale_test,
# reshape_gt=False),
# dict(type='PackEditInputs')
# ]

# dataset settings
dataset_type = 'BasicImageDataset'
Expand Down Expand Up @@ -86,21 +87,21 @@
metainfo=dict(dataset_type='set5', task_name='sisr'),
data_root=data_root + '/Set5',
data_prefix=dict(img='LRbicx4', gt='GTmod12'),
pipeline=test_pipeline))
pipeline=val_pipeline))

test_dataloader = val_dataloader
# test_dataloader = val_dataloader

val_evaluator = [
dict(type='MAE'),
dict(type='PSNR', crop_border=scale_max),
dict(type='SSIM', crop_border=scale_max),
]
test_evaluator = val_evaluator
# test_evaluator = val_evaluator

train_cfg = dict(
type='IterBasedTrainLoop', max_iters=1_000_000, val_interval=3000)
val_cfg = dict(type='ValLoop')
test_cfg = dict(type='TestLoop')
# test_cfg = dict(type='TestLoop')

# optimizer
optim_wrapper = dict(
Expand Down
28 changes: 14 additions & 14 deletions configs/liif/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@ How to represent an image? While the visual world is presented in a continuous m

## Results and models

| Method | scale | Set5<br>PSNR / SSIM | Set14<br>PSNR / SSIM | DIV2K <br>PSNR / SSIM | GPU Info | Download |
| :----------------------------------------------------------------------------------------------: | :---: | :-----------------: | :------------------: | :-------------------: | :----------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
| [liif_edsr_norm_c64b16_g1_1000k_div2k](/configs/liif/liif-edsr-norm_c64b16_1000k-1xb16_div2k.py) | x2 | 35.7131 / 0.9366 | 31.5579 / 0.8889 | 34.6647 / 0.9355 | 1 (TITAN Xp) | [model](https://download.openmmlab.com/mmediting/restorers/liif/liif_edsr_norm_c64b16_g1_1000k_div2k_20210715-ab7ce3fc.pth) \| [log](https://download.openmmlab.com/mmediting/restorers/liif/liif_edsr_norm_c64b16_g1_1000k_div2k_20210715-ab7ce3fc.log.json) |
| △ | x3 | 32.3805 / 0.8915 | 28.4605 / 0.8039 | 30.9808 / 0.8724 | △ | △ |
| △ | x4 | 30.2748 / 0.8509 | 26.8415 / 0.7381 | 29.0245 / 0.8187 | △ | △ |
| △ | x6 | 27.1187 / 0.7774 | 24.7461 / 0.6444 | 26.7770 / 0.7425 | △ | △ |
| △ | x18 | 20.8516 / 0.5406 | 20.0096 / 0.4525 | 22.1987 / 0.5955 | △ | △ |
| △ | x30 | 18.8467 / 0.5010 | 18.1321 / 0.3963 | 20.5050 / 0.5577 | △ | △ |
| [liif_rdn_norm_c64b16_g1_1000k_div2k](/configs/liif/liif-rdn-norm_c64b16_1000k-1xb16_div2k.py) | x2 | 35.7874 / 0.9366 | 31.6866 / 0.8896 | 34.7548 / 0.9356 | 1 (TITAN Xp) | [model](https://download.openmmlab.com/mmediting/restorers/liif/liif_rdn_norm_c64b16_g1_1000k_div2k_20210717-22d6fdc8.pth) \| [log](https://download.openmmlab.com/mmediting/restorers/liif/liif_rdn_norm_c64b16_g1_1000k_div2k_20210717-22d6fdc8.log.json) |
| △ | x3 | 32.4992 / 0.8923 | 28.4905 / 0.8037 | 31.0744 / 0.8731 | △ | △ |
| △ | x4 | 30.3835 / 0.8513 | 26.8734 / 0.7373 | 29.1101 / 0.8197 | △ | △ |
| △ | x6 | 27.1914 / 0.7751 | 24.7824 / 0.6434 | 26.8693 / 0.7437 | △ | △ |
| △ | x18 | 20.8913 / 0.5329 | 20.1077 / 0.4537 | 22.2972 / 0.5950 | △ | △ |
| △ | x30 | 18.9354 / 0.4864 | 18.1448 / 0.3942 | 20.5663 / 0.5560 | △ | △ |
| Method | scale | Set5 PSNR | Set5 SSIM | Set14 PSNR | Set14 SSIM | DIV2K PSNR | DIV2K SSIM | GPU Info | Download |
| :-----------------------------------------------------------------------------------------------------------------: | :---: | :-------: | :-------: | :--------: | :--------: | :--------: | :--------: | :----------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
| [liif_edsr_norm_c64b16_g1_1000k_div2k](/configs/liif/liif_edsr_norm_c64b16_g1_1000k_div2k.py) | x2 | 35.7131 | 0.9366 | 31.5579 | 0.8889 | 34.6647 | 0.9355 | 1 (TITAN Xp) | [model](https://download.openmmlab.com/mmediting/restorers/liif/liif_edsr_norm_c64b16_g1_1000k_div2k_20210715-ab7ce3fc.pth) \| [log](https://download.openmmlab.com/mmediting/restorers/liif/liif_edsr_norm_c64b16_g1_1000k_div2k_20210715-ab7ce3fc.log.json) |
| [liif_edsr_norm_c64b16_g1_1000k_div2k_srx3](/configs/liif/liif_edsr_norm_c64b16_g1_1000k_div2k_srx3_only_test.py) | x3 | 32.3805 | 0.8915 | 28.4605 | 0.8039 | 30.9808 | 0.8724 | △ | △ |
| [liif_edsr_norm_c64b16_g1_1000k_div2k_srx4](/configs/liif/liif_edsr_norm_c64b16_g1_1000k_div2k_srx4_only_test.py) | x4 | 30.2748 | 0.8509 | 26.8415 | 0.7381 | 29.0245 | 0.8187 | △ | △ |
| [liif_edsr_norm_c64b16_g1_1000k_div2k_srx6](/configs/liif/liif_edsr_norm_c64b16_g1_1000k_div2k_srx6_only_test.py) | x6 | 27.1187 | 0.7774 | 24.7461 | 0.6444 | 26.7770 | 0.7425 | △ | △ |
| [liif_edsr_norm_c64b16_g1_1000k_div2k_srx18](/configs/liif/liif_edsr_norm_c64b16_g1_1000k_div2k_srx18_only_test.py) | x18 | 20.8516 | 0.5406 | 20.0096 | 0.4525 | 22.1987 | 0.5955 | △ | △ |
| [liif_edsr_norm_c64b16_g1_1000k_div2k_srx30](/configs/liif/liif_edsr_norm_c64b16_g1_1000k_div2k_srx30_only_test.py) | x30 | 18.8467 | 0.5010 | 18.1321 | 0.3963 | 20.5050 | 0.5577 | △ | △ |
| [liif_rdn_norm_c64b16_g1_1000k_div2k](/configs/liif/liif_rdn_norm_c64b16_g1_1000k_div2k.py) | x2 | 35.7874 | 0.9366 | 31.6866 | 0.8896 | 34.7548 | 0.9356 | 1 (TITAN Xp) | [model](https://download.openmmlab.com/mmediting/restorers/liif/liif_rdn_norm_c64b16_g1_1000k_div2k_20210717-22d6fdc8.pth) \| [log](https://download.openmmlab.com/mmediting/restorers/liif/liif_rdn_norm_c64b16_g1_1000k_div2k_20210717-22d6fdc8.log.json) |
| [liif_rdn_norm_c64b16_g1_1000k_div2k_srx3](/configs/liif/liif_rdn_norm_c64b16_g1_1000k_div2k_srx3_only_test.py) | x3 | 32.4992 | 0.8923 | 28.4905 | 0.8037 | 31.0744 | 0.8731 | △ | △ |
| [liif_rdn_norm_c64b16_g1_1000k_div2k_srx4](/configs/liif/liif_rdn_norm_c64b16_g1_1000k_div2k_srx4_only_test.py) | x4 | 30.3835 | 0.8513 | 26.8734 | 0.7373 | 29.1101 | 0.8197 | △ | △ |
| [liif_rdn_norm_c64b16_g1_1000k_div2k_srx6](/configs/liif/liif_rdn_norm_c64b16_g1_1000k_div2k_srx6_only_test.py) | x6 | 27.1914 | 0.7751 | 24.7824 | 0.6434 | 26.8693 | 0.7437 | △ | △ |
| [liif_rdn_norm_c64b16_g1_1000k_div2k_srx18](/configs/liif/liif_rdn_norm_c64b16_g1_1000k_div2k_srx18_only_test.py) | x18 | 20.8913 | 0.5329 | 20.1077 | 0.4537 | 22.2972 | 0.5950 | △ | △ |
| [liif_rdn_norm_c64b16_g1_1000k_div2k_srx30](/configs/liif/liif_rdn_norm_c64b16_g1_1000k_div2k_srx30_only_test.py) | x30 | 18.9354 | 0.4864 | 18.1448 | 0.3942 | 20.5663 | 0.5560 | △ | △ |

Note:

Expand Down
94 changes: 94 additions & 0 deletions configs/liif/liif_edsr_norm_c64b16_g1_1000k_div2k_srx18_only_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
_base_ = 'liif_edsr_norm_c64b16_g1_1000k_div2k.py'

experiment_name = 'liif_edsr_norm_c64b16_g1_1000k_div2k_srx18'
work_dir = f'./work_dirs/{experiment_name}'

scale_test = 18

data_root = 'data'
dataset_type = 'BasicImageDataset'
test_pipeline = [
dict(
type='LoadImageFromFile',
key='gt',
color_type='color',
channel_order='rgb',
imdecode_backend='cv2'),
dict(
type='LoadImageFromFile',
key='img',
color_type='color',
channel_order='rgb',
imdecode_backend='cv2'),
dict(type='ToTensor', keys=['img', 'gt']),
dict(type='GenerateCoordinateAndCell', scale=scale_test, reshape_gt=False),
dict(type='PackEditInputs')
]

# test config for Set5
set5_dataloader = dict(
num_workers=4,
persistent_workers=False,
drop_last=False,
sampler=dict(type='DefaultSampler', shuffle=False),
dataset=dict(
type=dataset_type,
metainfo=dict(dataset_type='set5', task_name='sisr'),
data_root=data_root + '/Set5',
data_prefix=dict(img='LRbicx4', gt='GTmod12'),
pipeline=test_pipeline))
set5_evaluator = [
dict(type='PSNR', crop_border=2, prefix='Set5'),
dict(type='SSIM', crop_border=2, prefix='Set5'),
]

# test config for Set14
set14_dataloader = dict(
num_workers=4,
persistent_workers=False,
drop_last=False,
sampler=dict(type='DefaultSampler', shuffle=False),
dataset=dict(
type=dataset_type,
metainfo=dict(dataset_type='set14', task_name='sisr'),
data_root=data_root + '/Set14',
data_prefix=dict(img='LRbicx4', gt='GTmod12'),
pipeline=test_pipeline))
set14_evaluator = [
dict(type='PSNR', crop_border=2, prefix='Set14'),
dict(type='SSIM', crop_border=2, prefix='Set14'),
]

# test config for DIV2K
div2k_dataloader = dict(
num_workers=4,
persistent_workers=False,
drop_last=False,
sampler=dict(type='DefaultSampler', shuffle=False),
dataset=dict(
type='BasicImageDataset',
ann_file='meta_info_DIV2K800sub_GT.txt',
metainfo=dict(dataset_type='div2k', task_name='sisr'),
data_root=data_root + '/DIV2K',
# TODO: what this"
data_prefix=dict(
img='DIV2K_test_LR_bicubic/X4', gt='DIV2K_test_HR_sub'),
filename_tmpl=dict(img='{}_x4', gt='{}'),
pipeline=test_pipeline))
div2k_evaluator = [
dict(type='PSNR', crop_border=2, prefix='DIV2K'),
dict(type='SSIM', crop_border=2, prefix='DIV2K'),
]

# test config
test_cfg = dict(type='MultiTestLoop')
test_dataloader = [
set5_dataloader,
# set14_dataloader,
# div2k_dataloader,
]
test_evaluator = [
set5_evaluator,
# set14_evaluator,
# div2k_evaluator,
]
Loading