modify gmodx, update README

README.md

@@ -115,6 +115,8 @@ python scripts/data_preparation/generate_meta_info.py
 ```
 
 ## 训练
+预训练模型下载地址：[Google Drive](https://drive.google.com/drive/folders/1HpmReFfoUqUbnAOQ7rvOeNU3uf_m69w0?usp=sharing) or [百度网盘](https://pan.baidu.com/s/1u2r4Lc2_EEeQqra2-w85Xg) (access code: qyrl)。
+
 训练日志及weights保存在./experiments文件中
 
 ### 单机多卡
@@ -124,20 +126,21 @@ bash train.sh
 ```
 
 ### 多机多卡
+使用多节点的情况下，需要将使用节点写入hostfile文件, 多节点每个节点一行, 例如: c1xxxxxx slots=4。
+
+1. run_train_multi.sh中18行所需虚拟环境变量地址;
 
-1. 修改run.sh中18行所需虚拟环境变量地址;
 2. 修改single_process.sh中22行所需训练的yaml文件地址，如与默认一致，可不修改。
 
 执行命令如下, 训练日志保存在logs文件夹下
 ```bash
-bash run.sh
+bash run_train_multi.sh
 ```
 
 ## 推理
 预训练模型下载地址：[Google Drive](https://drive.google.com/drive/folders/1HpmReFfoUqUbnAOQ7rvOeNU3uf_m69w0?usp=sharing) or [百度网盘](https://pan.baidu.com/s/1u2r4Lc2_EEeQqra2-w85Xg) (access code: qyrl)。
-测试结果将保存到 ./results 路径下。
 
-options/test/HAT_SRx4_ImageNet-LR.yml 适用于不适用ground truth image的推理过程。
+测试结果将保存到 ./results 路径下。options/test/HAT_SRx4_ImageNet-LR.yml 适用于不使用 ground truth image 的推理过程。
 ```bash
 bash val.sh
 ```

options/test/HAT-L_SRx2_ImageNet-pretrain.yml

@@ -8,7 +8,7 @@ datasets:
   test_1:  # the 1st test dataset
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod2
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx2
     io_backend:
       type: disk
@@ -16,7 +16,7 @@ datasets:
   # test_2:  # the 2nd test dataset
   #   name: Set14
   #   type: PairedImageDataset
-  #   dataroot_gt: ./datasets/Set14/GTmod2
+  #   dataroot_gt: ./datasets/Set14/GTmod12
   #   dataroot_lq: ./datasets/Set14/LRbicx2
   #   io_backend:
   #     type: disk

options/test/HAT-L_SRx3_ImageNet-pretrain.yml

@@ -8,7 +8,7 @@ datasets:
   test_1:  # the 1st test dataset
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod3
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx3
     io_backend:
       type: disk
@@ -16,7 +16,7 @@ datasets:
   # test_2:  # the 2nd test dataset
   #   name: Set14
   #   type: PairedImageDataset
-  #   dataroot_gt: ./datasets/Set14/GTmod3
+  #   dataroot_gt: ./datasets/Set14/GTmod12
   #   dataroot_lq: ./datasets/Set14/LRbicx3
   #   io_backend:
   #     type: disk

options/test/HAT-L_SRx4_ImageNet-pretrain.yml

@@ -8,7 +8,7 @@ datasets:
   test_1:  # the 1st test dataset
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod4
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx4
     io_backend:
       type: disk
@@ -16,7 +16,7 @@ datasets:
   # test_2:  # the 2nd test dataset
   #   name: Set14
   #   type: PairedImageDataset
-  #   dataroot_gt: ./datasets/Set14/GTmod4
+  #   dataroot_gt: ./datasets/Set14/GTmod12
   #   dataroot_lq: ./datasets/Set14/LRbicx4
   #   io_backend:
   #     type: disk

options/test/HAT-S_SRx2.yml

@@ -8,7 +8,7 @@ datasets:
   test_1:  # the 1st test dataset
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod2
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx2
     io_backend:
       type: disk
@@ -16,34 +16,34 @@ datasets:
   test_2:  # the 2nd test dataset
     name: Set14
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set14/GTmod2
+    dataroot_gt: ./datasets/Set14/GTmod12
     dataroot_lq: ./datasets/Set14/LRbicx2
     io_backend:
       type: disk
 
-  test_3:
-    name: Urban100
-    type: PairedImageDataset
-    dataroot_gt: ./datasets/urban100/GTmod2
-    dataroot_lq: ./datasets/urban100/LRbicx2
-    io_backend:
-      type: disk
+  # test_3:
+  #   name: Urban100
+  #   type: PairedImageDataset
+  #   dataroot_gt: ./datasets/urban100/GTmod2
+  #   dataroot_lq: ./datasets/urban100/LRbicx2
+  #   io_backend:
+  #     type: disk
 
-  test_4:
-     name: BSDS100
-     type: PairedImageDataset
-     dataroot_gt: ./datasets/BSDS100/GTmod2
-     dataroot_lq: ./datasets/BSDS100/LRbicx2
-     io_backend:
-       type: disk
+  # test_4:
+  #    name: BSDS100
+  #    type: PairedImageDataset
+  #    dataroot_gt: ./datasets/BSDS100/GTmod2
+  #    dataroot_lq: ./datasets/BSDS100/LRbicx2
+  #    io_backend:
+  #      type: disk
 
-  test_5:
-      name: Manga109
-      type: PairedImageDataset
-      dataroot_gt: ./datasets/manga109/GTmod2
-      dataroot_lq: ./datasets/manga109/LRbicx2
-      io_backend:
-        type: disk
+  # test_5:
+  #     name: Manga109
+  #     type: PairedImageDataset
+  #     dataroot_gt: ./datasets/manga109/GTmod2
+  #     dataroot_lq: ./datasets/manga109/LRbicx2
+  #     io_backend:
+  #       type: disk
 
 # network structures
 network_g:

options/test/HAT-S_SRx3.yml

@@ -8,7 +8,7 @@ datasets:
   test_1:  # the 1st test dataset
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod3
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx3
     io_backend:
       type: disk
@@ -16,34 +16,34 @@ datasets:
   test_2:  # the 2nd test dataset
     name: Set14
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set14/GTmod3
+    dataroot_gt: ./datasets/Set14/GTmod12
     dataroot_lq: ./datasets/Set14/LRbicx3
     io_backend:
       type: disk
 
-  test_3:
-    name: Urban100
-    type: PairedImageDataset
-    dataroot_gt: ./datasets/urban100/GTmod3
-    dataroot_lq: ./datasets/urban100/LRbicx3
-    io_backend:
-      type: disk
+  # test_3:
+  #   name: Urban100
+  #   type: PairedImageDataset
+  #   dataroot_gt: ./datasets/urban100/GTmod3
+  #   dataroot_lq: ./datasets/urban100/LRbicx3
+  #   io_backend:
+  #     type: disk
 
-  test_4:
-     name: BSDS100
-     type: PairedImageDataset
-     dataroot_gt: ./datasets/BSDS100/GTmod3
-     dataroot_lq: ./datasets/BSDS100/LRbicx3
-     io_backend:
-       type: disk
+  # test_4:
+  #    name: BSDS100
+  #    type: PairedImageDataset
+  #    dataroot_gt: ./datasets/BSDS100/GTmod3
+  #    dataroot_lq: ./datasets/BSDS100/LRbicx3
+  #    io_backend:
+  #      type: disk
 
-  test_5:
-      name: Manga109
-      type: PairedImageDataset
-      dataroot_gt: ./datasets/manga109/GTmod3
-      dataroot_lq: ./datasets/manga109/LRbicx3
-      io_backend:
-        type: disk
+  # test_5:
+  #     name: Manga109
+  #     type: PairedImageDataset
+  #     dataroot_gt: ./datasets/manga109/GTmod3
+  #     dataroot_lq: ./datasets/manga109/LRbicx3
+  #     io_backend:
+  #       type: disk
 
 # network structures
 network_g:

options/test/HAT-S_SRx4.yml

@@ -8,7 +8,7 @@ datasets:
   test_1:  # the 1st test dataset
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod4
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx4
     io_backend:
       type: disk
@@ -16,34 +16,34 @@ datasets:
   test_2:  # the 2nd test dataset
     name: Set14
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set14/GTmod4
+    dataroot_gt: ./datasets/Set14/GTmod12
     dataroot_lq: ./datasets/Set14/LRbicx4
     io_backend:
       type: disk
 
-  test_3:
-    name: Urban100
-    type: PairedImageDataset
-    dataroot_gt: ./datasets/urban100/GTmod4
-    dataroot_lq: ./datasets/urban100/LRbicx4
-    io_backend:
-      type: disk
+  # test_3:
+  #   name: Urban100
+  #   type: PairedImageDataset
+  #   dataroot_gt: ./datasets/urban100/GTmod4
+  #   dataroot_lq: ./datasets/urban100/LRbicx4
+  #   io_backend:
+  #     type: disk
 
-  test_4:
-     name: BSDS100
-     type: PairedImageDataset
-     dataroot_gt: ./datasets/BSDS100/GTmod4
-     dataroot_lq: ./datasets/BSDS100/LRbicx4
-     io_backend:
-       type: disk
+  # test_4:
+  #    name: BSDS100
+  #    type: PairedImageDataset
+  #    dataroot_gt: ./datasets/BSDS100/GTmod4
+  #    dataroot_lq: ./datasets/BSDS100/LRbicx4
+  #    io_backend:
+  #      type: disk
 
-  test_5:
-      name: Manga109
-      type: PairedImageDataset
-      dataroot_gt: ./datasets/manga109/GTmod4
-      dataroot_lq: ./datasets/manga109/LRbicx4
-      io_backend:
-        type: disk
+  # test_5:
+  #     name: Manga109
+  #     type: PairedImageDataset
+  #     dataroot_gt: ./datasets/manga109/GTmod4
+  #     dataroot_lq: ./datasets/manga109/LRbicx4
+  #     io_backend:
+  #       type: disk
 
 # network structures
 network_g:

options/test/HAT_SRx2.yml

@@ -8,7 +8,7 @@ datasets:
   test_1:  # the 1st test dataset
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod2
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx2
     io_backend:
       type: disk
@@ -16,7 +16,7 @@ datasets:
   # test_2:  # the 2nd test dataset
   #   name: Set14
   #   type: PairedImageDataset
-  #   dataroot_gt: ./datasets/Set14/GTmod2
+  #   dataroot_gt: ./datasets/Set14/GTmod12
   #   dataroot_lq: ./datasets/Set14/LRbicx2
   #   io_backend:
   #     type: disk

options/test/HAT_SRx2_ImageNet-pretrain.yml

@@ -8,7 +8,7 @@ datasets:
   test_1:  # the 1st test dataset
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod2
+    dataroot_gt: ./datasets/Set5/GTmod12a
     dataroot_lq: ./datasets/Set5/LRbicx2
     io_backend:
       type: disk
@@ -16,7 +16,7 @@ datasets:
   # test_2:  # the 2nd test dataset
   #   name: Set14
   #   type: PairedImageDataset
-  #   dataroot_gt: ./datasets/Set14/GTmod2
+  #   dataroot_gt: ./datasets/Set14/GTmod12
   #   dataroot_lq: ./datasets/Set14/LRbicx2
   #   io_backend:
   #     type: disk

options/test/HAT_SRx3.yml

@@ -8,7 +8,7 @@ datasets:
   test_1:  # the 1st test dataset
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod3
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx3
     io_backend:
       type: disk
@@ -16,7 +16,7 @@ datasets:
   # test_2:  # the 2nd test dataset
   #   name: Set14
   #   type: PairedImageDataset
-  #   dataroot_gt: ./datasets/Set14/GTmod3
+  #   dataroot_gt: ./datasets/Set14/GTmod12
   #   dataroot_lq: ./datasets/Set14/LRbicx3
   #   io_backend:
   #     type: disk

options/test/HAT_SRx3_ImageNet-pretrain.yml

@@ -8,7 +8,7 @@ datasets:
   test_1:  # the 1st test dataset
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod3
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx3
     io_backend:
       type: disk
@@ -16,7 +16,7 @@ datasets:
   # test_2:  # the 2nd test dataset
   #   name: Set14
   #   type: PairedImageDataset
-  #   dataroot_gt: ./datasets/Set14/GTmod3
+  #   dataroot_gt: ./datasets/Set14/GTmod12
   #   dataroot_lq: ./datasets/Set14/LRbicx3
   #   io_backend:
   #     type: disk

options/test/HAT_SRx4.yml

@@ -8,7 +8,7 @@ datasets:
   test_1:  # the 1st test dataset
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod4
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx4
     io_backend:
       type: disk
@@ -16,7 +16,7 @@ datasets:
   # test_2:  # the 2nd test dataset
   #   name: Set14
   #   type: PairedImageDataset
-  #   dataroot_gt: ./datasets/Set14/GTmod4
+  #   dataroot_gt: ./datasets/Set14/GTmod12
   #   dataroot_lq: ./datasets/Set14/LRbicx4
   #   io_backend:
   #     type: disk

options/test/HAT_tile_example.yml

@@ -12,27 +12,27 @@ datasets:
   test_1:  # the 1st test dataset
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod4
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx4
     io_backend:
       type: disk
 
-  # test_2:  # the 2nd test dataset
-  #   name: Set14
-  #   type: PairedImageDataset
-  #   dataroot_gt: ./datasets/Set14/GTmod4
-  #   dataroot_lq: ./datasets/Set14/LRbicx4
-  #   io_backend:
-  #     type: disk
-
-  test_3:
-    name: Urban100
+  test_2:  # the 2nd test dataset
+    name: Set14
     type: PairedImageDataset
-    dataroot_gt: ./datasets/urban100/GTmod4
-    dataroot_lq: ./datasets/urban100/LRbicx4
+    dataroot_gt: ./datasets/Set14/GTmod12
+    dataroot_lq: ./datasets/Set14/LRbicx4
     io_backend:
       type: disk
 
+  # test_3:
+  #   name: Urban100
+  #   type: PairedImageDataset
+  #   dataroot_gt: ./datasets/urban100/GTmod12
+  #   dataroot_lq: ./datasets/urban100/LRbicx4
+  #   io_backend:
+  #     type: disk
+
   # test_4:
   #    name: BSDS100
   #    type: PairedImageDataset

options/train/train_HAT-L_SRx2_ImageNet_from_scratch.yml

@@ -29,7 +29,7 @@ datasets:
   val_1:
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod2
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx2
     io_backend:
       type: disk
@@ -37,7 +37,7 @@ datasets:
   val_2:
     name: Set14
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set14/GTmod2
+    dataroot_gt: ./datasets/Set14/GTmod12
     dataroot_lq: ./datasets/Set14/LRbicx2
     io_backend:
       type: disk
@@ -45,7 +45,7 @@ datasets:
   # val_3:
   #   name: Urban100
   #   type: PairedImageDataset
-  #   dataroot_gt: ./datasets/urban100/GTmod2
+  #   dataroot_gt: ./datasets/urban100/GTmod12
   #   dataroot_lq: ./datasets/urban100/LRbicx2
   #   io_backend:
   #     type: disk

options/train/train_HAT-L_SRx2_finetune_from_ImageNet_pretrain.yml

@@ -30,7 +30,7 @@ datasets:
   val_1:
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod2
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx2
     io_backend:
       type: disk
@@ -38,7 +38,7 @@ datasets:
   val_2:
     name: Set14
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set14/GTmod2
+    dataroot_gt: ./datasets/Set14/GTmod12
     dataroot_lq: ./datasets/Set14/LRbicx2
     io_backend:
       type: disk
@@ -46,7 +46,7 @@ datasets:
   # val_3:
   #   name: Urban100
   #   type: PairedImageDataset
-  #   dataroot_gt: ./datasets/urban100/GTmod2
+  #   dataroot_gt: ./datasets/urban100/GTmod12
   #   dataroot_lq: ./datasets/urban100/LRbicx2
   #   io_backend:
   #     type: disk

options/train/train_HAT-L_SRx3_ImageNet_from_scratch.yml

@@ -29,7 +29,7 @@ datasets:
   val_1:
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod3
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx3
     io_backend:
       type: disk
@@ -37,7 +37,7 @@ datasets:
   val_2:
     name: Set14
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set14/GTmod3
+    dataroot_gt: ./datasets/Set14/GTmod12
     dataroot_lq: ./datasets/Set14/LRbicx3
     io_backend:
       type: disk

options/train/train_HAT-L_SRx3_finetune_from_ImageNet_pretrain.yml

@@ -30,7 +30,7 @@ datasets:
   val_1:
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod3
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx3
     io_backend:
       type: disk
@@ -38,7 +38,7 @@ datasets:
   val_2:
     name: Set14
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set14/GTmod3
+    dataroot_gt: ./datasets/Set14/GTmod12
     dataroot_lq: ./datasets/Set14/LRbicx3
     io_backend:
       type: disk

options/train/train_HAT-L_SRx4_ImageNet_from_scratch.yml

@@ -29,7 +29,7 @@ datasets:
   val_1:
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set5/GTmod4
+    dataroot_gt: ./datasets/Set5/GTmod12
     dataroot_lq: ./datasets/Set5/LRbicx4
     io_backend:
       type: disk
@@ -37,7 +37,7 @@ datasets:
   val_2:
     name: Set14
     type: PairedImageDataset
-    dataroot_gt: ./datasets/Set14/GTmod4
+    dataroot_gt: ./datasets/Set14/GTmod12
     dataroot_lq: ./datasets/Set14/LRbicx4
     io_backend:
       type: disk
@@ -45,7 +45,7 @@ datasets:
   # val_3:
   #   name: Urban100
   #   type: PairedImageDataset
-  #   dataroot_gt: ./datasets/urban100/GTmod4
+  #   dataroot_gt: ./datasets/urban100/GTmod12
   #   dataroot_lq: ./datasets/urban100/LRbicx4
   #   io_backend:
   #     type: disk

options/train/train_HAT-S_SRx2_from_scratch.yml

@@ -30,7 +30,7 @@ datasets:
   val:
     name: Set5
     type: PairedImageDataset
-    dataroot_gt: datasets/Set5/GTmod2
+    dataroot_gt: datasets/Set5/GTmod12
     dataroot_lq: datasets/Set5/LRbicx2
     io_backend:
       type: disk
@@ -38,18 +38,18 @@ datasets:
   val_2:
     name: Set14
     type: PairedImageDataset
-    dataroot_gt: datasets/Set14/GTmod2
+    dataroot_gt: datasets/Set14/GTmod12
     dataroot_lq: datasets/Set14/LRbicx2
     io_backend:
       type: disk
 
-  val_3:
-    name: Urban100
-    type: PairedImageDataset
-    dataroot_gt: datasets/urban100/GTmod2
-    dataroot_lq: datasets/urban100/LRbicx2
-    io_backend:
-      type: disk
+  # val_3:
+  #   name: Urban100
+  #   type: PairedImageDataset
+  #   dataroot_gt: datasets/urban100/GTmod2
+  #   dataroot_lq: datasets/urban100/LRbicx2
+  #   io_backend:
+  #     type: disk
 
 
 # network structures