Update configs

10 files changed, 4 insertions, 45 deletions

diff --git a/training/conf/experiment/cnn_htr_char_lines.yaml b/training/conf/experiment/cnn_htr_char_lines.yaml
index 0d62a73..53f6d91 100644
--- a/training/conf/experiment/cnn_htr_char_lines.yaml
+++ b/training/conf/experiment/cnn_htr_char_lines.yaml
@@ -1,5 +1,3 @@
-# @package _global_
-
 defaults:
   - override /mapping: null
   - override /criterion: null
@@ -19,11 +17,10 @@ criterion:
   _target_: text_recognizer.criterions.label_smoothing.LabelSmoothingLoss
   smoothing: 0.1 
   ignore_index: *ignore_index
-  # _target_: torch.nn.CrossEntropyLoss
-  # ignore_index: *ignore_index
     
 mapping:
-  _target_: text_recognizer.data.emnist_mapping.EmnistMapping
+  mapping: &mapping
+    _target_: text_recognizer.data.emnist_mapping.EmnistMapping
 
 callbacks:
   stochastic_weight_averaging:
@@ -73,6 +70,7 @@ datamodule:
   augment: true
   pin_memory: true
   word_pieces: false
+  <<: *mapping
 
 network:
   _target_: text_recognizer.networks.conv_transformer.ConvTransformer
@@ -80,6 +78,7 @@ network:
   hidden_dim: &hidden_dim 128
   encoder_dim: 1280
   dropout_rate: 0.2
+  <<: *mapping
   num_classes: *num_classes
   pad_index: *ignore_index
   encoder:
diff --git a/training/conf/experiment/cnn_htr_wp_lines.yaml b/training/conf/experiment/cnn_htr_wp_lines.yaml
index 79075cd..f467b74 100644
--- a/training/conf/experiment/cnn_htr_wp_lines.yaml
+++ b/training/conf/experiment/cnn_htr_wp_lines.yaml
@@ -1,5 +1,3 @@
-# @package _global_
-
 defaults:
   - override /mapping: null
   - override /criterion: null
diff --git a/training/conf/experiment/cnn_transformer_paragraphs.yaml b/training/conf/experiment/cnn_transformer_paragraphs.yaml
index 8feb1bc..910d408 100644
--- a/training/conf/experiment/cnn_transformer_paragraphs.yaml
+++ b/training/conf/experiment/cnn_transformer_paragraphs.yaml
@@ -1,5 +1,3 @@
-# @package _global_
-
 defaults:
   - override /mapping: null
   - override /criterion: null
diff --git a/training/conf/experiment/cnn_transformer_paragraphs_wp.yaml b/training/conf/experiment/cnn_transformer_paragraphs_wp.yaml
index 1c9bba1..499a609 100644
--- a/training/conf/experiment/cnn_transformer_paragraphs_wp.yaml
+++ b/training/conf/experiment/cnn_transformer_paragraphs_wp.yaml
@@ -1,5 +1,3 @@
-# @package _global_
-
 defaults:
   - override /mapping: null
   - override /criterion: null
diff --git a/training/conf/experiment/vqgan.yaml b/training/conf/experiment/vqgan.yaml
index 572c320..98f3346 100644
--- a/training/conf/experiment/vqgan.yaml
+++ b/training/conf/experiment/vqgan.yaml
@@ -1,5 +1,3 @@
-# @package _global_
-
 defaults:
   - override /network: vqvae
   - override /criterion: null
diff --git a/training/conf/experiment/vqgan_htr_char.yaml b/training/conf/experiment/vqgan_htr_char.yaml
index 426524f..af3fa40 100644
--- a/training/conf/experiment/vqgan_htr_char.yaml
+++ b/training/conf/experiment/vqgan_htr_char.yaml
@@ -1,5 +1,3 @@
-# @package _global_
-
 defaults:
   - override /mapping: null
   - override /network: null
diff --git a/training/conf/experiment/vqgan_htr_char_iam_lines.yaml b/training/conf/experiment/vqgan_htr_char_iam_lines.yaml
index 9f4791f..27fdfda 100644
--- a/training/conf/experiment/vqgan_htr_char_iam_lines.yaml
+++ b/training/conf/experiment/vqgan_htr_char_iam_lines.yaml
@@ -1,5 +1,3 @@
-# @package _global_
-
 defaults:
   - override /mapping: null
   - override /criterion: null
diff --git a/training/conf/experiment/vqgan_iam_lines.yaml b/training/conf/experiment/vqgan_iam_lines.yaml
index 8bdf415..890948c 100644
--- a/training/conf/experiment/vqgan_iam_lines.yaml
+++ b/training/conf/experiment/vqgan_iam_lines.yaml
@@ -1,5 +1,3 @@
-# @package _global_
-
 defaults:
   - override /network: null
   - override /criterion: null
diff --git a/training/conf/experiment/vqvae.yaml b/training/conf/experiment/vqvae.yaml
index 6e42690..d069aef 100644
--- a/training/conf/experiment/vqvae.yaml
+++ b/training/conf/experiment/vqvae.yaml
@@ -1,5 +1,3 @@
-# @package _global_
-
 defaults:
   - override /network: vqvae
   - override /criterion: mse
diff --git a/training/conf/experiment/vqvae_pixelcnn.yaml b/training/conf/experiment/vqvae_pixelcnn.yaml
deleted file mode 100644
index 4fae782..0000000
--- a/training/conf/experiment/vqvae_pixelcnn.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# @package _global_
-
-defaults:
-  - override /network: vqvae_pixelcnn
-  - override /criterion: mae
-  - override /model: lit_vqvae
-  - override /callbacks: wandb_vae
-  - override /lr_schedulers: 
-      - cosine_annealing
-
-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
-