Prepare apply <=n remove n cfgs

README.md

@@ -20,8 +20,8 @@
 
 ## Experiments
 Training parameters can be configured in `cfg/exp/default.yaml`. Here are some descriptions
-- `num_kept_effects={min, max}` range of <b> Kept </b> effects to apply to each file.
-- `num_removed_effects={min, max}` range of <b> Removed </b> effects to apply to each file.
+- `num_kept_effects={min, max}` range of <b> Kept </b> effects to apply to each file. Inclusive.
+- `num_removed_effects={min, max}` range of <b> Removed </b> effects to apply to each file. Inclusive.
 - `model={model}` architecture to use (see 'Models')
 - `effects_to_keek={effect}` Effects to apply but not remove (see 'Effects')
 - `effects_to_remove={effect}` Effects to remove (see 'Effects')

cfg/exp/1-1.yaml

@@ -0,0 +1,28 @@
+# @package _global_
+defaults:
+  - override /model: demucs
+  - override /effects: all
+seed: 12345
+sample_rate: 48000
+chunk_size: 262144 # 5.5s
+logs_dir: "./logs"
+render_files: True
+render_root: "/scratch/EffectSet"
+accelerator: "gpu"
+log_audio: True
+# Effects
+num_kept_effects: [0,0] # [min, max]
+num_removed_effects: [0,1] # [min, max]
+shuffle_kept_effects: True
+shuffle_removed_effects: False
+num_classes: 5
+effects_to_keep:
+effects_to_remove:
+  - distortion
+  - compressor
+  - reverb
+  - chorus
+  - delay
+datamodule:
+  batch_size: 16
+  num_workers: 8

cfg/exp/2-2.yaml

@@ -0,0 +1,28 @@
+# @package _global_
+defaults:
+  - override /model: demucs
+  - override /effects: all
+seed: 12345
+sample_rate: 48000
+chunk_size: 262144 # 5.5s
+logs_dir: "./logs"
+render_files: True
+render_root: "/scratch/EffectSet"
+accelerator: "gpu"
+log_audio: True
+# Effects
+num_kept_effects: [0,0] # [min, max]
+num_removed_effects: [0,2] # [min, max]
+shuffle_kept_effects: True
+shuffle_removed_effects: False
+num_classes: 5
+effects_to_keep:
+effects_to_remove:
+  - distortion
+  - compressor
+  - reverb
+  - chorus
+  - delay
+datamodule:
+  batch_size: 16
+  num_workers: 8

cfg/exp/3-3.yaml

@@ -0,0 +1,28 @@
+# @package _global_
+defaults:
+  - override /model: demucs
+  - override /effects: all
+seed: 12345
+sample_rate: 48000
+chunk_size: 262144 # 5.5s
+logs_dir: "./logs"
+render_files: True
+render_root: "/scratch/EffectSet"
+accelerator: "gpu"
+log_audio: True
+# Effects
+num_kept_effects: [0,0] # [min, max]
+num_removed_effects: [0,3] # [min, max]
+shuffle_kept_effects: True
+shuffle_removed_effects: False
+num_classes: 5
+effects_to_keep:
+effects_to_remove:
+  - distortion
+  - compressor
+  - reverb
+  - chorus
+  - delay
+datamodule:
+  batch_size: 16
+  num_workers: 8

cfg/exp/4-4.yaml

@@ -0,0 +1,28 @@
+# @package _global_
+defaults:
+  - override /model: demucs
+  - override /effects: all
+seed: 12345
+sample_rate: 48000
+chunk_size: 262144 # 5.5s
+logs_dir: "./logs"
+render_files: True
+render_root: "/scratch/EffectSet"
+accelerator: "gpu"
+log_audio: True
+# Effects
+num_kept_effects: [0,0] # [min, max]
+num_removed_effects: [0,4] # [min, max]
+shuffle_kept_effects: True
+shuffle_removed_effects: False
+num_classes: 5
+effects_to_keep:
+effects_to_remove:
+  - distortion
+  - compressor
+  - reverb
+  - chorus
+  - delay
+datamodule:
+  batch_size: 16
+  num_workers: 8

cfg/exp/5-5.yaml

@@ -0,0 +1,28 @@
+# @package _global_
+defaults:
+  - override /model: demucs
+  - override /effects: all
+seed: 12345
+sample_rate: 48000
+chunk_size: 262144 # 5.5s
+logs_dir: "./logs"
+render_files: True
+render_root: "/scratch/EffectSet"
+accelerator: "gpu"
+log_audio: True
+# Effects
+num_kept_effects: [0,0] # [min, max]
+num_removed_effects: [0,5] # [min, max]
+shuffle_kept_effects: True
+shuffle_removed_effects: False
+num_classes: 5
+effects_to_keep:
+effects_to_remove:
+  - distortion
+  - compressor
+  - reverb
+  - chorus
+  - delay
+datamodule:
+  batch_size: 16
+  num_workers: 8

remfx/datasets.py

@@ -9,7 +9,7 @@ import random
 from tqdm import tqdm
 from pathlib import Path
 from remfx import effects
-from typing import Any, List, Dict, Tuple
+from typing import Any, List, Dict
 from torch.utils.data import Dataset, DataLoader
 from remfx.utils import select_random_chunk
 
@@ -175,8 +175,8 @@ class EffectDataset(Dataset):
         self.mode = mode
         self.num_kept_effects = num_kept_effects
         self.num_removed_effects = num_removed_effects
-        self.effects_to_keep = [] if effects_to_keep == None else effects_to_keep
-        self.effects_to_remove = [] if effects_to_remove == None else effects_to_remove
+        self.effects_to_keep = [] if effects_to_keep is None else effects_to_keep
+        self.effects_to_remove = [] if effects_to_remove is None else effects_to_remove
         self.normalize = effects.LoudnessNormalize(sample_rate, target_lufs_db=-20)
         self.effects = effect_modules
         self.shuffle_kept_effects = shuffle_kept_effects