[Fix] fix some dataset converters typos (#1910)

open-mmlab · Jun 21, 2023 · 442fa76 · 442fa76
1 parent 05ed042
commit 442fa76
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 44 deletions.
diff --git a/configs/_base_/datasets/deblurring-motion_test_config.py b/configs/_base_/datasets/deblurring-motion_test_config.py
@@ -14,7 +14,7 @@
     dict(type='PackInputs')
 ]
 
-gopro_data_root = 'data/GoPro'
+gopro_data_root = 'data/gopro/test'
 gopro_dataloader = dict(
     num_workers=4,
     persistent_workers=False,
@@ -24,7 +24,7 @@
         type='BasicImageDataset',
         metainfo=dict(dataset_type='GoPro', task_name='deblurring'),
         data_root=gopro_data_root,
-        data_prefix=dict(img='input', gt='target'),
+        data_prefix=dict(img='blur', gt='sharp'),
         pipeline=test_pipeline))
 gopro_evaluator = [
     dict(type='PSNR', prefix='GoPro'),

diff --git a/configs/_base_/datasets/denoising-real_test_config.py b/configs/_base_/datasets/denoising-real_test_config.py
@@ -14,7 +14,7 @@
     dict(type='PackInputs')
 ]
 
-sidd_data_root = 'data/SIDD'
+sidd_data_root = 'data/SIDD/val/'
 sidd_dataloader = dict(
     num_workers=4,
     persistent_workers=False,
@@ -24,7 +24,8 @@
         type='BasicImageDataset',
         metainfo=dict(dataset_type='SIDD', task_name='denoising'),
         data_root=sidd_data_root,
-        data_prefix=dict(img='input', gt='groundtruth'),
+        data_prefix=dict(img='noisy', gt='gt'),
+        filename_tmpl=dict(gt='{}_GT', img='{}_NOISY'),
         pipeline=test_pipeline))
 sidd_evaluator = [
     dict(type='PSNR', prefix='SIDD'),

diff --git a/configs/restormer/README.md b/configs/restormer/README.md
@@ -36,12 +36,12 @@ Evaluated on Y channels. The metrics are `PSNR` / `SSIM` .
 
 Evaluated on RGB channels for GoPro and HIDE, and Y channel for ReakBlur-J and ReakBlur-R. The metrics are `PSNR` / `SSIM` .
 
-|                           Model                           |   Dataset    | PSNR/SSIM (RGB) | <br>PSNR/SSIM (Y) | Training Resources |                                     Download                                      |
-| :-------------------------------------------------------: | :----------: | :-------------: | :---------------: | :----------------: | :-------------------------------------------------------------------------------: |
-| [restormer_official_gopro](./restormer_official_gopro.py) | DatasetGoPro | 32.9295/0.9496  |         -         |         1          | [model](https://download.openmmlab.com/mmediting/restormer/restormer_official_gopro-db7363a0.pth) \| log |
-| [restormer_official_gopro](./restormer_official_gopro.py) |     HIDE     | 31.2289/0.9345  |         -         |         1          | [model](https://download.openmmlab.com/mmediting/restormer/restormer_official_gopro-db7363a0.pth) \| log |
-| [restormer_official_gopro](./restormer_official_gopro.py) |  RealBlur-J  |        -        |  28.4356/0.8681   |         1          | [model](https://download.openmmlab.com/mmediting/restormer/restormer_official_gopro-db7363a0.pth) \| log |
-| [restormer_official_gopro](./restormer_official_gopro.py) |  RealBlur-R  |        -        |  35.9141/0.9707   |         1          | [model](https://download.openmmlab.com/mmediting/restormer/restormer_official_gopro-db7363a0.pth) \| log |
+|                           Model                           |  Dataset   | PSNR/SSIM (RGB) | <br>PSNR/SSIM (Y) | Training Resources |                                      Download                                       |
+| :-------------------------------------------------------: | :--------: | :-------------: | :---------------: | :----------------: | :---------------------------------------------------------------------------------: |
+| [restormer_official_gopro](./restormer_official_gopro.py) |   GoPro    | 32.9295/0.9496  |         -         |         1          | [model](https://download.openmmlab.com/mmediting/restormer/restormer_official_gopro-db7363a0.pth) \| log |
+| [restormer_official_gopro](./restormer_official_gopro.py) |    HIDE    | 31.2289/0.9345  |         -         |         1          | [model](https://download.openmmlab.com/mmediting/restormer/restormer_official_gopro-db7363a0.pth) \| log |
+| [restormer_official_gopro](./restormer_official_gopro.py) | RealBlur-J |        -        |  28.4356/0.8681   |         1          | [model](https://download.openmmlab.com/mmediting/restormer/restormer_official_gopro-db7363a0.pth) \| log |
+| [restormer_official_gopro](./restormer_official_gopro.py) | RealBlur-R |        -        |  35.9141/0.9707   |         1          | [model](https://download.openmmlab.com/mmediting/restormer/restormer_official_gopro-db7363a0.pth) \| log |
 
 ### **Defocus Deblurring**
 

diff --git a/configs/restormer/metafile.yml b/configs/restormer/metafile.yml
@@ -43,7 +43,7 @@ Models:
   In Collection: Restormer
   Name: restormer_official_gopro
   Results:
-  - Dataset: DatasetGoPro
+  - Dataset: GoPro
     Metrics:
       PSNR/SSIM (RGB):
         PSNR: 32.9295

diff --git a/configs/swinir/swinir_s126w7d6e180_8xb1-lr2e-4-1600k_dfwb-grayCAR10.py b/configs/swinir/swinir_s126w7d6e180_8xb1-lr2e-4-1600k_dfwb-grayCAR10.py
@@ -101,13 +101,13 @@
     dataset=dict(
         type=dataset_type,
         metainfo=dict(dataset_type='classic5', task_name='CAR'),
-        data_root=data_root + '/classic5',
+        data_root=data_root + '/Classic5',
         data_prefix=dict(img='', gt=''),
         pipeline=val_pipeline))
 
 val_evaluator = [
-    dict(type='PSNR', prefix='classic5'),
-    dict(type='SSIM', prefix='classic5'),
+    dict(type='PSNR', prefix='Classic5'),
+    dict(type='SSIM', prefix='Classic5'),
 ]
 
 train_cfg = dict(

diff --git a/tools/dataset_converters/classic5/README.md b/tools/dataset_converters/classic5/README.md
@@ -25,6 +25,4 @@ mmagic
 ├── configs
 ├── data
 |   ├── Classic5
-|   |   ├── input
-|   |   ├── target
 ```
diff --git a/tools/dataset_converters/deraining/README.md b/tools/dataset_converters/deraining/README.md
@@ -36,7 +36,4 @@ mmagic
 |   ├── Test2800
 |   |   ├── input
 |   |   ├── target
-|   ├── Test100
-|   |   ├── input
-|   |   ├── target
 ```
diff --git a/tools/dataset_converters/deraining/README_zh-CN.md b/tools/dataset_converters/deraining/README_zh-CN.md
@@ -36,7 +36,4 @@ mmagic
 |   ├── Test2800
 |   |   ├── input
 |   |   ├── target
-|   ├── Test100
-|   |   ├── input
-|   |   ├── target
 ```
diff --git a/tools/dataset_converters/dpdd/README.md b/tools/dataset_converters/dpdd/README.md
@@ -26,4 +26,8 @@ mmagic
 |   |   ├── inputR
 |   |   ├── inputC
 |   |   ├── target
+|   |   ├── indoor_labels.npy
+|   |   ├── indoor_labels.txt
+|   |   ├── outdoor_labels.npy
+|   |   ├── outdoor_labels.txt
 ```
diff --git a/tools/dataset_converters/dpdd/README_zh-CN.md b/tools/dataset_converters/dpdd/README_zh-CN.md
@@ -26,4 +26,8 @@ mmagic
 |   |   ├── inputR
 |   |   ├── inputC
 |   |   ├── target
+|   |   ├── indoor_labels.npy
+|   |   ├── indoor_labels.txt
+|   |   ├── outdoor_labels.npy
+|   |   ├── outdoor_labels.txt
 ```
diff --git a/tools/dataset_converters/gopro/README.md b/tools/dataset_converters/gopro/README.md
@@ -23,9 +23,9 @@ mmagic
 ├── data
 |   ├── GoPro
 |   |   ├── train
-|   |   |   ├── input
-|   |   |   ├── target
+|   |   |   ├── blur
+|   |   |   ├── sharp
 |   |   ├── test
-|   |   |   ├── input
-|   |   |   ├── target
+|   |   |   ├── blur
+|   |   |   ├── sharp
 ```
diff --git a/tools/dataset_converters/gopro/README_zh-CN.md b/tools/dataset_converters/gopro/README_zh-CN.md
@@ -23,9 +23,9 @@ mmagic
 ├── data
 |   ├── GoPro
 |   |   ├── train
-|   |   |   ├── input
-|   |   |   ├── target
+|   |   |   ├── blur
+|   |   |   ├── sharp
 |   |   ├── test
-|   |   |   ├── input
-|   |   |   ├── target
+|   |   |   ├── blur
+|   |   |   ├── sharp
 ```
diff --git a/tools/dataset_converters/sidd/README.md b/tools/dataset_converters/sidd/README.md
@@ -11,12 +11,12 @@
 }
 ```
 
-The train datasets can be download from [here](https://drive.google.com/file/d/1UHjWZzLPGweA9ZczmV8lFSRcIxqiOVJw/). The validation datasets can be download from [here](https://drive.google.com/file/d/1Fw6Ey1R-nCHN9WEpxv0MnMqxij-ECQYJ/). The test datasets can be download from [here](https://drive.google.com/file/d/11vfqV-lqousZTuAit1Qkqghiv_taY0KZ/).
+The train datasets can be download from [here](https://drive.google.com/file/d/1UHjWZzLPGweA9ZczmV8lFSRcIxqiOVJw/). The validation datasets can be download from [here](https://drive.google.com/file/d/11vfqV-lqousZTuAit1Qkqghiv_taY0KZ/).
 
-For test datasets, we need to export images from mat file. We provide such a script:
+For validation datasets, we need to export images from mat file. We provide such a script:
 
 ```shell
-python tools/dataset_converters/sidd/preprocess_sidd_test_dataset.py --data-root ./data/SIDD/test --out-dir ./data/SIDD/test
+python tools/dataset_converters/sidd/preprocess_sidd_test_dataset.py --data-root ./data/SIDD/val --out-dir ./data/SIDD/val
 ```
 
 The folder structure should look like:
@@ -32,9 +32,8 @@ mmagic
 |   |   |   ├── gt
 |   |   |   ├── noisy
 |   |   ├── val
-|   |   |   ├── input_crops
-|   |   |   ├── target_crops
-|   |   ├── test
 |   |   |   ├── gt
 |   |   |   ├── noisy
+|   |   |   ├── ValidationNoisyBlocksSrgb.mat
+|   |   |   ├── ValidationGtBlocksSrgb.mat
 ```
diff --git a/tools/dataset_converters/sidd/README_zh-CN.md b/tools/dataset_converters/sidd/README_zh-CN.md
@@ -11,12 +11,12 @@
 }
 ```
 
-训练数据集可以从 [此处](https://drive.google.com/file/d/1UHjWZzLPGweA9ZczmV8lFSRcIxqiOVJw/) 下载。验证数据集可以从 [此处](https://drive.google.com/file/d/1Fw6Ey1R-nCHN9WEpxv0MnMqxij-ECQYJ/) 下载。测试数据集可以从 [此处](https://drive.google.com/file/d/11vfqV-lqousZTuAit1Qkqghiv_taY0KZ/) 下载。
+训练数据集可以从 [此处](https://drive.google.com/file/d/1UHjWZzLPGweA9ZczmV8lFSRcIxqiOVJw/) 下载。验证数据集可以从 [此处](https://drive.google.com/file/d/11vfqV-lqousZTuAit1Qkqghiv_taY0KZ/) 下载。
 
-测试数据集需要从 mat 文件中导出，为此，我们提供了一个脚本：
+验证数据集需要从 mat 文件中导出，为此，我们提供了一个脚本：
 
 ```shell
-python tools/dataset_converters/sidd/preprocess_sidd_test_dataset.py --data-root ./data/SIDD/test --out-dir ./data/SIDD/test
+python tools/dataset_converters/sidd/preprocess_sidd_test_dataset.py --data-root ./data/SIDD/val --out-dir ./data/SIDD/val
 ```
 
 文件目录结构应如下所示：
@@ -32,9 +32,8 @@ mmagic
 |   |   |   ├── gt
 |   |   |   ├── noisy
 |   |   ├── val
-|   |   |   ├── input_crops
-|   |   |   ├── target_crops
-|   |   ├── test
 |   |   |   ├── gt
 |   |   |   ├── noisy
+|   |   |   ├── ValidationNoisyBlocksSrgb.mat
+|   |   |   ├── ValidationGtBlocksSrgb.mat
 ```
diff --git a/tools/dataset_converters/sidd/preprocess_sidd_test_dataset.py b/tools/dataset_converters/sidd/preprocess_sidd_test_dataset.py
@@ -39,7 +39,7 @@ def export_images(args):
             noisy_patch = torch.clamp(noisy_patch, 0,
                                       1).detach().permute(0, 2, 3,
                                                           1).squeeze(0)
-            save_path = osp.join(noisy_dir, '%04d_%02d.png' % (i + 1, k + 1))
+            save_path = osp.join(noisy_dir, f'val_{str(i*32+k)}_NOISY.png')
             cv2.imwrite(
                 save_path,
                 cv2.cvtColor(img_as_ubyte(noisy_patch), cv2.COLOR_RGB2BGR))
@@ -52,7 +52,7 @@ def export_images(args):
                 gt_images[i, k, :, :, :]).unsqueeze(0).permute(0, 3, 1, 2)
             gt_patch = torch.clamp(gt_patch, 0,
                                    1).detach().permute(0, 2, 3, 1).squeeze(0)
-            save_path = osp.join(gt_dir, '%04d_%02d.png' % (i + 1, k + 1))
+            save_path = osp.join(gt_dir, f'val_{str(i*32+k)}_GT.png')
             cv2.imwrite(
                 save_path,
                 cv2.cvtColor(img_as_ubyte(gt_patch), cv2.COLOR_RGB2BGR))