decide lower_better from pyiqa; remove FID and add new metrics

ryanxingql · Sep 18, 2024 · af103a4 · af103a4
1 parent a4ff431
commit af103a4
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 63 deletions.
diff --git a/basicsr b/basicsr
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -84,9 +84,7 @@ val:
 
   metrics:
     psnr:
-      type: calculate_psnr
-      crop_border: 0
-      test_y_channel: false
+      type: pyiqa
 
 # logging settings
 logger: