From bd4d478572a3d86b2c0a832b99f1825f00d5e928 Mon Sep 17 00:00:00 2001
From: James Betker <jbetker@gmail.com>
Date: Fri, 15 May 2020 07:41:18 -0600
Subject: [PATCH] config changes

---
 .../options/train/train_vix_corrupt_tiled.yml |  4 +--
 codes/options/train/train_vix_resgenv2.yml    | 27 ++++++++++++++-----
 codes/train.py                                |  4 +--
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/codes/options/train/train_vix_corrupt_tiled.yml b/codes/options/train/train_vix_corrupt_tiled.yml
index 6938bdb4..3f331b5c 100644
--- a/codes/options/train/train_vix_corrupt_tiled.yml
+++ b/codes/options/train/train_vix_corrupt_tiled.yml
@@ -48,7 +48,7 @@ network_D:
 path:
   pretrain_model_G: ~
   pretrain_model_D: ~
-  resume_state: ../experiments/train_vix_corrupt_tiled/training_state/5000.state
+  resume_state: ../experiments/train_vix_corrupt_tiled/training_state/16000.state
   strict_load: true
 
 #### training settings: learning rate scheme, loss
@@ -74,7 +74,7 @@ train:
   pixel_criterion: l2
   pixel_weight: !!float 1e-2
   feature_criterion: l1
-  feature_weight: .9
+  feature_weight: .6
   feature_weight_decay: .98
   feature_weight_decay_steps: 1000
   feature_weight_minimum: .5
diff --git a/codes/options/train/train_vix_resgenv2.yml b/codes/options/train/train_vix_resgenv2.yml
index 2a6f41f0..bd06a516 100644
--- a/codes/options/train/train_vix_resgenv2.yml
+++ b/codes/options/train/train_vix_resgenv2.yml
@@ -12,13 +12,15 @@ datasets:
   train:
     name: vixcloseup
     mode: LQGT
-    dataroot_GT: E:\4k6k\datasets\vixen\4k_closeup\hr
-    dataroot_LQ: E:\4k6k\datasets\vixen\4k_closeup\lr_corrupted
+    dataroot_GT: E:\4k6k\datasets\vixen\vix_tiled\hr
+    dataroot_LQ: E:\4k6k\datasets\vixen\vix_tiled\lr
+    use_flip: true
+    use_rot: true
     doCrop: false
     use_shuffle: true
-    n_workers: 0  # per GPU
+    n_workers: 4  # per GPU
     batch_size: 8
-    target_size: 192
+    target_size: 256
     color: RGB
   val:
     name: adrianna_val
@@ -32,7 +34,7 @@ network_G:
   nf: 256
   nb_denoiser: 20
   nb_upsampler: 10
-  upscale_applications: 0
+  upscale_applications: 2
 network_D:
   which_model_D: discriminator_resnet_passthrough
   nf: 64
@@ -47,9 +49,9 @@ network_C:
 
 #### path
 path:
+  pretrained_corruptors_dir: ../experiments/pretrained_corruptors
   #pretrain_model_G: ../experiments/pretrained_resnet_G.pth
   #pretrain_model_D: ~
-  pretrain_model_C: ../experiments/pretrained_corruptors/resgen_xl_noise_19000.pth
   strict_load: true
   resume_state: ~
 
@@ -71,18 +73,29 @@ train:
   lr_gamma: 0.5
   mega_batch_factor: 2
 
+  swapout_G_freq: 113
+  swapout_D_freq: 223
+  swapout_duration: 40
+
+  corruptor_swapout_steps: 1000
+
   pixel_criterion: l1
   pixel_weight: .01
+
   feature_criterion: l1
   feature_weight: 1
   feature_weight_decay: 1
   feature_weight_decay_steps: 500
   feature_weight_minimum: 1
-  gan_type: gan  # gan | ragan
+
+  gan_type: ragan  # gan | ragan
   gan_weight: .01
 
   D_update_ratio: 1
   D_init_iters: 0
+  D_noise_theta_init: .005  # Just fixed noise.
+  D_noise_final_it: 1
+  D_noise_theta_floor: .005
 
   manual_seed: 10
   val_freq: !!float 5e2
diff --git a/codes/train.py b/codes/train.py
index 7924fb55..2bcfd77d 100644
--- a/codes/train.py
+++ b/codes/train.py
@@ -30,7 +30,7 @@ def init_dist(backend='nccl', **kwargs):
 def main():
     #### options
     parser = argparse.ArgumentParser()
-    parser.add_argument('-opt', type=str, help='Path to option YAML file.', default='options/train/train_vix_corrupt_tiled.yml')
+    parser.add_argument('-opt', type=str, help='Path to option YAML file.', default='options/train/train_vix_resgenv2.yml')
     parser.add_argument('--launcher', choices=['none', 'pytorch'], default='none',
                         help='job launcher')
     parser.add_argument('--local_rank', type=int, default=0)
@@ -147,7 +147,7 @@ def main():
         current_step = resume_state['iter']
         model.resume_training(resume_state)  # handle optimizers and schedulers
     else:
-        current_step = -1
+        current_step = 0
         start_epoch = 0
 
     #### training