From 441b7484348953deb7c94150675d54583ef5a81a Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Tue, 10 Aug 2021 23:25:13 +0200
Subject: Update to config and logging in VQGAN

---
 training/conf/experiment/vqgan.yaml | 17 +++++++++++++++--
 training/conf/experiment/vqvae.yaml |  8 --------
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'training/conf/experiment')

diff --git a/training/conf/experiment/vqgan.yaml b/training/conf/experiment/vqgan.yaml
index 570e7f9..554ec9e 100644
--- a/training/conf/experiment/vqgan.yaml
+++ b/training/conf/experiment/vqgan.yaml
@@ -8,6 +8,19 @@ defaults:
   - override /optimizers: null
   - override /lr_schedulers: null
 
+criterion:
+  _target_: text_recognizer.criterions.vqgan_loss.VQGANLoss
+  reconstruction_loss:
+    _target_: torch.nn.L1Loss
+    reduction: mean
+  discriminator:
+    _target_: text_recognizer.criterions.n_layer_discriminator.NLayerDiscriminator
+    in_channels: 1
+    num_channels: 32
+    num_layers: 3
+  vq_loss_weight: 0.8
+  discriminator_weight: 0.6
+
 datamodule:
   batch_size: 8
 
@@ -33,7 +46,7 @@ lr_schedulers:
 optimizers:
   generator:
     _target_: madgrad.MADGRAD
-    lr: 2.0e-5
+    lr: 4.5e-6
     momentum: 0.5
     weight_decay: 0
     eps: 1.0e-6
@@ -42,7 +55,7 @@ optimizers:
 
   discriminator:
     _target_: madgrad.MADGRAD
-    lr: 2.0e-5
+    lr: 4.5e-6
     momentum: 0.5
     weight_decay: 0
     eps: 1.0e-6
diff --git a/training/conf/experiment/vqvae.yaml b/training/conf/experiment/vqvae.yaml
index 397a039..8dbb257 100644
--- a/training/conf/experiment/vqvae.yaml
+++ b/training/conf/experiment/vqvae.yaml
@@ -10,16 +10,8 @@ defaults:
 
 trainer:
   max_epochs: 256
-  # gradient_clip_val: 0.25
 
 datamodule:
   batch_size: 8
 
-# lr_scheduler:
-  # epochs: 64
-  # steps_per_epoch: 1245
-
-# optimizer:
-  # lr: 1.0e-3
-
 summary: null
-- 
cgit v1.2.3-70-g09d2