to be continued...

jhauret · May 29, 2024 · db81952 · db81952
1 parent 3ac0d49
commit db81952
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/configs/lightning_datamodule/bwe.yaml b/configs/lightning_datamodule/bwe.yaml
@@ -9,6 +9,9 @@ streaming: False
 batch_size: 32
 num_workers: 16
 
+# This is not used in the actual classes, but just for the description and hydra run directory
+id: ${lightning_datamodule.sensor}
+
 defaults:
   - data_augmentation: light
   - _self_ # priority is given to bwe.yaml for overrides
diff --git a/configs/lightning_datamodule/spkv.yaml b/configs/lightning_datamodule/spkv.yaml
@@ -9,3 +9,6 @@ sensor_b: "body_conducted.forehead.miniature_accelerometer"
 streaming: False
 batch_size: 1
 num_workers: 16
+
+# This is not used in the actual classes, but just for the description and hydra run directory
+id: ${sensor_a}_${sensor_b}_${dataset_name}_${pairs}
diff --git a/configs/lightning_datamodule/stp.yaml b/configs/lightning_datamodule/stp.yaml
@@ -19,3 +19,6 @@ feature_extractor:
 tokenizer:
   _target_: transformers.Wav2Vec2CTCTokenizer.from_pretrained
   pretrained_model_name_or_path: "Cnam-LMSSC/vibravox-phonemes-tokenizer"
+
+# This is not used in the actual classes, but just for the description and hydra run directory
+id: ${lightning_datamodule.sensor}
diff --git a/configs/lightning_module/eben.yaml b/configs/lightning_module/eben.yaml
@@ -4,7 +4,7 @@ sample_rate: ${sample_rate}
 dynamic_loss_balancing: "ema"
 beta_ema: 0.9
 update_discriminator_ratio: 1
-description: ${description}
+description: "${description} || EBEN(M=4,P=${generator.p},Q=${discriminator.q})"
 push_to_hub_after_testing: False
 
 defaults:

diff --git a/configs/run.yaml b/configs/run.yaml
@@ -3,22 +3,24 @@
 # Top-level variables available in all config files
 sample_rate: 16000
 #description: "${lightning_datamodule.sensor} || EBEN(M=4,P=${lightning_module.generator.p},Q=${lightning_module.discriminator.q}) with min_channels_dis=${lightning_module.discriminator.min_channels}, (data_aug light/lb-beta-ema=0.9/update-ratio=1)"
-description: "${lightning_datamodule.sensor_a} / ${lightning_datamodule.sensor_b} || ECAPA2  || ${lightning_datamodule.pairs} "
+#description: "${lightning_datamodule.sensor_a} / ${lightning_datamodule.sensor_b} || ECAPA2  || ${lightning_datamodule.pairs} "
+description: "${hydra:runtime.choices.lightning_datamodule}: ${lightning_datamodule.id}  || ${hydra:runtime.choices.lightning_datamodule}: ${lightning_datamodule.id}"
 
 # Hydra configuration
 version_base: "1.3"
 hydra:
   job:
     chdir: True # change working directory to the job directory
   run:
+    dir: "outputs/run/${hydra:runtime.choices.lightning_datamodule}/${lightning_datamodule.id}/${now:%Y-%m-%d_%H-%M-%S}"
     #dir: "outputs/run/${hydra:runtime.choices.lightning_datamodule}/${lightning_datamodule.sensor}/${now:%Y-%m-%d_%H-%M-%S}_p${lightning_module.generator.p}_q${lightning_module.discriminator.q}_chan${lightning_module.discriminator.min_channels}" # directory for the run
-    dir: "outputs/run/${hydra:runtime.choices.lightning_datamodule}/${lightning_datamodule.pairs}/${lightning_datamodule.sensor_a}/${lightning_datamodule.sensor_b}/${now:%Y-%m-%d_%H-%M-%S}"
+    #dir: "outputs/run/${hydra:runtime.choices.lightning_datamodule}/${lightning_datamodule.pairs}/${lightning_datamodule.sensor_a}/${lightning_datamodule.sensor_b}/${now:%Y-%m-%d_%H-%M-%S}"
 
 
 # Composing configs
 defaults:
-  - lightning_datamodule: bwe # NEEDS TO BE OVERRIDDEN, will also determinate the metrics and the run directory
-  - lightning_module: eben # NEEDS TO BE OVERRIDDEN
+  - lightning_datamodule: null # NEEDS TO BE OVERRIDDEN, will also determinate the metrics and the run directory
+  - lightning_module: null # NEEDS TO BE OVERRIDDEN
   - trainer: ddp
   - callbacks: # Dict of callbacks
       - bwe_checkpoint