modify gmodx, update README

f715b2c2 · Rayyyyy · 42d70a9f · f715b2c2 · f715b2c2 · f715b2c2
Commit f715b2c2 authored Feb 05, 2024 by Rayyyyy
12 changed files
--- a/options/train/train_HAT-S_SRx3_from_scratch.yml
+++ b/options/train/train_HAT-S_SRx3_from_scratch.yml
@@ -30,7 +30,7 @@ datasets:
  val:
    name: Set5
    type: PairedImageDataset
-    dataroot_gt: datasets/Set5/GTmod3
+    dataroot_gt: datasets/Set5/GTmod12
    dataroot_lq: datasets/Set5/LRbicx3
    io_backend:
      type: disk
@@ -38,18 +38,18 @@ 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

-  val_3:
-    name: Urban100
-    type: PairedImageDataset
-    dataroot_gt: datasets/urban100/GTmod3
-    dataroot_lq: datasets/urban100/LRbicx3
-    io_backend:
-      type: disk
+  # val_3:
+  #   name: Urban100
+  #   type: PairedImageDataset
+  #   dataroot_gt: datasets/urban100/GTmod3
+  #   dataroot_lq: datasets/urban100/LRbicx3
+  #   io_backend:
+  #     type: disk


 # network structures

--- a/options/train/train_HAT-S_SRx4_finetune_from_SRx2.yml
+++ b/options/train/train_HAT-S_SRx4_finetune_from_SRx2.yml
@@ -30,7 +30,7 @@ datasets:
  val:
    name: Set5
    type: PairedImageDataset
-    dataroot_gt: datasets/Set5/GTmod4
+    dataroot_gt: datasets/Set5/GTmod12
    dataroot_lq: datasets/Set5/LRbicx4
    io_backend:
      type: disk
@@ -38,18 +38,18 @@ 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

-  val_3:
-    name: Urban100
-    type: PairedImageDataset
-    dataroot_gt: datasets/urban100/GTmod4
-    dataroot_lq: datasets/urban100/LRbicx4
-    io_backend:
-      type: disk
+  # val_3:
+  #   name: Urban100
+  #   type: PairedImageDataset
+  #   dataroot_gt: datasets/urban100/GTmod4
+  #   dataroot_lq: datasets/urban100/LRbicx4
+  #   io_backend:
+  #     type: disk


 # network structures

--- a/options/train/train_HAT_SRx2_ImageNet_from_scratch.yml
+++ b/options/train/train_HAT_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

--- a/options/train/train_HAT_SRx2_finetune_from_ImageNet_pretrain.yml
+++ b/options/train/train_HAT_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

--- a/options/train/train_HAT_SRx2_from_scratch.yml
+++ b/options/train/train_HAT_SRx2_from_scratch.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

--- a/options/train/train_HAT_SRx3_ImageNet_from_scratch.yml
+++ b/options/train/train_HAT_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

--- a/options/train/train_HAT_SRx3_finetune_from_ImageNet_pretrain.yml
+++ b/options/train/train_HAT_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

--- a/options/train/train_HAT_SRx3_from_scratch.yml
+++ b/options/train/train_HAT_SRx3_from_scratch.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

--- a/options/train/train_HAT_SRx4_ImageNet_from_scratch.yml
+++ b/options/train/train_HAT_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

--- a/options/train/train_HAT_SRx4_finetune_from_ImageNet_pretrain.yml
+++ b/options/train/train_HAT_SRx4_finetune_from_ImageNet_pretrain.yml
@@ -30,7 +30,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
@@ -38,7 +38,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

--- a/options/train/train_HAT_SRx4_finetune_from_SRx2.yml
+++ b/options/train/train_HAT_SRx4_finetune_from_SRx2.yml
@@ -30,7 +30,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
@@ -38,7 +38,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

--- a/run.sh
+++ b/run.sh
@@ -3,21 +3,19 @@ echo "START TIME: $(date)"
 hostfile=./hostfile

 np=$(cat $hostfile|sort|uniq |wc -l)
-np=$(($np*8))
+np=$(($np*4))

 echo $np

 nodename=$(cat $hostfile |sed -n "1p")
-dist_url=`echo $nodename | awk '{print $1}'`
+export dist_url=`echo $nodename | awk '{print $1}'`
 which mpirun

 # 添加pythonlib环境, 用户需修改为自己的环境变量地址
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/path/of/conda/envs/{env_name}/lib
 export PYTHON=python3
-export NPROC_PER_NODE=4

-# 使用mpirun 进行多卡训练，分别对单张卡进行单线程启动
 # -np 显卡数量
 # -x 将变量传递到single_process.sh脚本中
-mpirun -np $np --allow-run-as-root --hostfile hostfile --bind-to none -x dist_url -x PYTHON -x NPROC_PER_NODE `pwd`/single_process.sh
+mpirun -np $np --allow-run-as-root --hostfile hostfile --bind-to none -x dist_url -x PYTHON `pwd`/single_process.sh
 echo "END TIME: $(date)"