From 05c8f9b4a85388237ee1636780d48478ff2f3309 Mon Sep 17 00:00:00 2001
From: Shivam Mehta <shivam.mehta25@gmail.com>
Date: Sun, 25 Feb 2024 22:02:36 +0000
Subject: [PATCH] updating configs and experiments

---
 configs/data/joe_spont_only.yaml              | 10 ++++++++
 configs/data/ryan.yaml                        | 10 ++++++++
 configs/experiment/joe_det_dur.yaml           | 14 +++++++++++
 configs/experiment/joe_stoc_dur.yaml          | 20 ++++++++++++++++
 configs/experiment/ryan_det_dur.yaml          | 18 ++++++++++++++
 configs/experiment/ryan_stoc_dur.yaml         | 24 +++++++++++++++++++
 .../utils/get_durations_from_trained_model.py |  2 +-
 7 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 configs/data/joe_spont_only.yaml
 create mode 100644 configs/data/ryan.yaml
 create mode 100644 configs/experiment/joe_det_dur.yaml
 create mode 100644 configs/experiment/joe_stoc_dur.yaml
 create mode 100644 configs/experiment/ryan_det_dur.yaml
 create mode 100644 configs/experiment/ryan_stoc_dur.yaml

diff --git a/configs/data/joe_spont_only.yaml b/configs/data/joe_spont_only.yaml
new file mode 100644
index 0000000..ea0e104
--- /dev/null
+++ b/configs/data/joe_spont_only.yaml
@@ -0,0 +1,10 @@
+defaults:
+  - ljspeech
+  - _self_
+
+name: joe_spont_only
+train_filelist_path: data/filelists/joe_spontonly_train.txt
+valid_filelist_path: data/filelists/joe_spontonly_val.txt
+data_statistics:
+  mel_mean: -5.882903
+  mel_std: 2.458284
diff --git a/configs/data/ryan.yaml b/configs/data/ryan.yaml
new file mode 100644
index 0000000..3cefe66
--- /dev/null
+++ b/configs/data/ryan.yaml
@@ -0,0 +1,10 @@
+defaults:
+  - ljspeech
+  - _self_
+
+name: ryan
+train_filelist_path: data/filelists/ryan_train.csv
+valid_filelist_path: data/filelists/ryan_val.csv
+data_statistics:
+  mel_mean: -4.715779
+  mel_std: 2.124502
diff --git a/configs/experiment/joe_det_dur.yaml b/configs/experiment/joe_det_dur.yaml
new file mode 100644
index 0000000..3948908
--- /dev/null
+++ b/configs/experiment/joe_det_dur.yaml
@@ -0,0 +1,14 @@
+# @package _global_
+
+# to execute this experiment run:
+# python train.py experiment=multispeaker
+
+defaults:
+  - override /data: joe_spont_only.yaml
+
+# all parameters below will be merged with parameters from default configurations set above
+# this allows you to overwrite only specified parameters
+
+tags: ["joe"]
+
+run_name: joe_det_dur
diff --git a/configs/experiment/joe_stoc_dur.yaml b/configs/experiment/joe_stoc_dur.yaml
new file mode 100644
index 0000000..0c1f361
--- /dev/null
+++ b/configs/experiment/joe_stoc_dur.yaml
@@ -0,0 +1,20 @@
+# @package _global_
+
+# to execute this experiment run:
+# python train.py experiment=multispeaker
+
+defaults:
+  - override /data: joe_spont_only.yaml
+  - override /model/duration_predictor: flow_matching.yaml
+
+# all parameters below will be merged with parameters from default configurations set above
+# this allows you to overwrite only specified parameters
+
+tags: ["joe"]
+
+
+run_name: joe_stoc_dur
+
+model:
+  duration_predictor:
+    p_dropout: 0.2
diff --git a/configs/experiment/ryan_det_dur.yaml b/configs/experiment/ryan_det_dur.yaml
new file mode 100644
index 0000000..ea73ca2
--- /dev/null
+++ b/configs/experiment/ryan_det_dur.yaml
@@ -0,0 +1,18 @@
+# @package _global_
+
+# to execute this experiment run:
+# python train.py experiment=multispeaker
+
+defaults:
+  - override /data: joe_spont_only.yaml
+
+# all parameters below will be merged with parameters from default configurations set above
+# this allows you to overwrite only specified parameters
+
+tags: ["ryan"]
+
+run_name: ryan_det_dur
+
+
+trainer:
+  max_epochs: 3000
diff --git a/configs/experiment/ryan_stoc_dur.yaml b/configs/experiment/ryan_stoc_dur.yaml
new file mode 100644
index 0000000..dfdc87c
--- /dev/null
+++ b/configs/experiment/ryan_stoc_dur.yaml
@@ -0,0 +1,24 @@
+# @package _global_
+
+# to execute this experiment run:
+# python train.py experiment=multispeaker
+
+defaults:
+  - override /data: joe_spont_only.yaml
+  - override /model/duration_predictor: flow_matching.yaml
+
+# all parameters below will be merged with parameters from default configurations set above
+# this allows you to overwrite only specified parameters
+
+tags: ["ryan"]
+
+
+run_name: ryan_stoc_dur
+
+model:
+  duration_predictor:
+    p_dropout: 0.2
+
+
+trainer:
+  max_epochs: 3000
diff --git a/matcha/utils/get_durations_from_trained_model.py b/matcha/utils/get_durations_from_trained_model.py
index 3e3abd2..d3c967b 100644
--- a/matcha/utils/get_durations_from_trained_model.py
+++ b/matcha/utils/get_durations_from_trained_model.py
@@ -131,7 +131,7 @@ def main():
     if args.output_folder is not None:
         output_folder = Path(args.output_folder)
     else:
-        output_folder = Path("data") / "processed_data" / "durations" / cfg["name"]
+        output_folder = Path("data") / "processed_data" / cfg["name"] / "durations"
 
     if os.path.exists(output_folder) and not args.force:
         print("Folder already exists. Use -f to force overwrite")