Randomize train and val effects the same, drop audio that is too short

cfg/config.yaml

@@ -6,6 +6,7 @@ defaults:
 seed: 12345
 train: True
 sample_rate: 48000
+chunk_size: 262144 # 5.5s
 logs_dir: "./logs"
 log_every_n_steps: 1000
 render_files: True
@@ -28,27 +29,27 @@ datamodule:
     _target_: remfx.datasets.VocalSet
     sample_rate: ${sample_rate}
     root: ${oc.env:DATASET_ROOT}
-    chunk_size_in_sec: 6
+    chunk_size: ${chunk_size}
     mode: "train"
-    effect_types: ${effects.train_effects}
+    effect_types: ${effects}
     render_files: ${render_files}
     render_root: ${render_root}
   val_dataset:
     _target_: remfx.datasets.VocalSet
     sample_rate: ${sample_rate}
     root: ${oc.env:DATASET_ROOT}
-    chunk_size_in_sec: 6
+    chunk_size: ${chunk_size}
     mode: "val"
-    effect_types: ${effects.val_effects}
+    effect_types: ${effects}
     render_files: ${render_files}
     render_root: ${render_root}
   test_dataset:
     _target_: remfx.datasets.VocalSet
     sample_rate: ${sample_rate}
     root: ${oc.env:DATASET_ROOT}
-    chunk_size_in_sec: 6
+    chunk_size: ${chunk_size}
     mode: "test"
-    effect_types: ${effects.val_effects}
+    effect_types: ${effects}
     render_files: ${render_files}
     render_root: ${render_root}
 

cfg/effects/all.yaml

@@ -1,70 +1,31 @@
 # @package _global_
 effects:
-  train_effects:
-      Chorus:
-        _target_: remfx.effects.RandomPedalboardChorus
-        sample_rate: ${sample_rate}
-      Distortion:
-        _target_: remfx.effects.RandomPedalboardDistortion
-        sample_rate: ${sample_rate}
-        min_drive_db: -10
-        max_drive_db: 50
-      Compressor:
-        _target_: remfx.effects.RandomPedalboardCompressor
-        sample_rate: ${sample_rate}
-        min_threshold_db: -42.0
-        max_threshold_db: -20.0
-        min_ratio: 1.5
-        max_ratio: 6.0
-      Reverb:
-        _target_: remfx.effects.RandomPedalboardReverb
-        sample_rate: ${sample_rate}
-        min_room_size: 0.3
-        max_room_size: 1.0
-        min_damping: 0.2
-        max_damping: 1.0
-        min_wet_dry: 0.2
-        max_wet_dry: 0.8
-        min_width: 0.2
-        max_width: 1.0
-  val_effects:
-      Chorus:
-        _target_: remfx.effects.RandomPedalboardChorus
-        sample_rate: ${sample_rate}
-        min_rate_hz: 1.0
-        max_rate_hz: 1.0
-        min_depth: 0.3
-        max_depth: 0.3
-        min_centre_delay_ms: 7.5
-        max_centre_delay_ms: 7.5
-        min_feedback: 0.4
-        max_feedback: 0.4
-        min_mix: 0.4
-        max_mix: 0.4
-      Distortion:
-        _target_: remfx.effects.RandomPedalboardDistortion
-        sample_rate: ${sample_rate}
-        min_drive_db: 30
-        max_drive_db: 30
-      Compressor:
-        _target_: remfx.effects.RandomPedalboardCompressor
-        sample_rate: ${sample_rate}
-        min_threshold_db: -32
-        max_threshold_db: -32
-        min_ratio: 3.0
-        max_ratio: 3.0
-        min_attack_ms: 10.0
-        max_attack_ms: 10.0
-        min_release_ms: 40.0
-        max_release_ms: 40.0
-      Reverb:
-        _target_: remfx.effects.RandomPedalboardReverb
-        sample_rate: ${sample_rate}
-        min_room_size: 0.5
-        max_room_size: 0.5
-        min_damping: 0.5
-        max_damping: 0.5
-        min_wet_dry: 0.4
-        max_wet_dry: 0.4
-        min_width: 0.5
-        max_width: 0.5
+  Chorus:
+    _target_: remfx.effects.RandomPedalboardChorus
+    sample_rate: ${sample_rate}
+    min_depth: 0.2
+    min_mix: 0.3
+  Distortion:
+    _target_: remfx.effects.RandomPedalboardDistortion
+    sample_rate: ${sample_rate}
+    min_drive_db: 10
+    max_drive_db: 50
+  Compressor:
+    _target_: remfx.effects.RandomPedalboardCompressor
+    sample_rate: ${sample_rate}
+    min_threshold_db: -42.0
+    max_threshold_db: -20.0
+    min_ratio: 1.5
+    max_ratio: 6.0
+  Reverb:
+    _target_: remfx.effects.RandomPedalboardReverb
+    sample_rate: ${sample_rate}
+    min_room_size: 0.3
+    max_room_size: 1.0
+    min_damping: 0.2
+    max_damping: 1.0
+    min_wet_dry: 0.2
+    max_wet_dry: 0.8
+    min_width: 0.2
+    max_width: 1.0
+

cfg/effects/chorus.yaml

@@ -1,20 +1,7 @@
 # @package _global_
 effects:
-  train_effects:
-      Chorus:
-        _target_: remfx.effects.RandomPedalboardChorus
-        sample_rate: ${sample_rate}
-  val_effects:
-      Chorus:
-        _target_: remfx.effects.RandomPedalboardChorus
-        sample_rate: ${sample_rate}
-        min_rate_hz: 1.0
-        max_rate_hz: 1.0
-        min_depth: 0.3
-        max_depth: 0.3
-        min_centre_delay_ms: 7.5
-        max_centre_delay_ms: 7.5
-        min_feedback: 0.4
-        max_feedback: 0.4
-        min_mix: 0.4
-        max_mix: 0.4
+  Chorus:
+    _target_: remfx.effects.RandomPedalboardChorus
+    sample_rate: ${sample_rate}
+    min_depth: 0.2
+    min_mix: 0.3

cfg/effects/compression.yaml

@@ -1,22 +0,0 @@
-# @package _global_
-effects:
-  train_effects:
-      Compressor:
-        _target_: remfx.effects.RandomPedalboardCompressor
-        sample_rate: ${sample_rate}
-        min_threshold_db: -42.0
-        max_threshold_db: -20.0
-        min_ratio: 1.5
-        max_ratio: 6.0
-  val_effects:
-      Compressor:
-        _target_: remfx.effects.RandomPedalboardCompressor
-        sample_rate: ${sample_rate}
-        min_threshold_db: -32
-        max_threshold_db: -32
-        min_ratio: 3.0
-        max_ratio: 3.0
-        min_attack_ms: 10.0
-        max_attack_ms: 10.0
-        min_release_ms: 40.0
-        max_release_ms: 40.0

cfg/effects/compressor.yaml

@@ -0,0 +1,9 @@
+# @package _global_
+effects:
+  Compressor:
+    _target_: remfx.effects.RandomPedalboardCompressor
+    sample_rate: ${sample_rate}
+    min_threshold_db: -42.0
+    max_threshold_db: -20.0
+    min_ratio: 1.5
+    max_ratio: 6.0

cfg/effects/distortion.yaml

@@ -1,14 +1,7 @@
 # @package _global_
 effects:
-  train_effects:
-      Distortion:
-        _target_: remfx.effects.RandomPedalboardDistortion
-        sample_rate: ${sample_rate}
-        min_drive_db: -10
-        max_drive_db: 50
-  val_effects:
-      Distortion:
-        _target_: remfx.effects.RandomPedalboardDistortion
-        sample_rate: ${sample_rate}
-        min_drive_db: 30
-        max_drive_db: 30
+  Distortion:
+    _target_: remfx.effects.RandomPedalboardDistortion
+    sample_rate: ${sample_rate}
+    min_drive_db: 10
+    max_drive_db: 50

cfg/effects/reverb.yaml

@@ -1,26 +1,13 @@
 # @package _global_
 effects:
-  train_effects:
-      Reverb:
-        _target_: remfx.effects.RandomPedalboardReverb
-        sample_rate: ${sample_rate}
-        min_room_size: 0.3
-        max_room_size: 1.0
-        min_damping: 0.2
-        max_damping: 1.0
-        min_wet_dry: 0.2
-        max_wet_dry: 0.8
-        min_width: 0.2
-        max_width: 1.0
-  val_effects:
-      Reverb:
-        _target_: remfx.effects.RandomPedalboardReverb
-        sample_rate: ${sample_rate}
-        min_room_size: 0.5
-        max_room_size: 0.5
-        min_damping: 0.5
-        max_damping: 0.5
-        min_wet_dry: 0.4
-        max_wet_dry: 0.4
-        min_width: 0.5
-        max_width: 0.5
+  Reverb:
+    _target_: remfx.effects.RandomPedalboardReverb
+    sample_rate: ${sample_rate}
+    min_room_size: 0.3
+    max_room_size: 1.0
+    min_damping: 0.2
+    max_damping: 1.0
+    min_wet_dry: 0.2
+    max_wet_dry: 0.8
+    min_width: 0.2
+    max_width: 1.0

cfg/exp/{demucs_compression.yaml → demucs_compressor.yaml}

@@ -1,4 +1,4 @@
 # @package _global_
 defaults:
   - override /model: demucs
-  - override /effects: compression
+  - override /effects: compressor

remfx/datasets.py

@@ -55,10 +55,8 @@ class VocalSet(Dataset):
                     )
                     chunk_size_in_samples = self.chunk_size_in_sec * self.sample_rate
                     if resampled_chunk.shape[-1] < chunk_size_in_samples:
-                        resampled_chunk = F.pad(
-                            resampled_chunk,
-                            (0, chunk_size_in_samples - resampled_chunk.shape[1]),
-                        )
+                        # Skip if chunk is too small
+                        continue
                     # Apply effect
                     effect_idx = torch.rand(1).item() * len(self.effect_types.keys())
                     effect_name = list(self.effect_types.keys())[int(effect_idx)]