From af103a4f65e87c0093027b69d79df55746a8757e Mon Sep 17 00:00:00 2001 From: ryanxingql <34084019+ryanxingql@users.noreply.github.com> Date: Wed, 18 Sep 2024 12:37:36 +0800 Subject: [PATCH] decide lower_better from pyiqa; remove FID and add new metrics --- basicsr | 2 +- options/test/ESRGAN/DIV2K_LMDB_G1_latest.yml | 20 +++++++++---------- .../ESRGAN/RRDBNet_DIV2K_LMDB_G1_latest.yml | 20 ++++++++++++------- .../test/RealESRGAN/DIV2K_LMDB_G2_latest.yml | 20 +++++++++---------- .../RealESRNet_DIV2K_LMDB_G2_latest.yml | 20 ++++++++++++------- options/test/identity/DIV2K_G1.yml | 20 +++++++++---------- options/train/ESRGAN/DIV2K_LMDB_G1.yml | 6 ------ .../train/ESRGAN/RRDBNet_DIV2K_LMDB_G1.yml | 4 +--- options/train/RealESRGAN/DIV2K_LMDB_G2.yml | 6 ------ .../RealESRGAN/RealESRNet_DIV2K_LMDB_G2.yml | 4 +--- 10 files changed, 59 insertions(+), 63 deletions(-) diff --git a/basicsr b/basicsr index 5f6f8a7..abaeee5 160000 --- a/basicsr +++ b/basicsr @@ -1 +1 @@ -Subproject commit 5f6f8a7a73b2edf23cd921c788b8595045ba6be3 +Subproject commit abaeee5d2f9b926320ef5c5c597a0b5ecbaac354 diff --git a/options/test/ESRGAN/DIV2K_LMDB_G1_latest.yml b/options/test/ESRGAN/DIV2K_LMDB_G1_latest.yml index 46b2b4d..ca1f363 100644 --- a/options/test/ESRGAN/DIV2K_LMDB_G1_latest.yml +++ b/options/test/ESRGAN/DIV2K_LMDB_G1_latest.yml @@ -33,21 +33,21 @@ path: # validation settings val: - save_img: true + save_img: false suffix: ~ # add suffix to saved images, if None, use exp name metrics: psnr: - type: calculate_psnr - crop_border: 0 - test_y_channel: false + type: pyiqa ssim: - type: calculate_ssim - crop_border: 0 - test_y_channel: false - fid: type: pyiqa - better: lower lpips: type: pyiqa - better: lower + clipiqa+: + type: pyiqa + topiq_fr: + type: pyiqa + musiq: + type: pyiqa + wadiqam_fr: + type: pyiqa diff --git a/options/test/ESRGAN/RRDBNet_DIV2K_LMDB_G1_latest.yml b/options/test/ESRGAN/RRDBNet_DIV2K_LMDB_G1_latest.yml index 0d2822c..15b3bfa 100644 --- a/options/test/ESRGAN/RRDBNet_DIV2K_LMDB_G1_latest.yml +++ b/options/test/ESRGAN/RRDBNet_DIV2K_LMDB_G1_latest.yml @@ -33,15 +33,21 @@ path: # validation settings val: - save_img: true + save_img: false suffix: ~ # add suffix to saved images, if None, use exp name metrics: psnr: - type: calculate_psnr - crop_border: 0 - test_y_channel: false + type: pyiqa ssim: - type: calculate_ssim - crop_border: 0 - test_y_channel: false + type: pyiqa + lpips: + type: pyiqa + clipiqa+: + type: pyiqa + topiq_fr: + type: pyiqa + musiq: + type: pyiqa + wadiqam_fr: + type: pyiqa diff --git a/options/test/RealESRGAN/DIV2K_LMDB_G2_latest.yml b/options/test/RealESRGAN/DIV2K_LMDB_G2_latest.yml index 3d80d46..140ba7e 100644 --- a/options/test/RealESRGAN/DIV2K_LMDB_G2_latest.yml +++ b/options/test/RealESRGAN/DIV2K_LMDB_G2_latest.yml @@ -33,21 +33,21 @@ path: # validation settings val: - save_img: true + save_img: False suffix: ~ # add suffix to saved images, if None, use exp name metrics: psnr: - type: calculate_psnr - crop_border: 0 - test_y_channel: false + type: pyiqa ssim: - type: calculate_ssim - crop_border: 0 - test_y_channel: false - fid: type: pyiqa - better: lower lpips: type: pyiqa - better: lower + clipiqa+: + type: pyiqa + topiq_fr: + type: pyiqa + musiq: + type: pyiqa + wadiqam_fr: + type: pyiqa diff --git a/options/test/RealESRGAN/RealESRNet_DIV2K_LMDB_G2_latest.yml b/options/test/RealESRGAN/RealESRNet_DIV2K_LMDB_G2_latest.yml index 4fbd742..0331fca 100644 --- a/options/test/RealESRGAN/RealESRNet_DIV2K_LMDB_G2_latest.yml +++ b/options/test/RealESRGAN/RealESRNet_DIV2K_LMDB_G2_latest.yml @@ -33,15 +33,21 @@ path: # validation settings val: - save_img: true + save_img: False suffix: ~ # add suffix to saved images, if None, use exp name metrics: psnr: - type: calculate_psnr - crop_border: 0 - test_y_channel: false + type: pyiqa ssim: - type: calculate_ssim - crop_border: 0 - test_y_channel: false + type: pyiqa + lpips: + type: pyiqa + clipiqa+: + type: pyiqa + topiq_fr: + type: pyiqa + musiq: + type: pyiqa + wadiqam_fr: + type: pyiqa diff --git a/options/test/identity/DIV2K_G1.yml b/options/test/identity/DIV2K_G1.yml index 4d37db5..a36cee5 100644 --- a/options/test/identity/DIV2K_G1.yml +++ b/options/test/identity/DIV2K_G1.yml @@ -27,21 +27,21 @@ path: # validation settings val: - save_img: true # save img -> tensor -> img version, which is lossy + save_img: false # save img -> tensor -> img version, which is lossy suffix: ~ # add suffix to saved images, if None, use exp name metrics: psnr: - type: calculate_psnr - crop_border: 0 - test_y_channel: false + type: pyiqa ssim: - type: calculate_ssim - crop_border: 0 - test_y_channel: false - fid: type: pyiqa - better: lower lpips: type: pyiqa - better: lower + clipiqa+: + type: pyiqa + topiq_fr: + type: pyiqa + musiq: + type: pyiqa + wadiqam_fr: + type: pyiqa diff --git a/options/train/ESRGAN/DIV2K_LMDB_G1.yml b/options/train/ESRGAN/DIV2K_LMDB_G1.yml index b8d42a5..d8eda8f 100644 --- a/options/train/ESRGAN/DIV2K_LMDB_G1.yml +++ b/options/train/ESRGAN/DIV2K_LMDB_G1.yml @@ -112,15 +112,9 @@ val: metrics: psnr: - type: calculate_psnr - crop_border: 0 - test_y_channel: false - fid: type: pyiqa - better: lower lpips: type: pyiqa - better: lower # logging settings logger: diff --git a/options/train/ESRGAN/RRDBNet_DIV2K_LMDB_G1.yml b/options/train/ESRGAN/RRDBNet_DIV2K_LMDB_G1.yml index 44e7382..f28fe84 100644 --- a/options/train/ESRGAN/RRDBNet_DIV2K_LMDB_G1.yml +++ b/options/train/ESRGAN/RRDBNet_DIV2K_LMDB_G1.yml @@ -84,9 +84,7 @@ val: metrics: psnr: - type: calculate_psnr - crop_border: 0 - test_y_channel: false + type: pyiqa # logging settings logger: diff --git a/options/train/RealESRGAN/DIV2K_LMDB_G2.yml b/options/train/RealESRGAN/DIV2K_LMDB_G2.yml index f468108..26be8c7 100644 --- a/options/train/RealESRGAN/DIV2K_LMDB_G2.yml +++ b/options/train/RealESRGAN/DIV2K_LMDB_G2.yml @@ -125,15 +125,9 @@ val: metrics: psnr: - type: calculate_psnr - crop_border: 0 - test_y_channel: false - fid: type: pyiqa - better: lower lpips: type: pyiqa - better: lower # logging settings logger: diff --git a/options/train/RealESRGAN/RealESRNet_DIV2K_LMDB_G2.yml b/options/train/RealESRGAN/RealESRNet_DIV2K_LMDB_G2.yml index aceefc1..3ee7b51 100644 --- a/options/train/RealESRGAN/RealESRNet_DIV2K_LMDB_G2.yml +++ b/options/train/RealESRGAN/RealESRNet_DIV2K_LMDB_G2.yml @@ -84,9 +84,7 @@ val: metrics: psnr: - type: calculate_psnr - crop_border: 0 - test_y_channel: false + type: pyiqa # logging settings logger: