From e239ee1cd2d20b3aa96ac5396839d8134550d6ae Mon Sep 17 00:00:00 2001
From: Jerryuhoo <jerryuhoo@gmail.com>
Date: Thu, 6 Jan 2022 14:20:27 +0800
Subject: [PATCH 1/5] add multi-speaker support for finetuning hifigan vocoder

---
 examples/csmsc/voc5/finetune.sh               |  5 +-
 examples/csmsc/voc5/local/link_wav.py         |  7 +-
 .../t2s/exps/fastspeech2/gen_gta_mel.py       | 73 ++++++++++++++++---
 3 files changed, 72 insertions(+), 13 deletions(-)

diff --git a/examples/csmsc/voc5/finetune.sh b/examples/csmsc/voc5/finetune.sh
index 4ab10e5b..048a2970 100755
--- a/examples/csmsc/voc5/finetune.sh
+++ b/examples/csmsc/voc5/finetune.sh
@@ -15,7 +15,10 @@ if [ ${stage} -le 0 ] && [ ${stop_stage} -ge 0 ]; then
         --fastspeech2-stat=fastspeech2_nosil_baker_ckpt_0.4/speech_stats.npy \
         --dur-file=durations.txt \
         --output-dir=dump_finetune \
-        --phones-dict=fastspeech2_nosil_baker_ckpt_0.4/phone_id_map.txt
+        --phones-dict=fastspeech2_nosil_baker_ckpt_0.4/phone_id_map.txt \
+        --speaker-dict=fastspeech2_nosil_baker_ckpt_0.4/speaker_id_map.txt \
+        --dataset=baker \
+        --rootdir=~/datasets/BZNSYP/
 fi
 
 if [ ${stage} -le 1 ] && [ ${stop_stage} -ge 1 ]; then
diff --git a/examples/csmsc/voc5/local/link_wav.py b/examples/csmsc/voc5/local/link_wav.py
index c81e0d4b..4bab3d5e 100644
--- a/examples/csmsc/voc5/local/link_wav.py
+++ b/examples/csmsc/voc5/local/link_wav.py
@@ -18,7 +18,7 @@ from pathlib import Path
 
 import jsonlines
 import numpy as np
-
+from tqdm import tqdm
 
 def main():
     # parse config and args
@@ -52,9 +52,10 @@ def main():
         output_dir = dump_dir / sub
         output_dir.mkdir(parents=True, exist_ok=True)
         results = []
-        for name in os.listdir(output_dir / "raw"):
+        files = os.listdir(output_dir / "raw")
+        for name in tqdm(files):
             # 003918_feats.npy
-            utt_id = name.split("_")[0]
+            utt_id = name.split("_feats.npy")[0]
             mel_path = output_dir / ("raw/" + name)
             gen_mel = np.load(mel_path)
             wave_name = utt_id + "_wave.npy"
diff --git a/paddlespeech/t2s/exps/fastspeech2/gen_gta_mel.py b/paddlespeech/t2s/exps/fastspeech2/gen_gta_mel.py
index fa46fd55..4ddd19f7 100644
--- a/paddlespeech/t2s/exps/fastspeech2/gen_gta_mel.py
+++ b/paddlespeech/t2s/exps/fastspeech2/gen_gta_mel.py
@@ -21,6 +21,8 @@ import numpy as np
 import paddle
 import yaml
 from yacs.config import CfgNode
+from tqdm import tqdm
+import os
 
 from paddlespeech.t2s.datasets.preprocess_utils import get_phn_dur
 from paddlespeech.t2s.datasets.preprocess_utils import merge_silence
@@ -30,6 +32,8 @@ from paddlespeech.t2s.modules.normalizer import ZScore
 
 
 def evaluate(args, fastspeech2_config):
+    rootdir = Path(args.rootdir).expanduser()
+    assert rootdir.is_dir()
 
     # construct dataset for evaluation
     with open(args.phones_dict, "r") as f:
@@ -41,9 +45,16 @@ def evaluate(args, fastspeech2_config):
     for phn, id in phn_id:
         phone_dict[phn] = int(id)
 
+    if args.speaker_dict:
+        with open(args.speaker_dict, 'rt') as f:
+            spk_id_list = [line.strip().split() for line in f.readlines()]
+            spk_num = len(spk_id_list)
+    else:
+        spk_num=None
+
     odim = fastspeech2_config.n_mels
     model = FastSpeech2(
-        idim=vocab_size, odim=odim, **fastspeech2_config["model"])
+        idim=vocab_size, odim=odim, **fastspeech2_config["model"], spk_num=spk_num)
 
     model.set_state_dict(
         paddle.load(args.fastspeech2_checkpoint)["main_params"])
@@ -65,7 +76,34 @@ def evaluate(args, fastspeech2_config):
     sentences, speaker_set = get_phn_dur(args.dur_file)
     merge_silence(sentences)
 
-    for i, utt_id in enumerate(sentences):
+    if args.dataset == "baker":
+        wav_files = sorted(list((rootdir / "Wave").rglob("*.wav")))
+        # split data into 3 sections
+        num_train = 9800
+        num_dev = 100
+        train_wav_files = wav_files[:num_train]
+        dev_wav_files = wav_files[num_train:num_train + num_dev]
+        test_wav_files = wav_files[num_train + num_dev:]
+    elif args.dataset == "aishell3":
+        sub_num_dev = 5
+        wav_dir = rootdir / "train" / "wav"
+        train_wav_files = []
+        dev_wav_files = []
+        test_wav_files = []
+        for speaker in os.listdir(wav_dir):
+            wav_files = sorted(list((wav_dir / speaker).rglob("*.wav")))
+            if len(wav_files) > 100:
+                train_wav_files += wav_files[:-sub_num_dev * 2]
+                dev_wav_files += wav_files[-sub_num_dev * 2:-sub_num_dev]
+                test_wav_files += wav_files[-sub_num_dev:]
+            else:
+                train_wav_files += wav_files
+
+    train_wav_files = [os.path.basename(str(str_path)) for str_path in train_wav_files]
+    dev_wav_files = [os.path.basename(str(str_path)) for str_path in dev_wav_files]
+    test_wav_files = [os.path.basename(str(str_path)) for str_path in test_wav_files]
+
+    for i, utt_id in enumerate(tqdm(sentences)):
         phones = sentences[utt_id][0]
         durations = sentences[utt_id][1]
         speaker = sentences[utt_id][2]
@@ -82,21 +120,30 @@ def evaluate(args, fastspeech2_config):
 
         phone_ids = [phone_dict[phn] for phn in phones]
         phone_ids = paddle.to_tensor(np.array(phone_ids))
+
+        if args.speaker_dict:
+            speaker_id = int([item[1] for item in spk_id_list if speaker == item[0]][0])    
+            speaker_id = paddle.to_tensor(speaker_id)
+        else:
+            speaker_id = None
+
         durations = paddle.to_tensor(np.array(durations))
         # 生成的和真实的可能有 1, 2 帧的差距，但是 batch_fn 会修复
         # split data into 3 sections
-        if args.dataset == "baker":
-            num_train = 9800
-            num_dev = 100
-        if i in range(0, num_train):
+
+        wav_path = utt_id + ".wav"
+
+        if wav_path in train_wav_files:
             sub_output_dir = output_dir / ("train/raw")
-        elif i in range(num_train, num_train + num_dev):
+        elif wav_path in dev_wav_files:
             sub_output_dir = output_dir / ("dev/raw")
-        else:
+        elif wav_path in test_wav_files:
             sub_output_dir = output_dir / ("test/raw")
+
         sub_output_dir.mkdir(parents=True, exist_ok=True)
+
         with paddle.no_grad():
-            mel = fastspeech2_inference(phone_ids, durations=durations)
+            mel = fastspeech2_inference(phone_ids, durations=durations, spk_id=speaker_id)
         np.save(sub_output_dir / (utt_id + "_feats.npy"), mel)
 
 
@@ -109,6 +156,8 @@ def main():
         default="baker",
         type=str,
         help="name of dataset, should in {baker, ljspeech, vctk} now")
+    parser.add_argument(
+        "--rootdir", default=None, type=str, help="directory to dataset.")
     parser.add_argument(
         "--fastspeech2-config", type=str, help="fastspeech2 config file.")
     parser.add_argument(
@@ -126,6 +175,12 @@ def main():
         type=str,
         default="phone_id_map.txt",
         help="phone vocabulary file.")
+    
+    parser.add_argument(
+        "--speaker-dict",
+        type=str,
+        default=None,
+        help="speaker id map file.")
 
     parser.add_argument(
         "--dur-file", default=None, type=str, help="path to durations.txt.")

From 76f98c6f6936fe2e33c7c6148f32482c9f387768 Mon Sep 17 00:00:00 2001
From: Jerryuhoo <jerryuhoo@gmail.com>
Date: Thu, 6 Jan 2022 14:57:18 +0800
Subject: [PATCH 2/5] add --dataset and --rootdir to voc3 finetune script

add --dataset and --rootdir to voc3 finetune script, also remove --speaker-dict in voc5.
---
 examples/csmsc/voc3/finetune.sh | 4 +++-
 examples/csmsc/voc5/finetune.sh | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/examples/csmsc/voc3/finetune.sh b/examples/csmsc/voc3/finetune.sh
index 4ab10e5b..1ff0f18a 100755
--- a/examples/csmsc/voc3/finetune.sh
+++ b/examples/csmsc/voc3/finetune.sh
@@ -15,7 +15,9 @@ if [ ${stage} -le 0 ] && [ ${stop_stage} -ge 0 ]; then
         --fastspeech2-stat=fastspeech2_nosil_baker_ckpt_0.4/speech_stats.npy \
         --dur-file=durations.txt \
         --output-dir=dump_finetune \
-        --phones-dict=fastspeech2_nosil_baker_ckpt_0.4/phone_id_map.txt
+        --phones-dict=fastspeech2_nosil_baker_ckpt_0.4/phone_id_map.txt \
+        --dataset=baker \
+        --rootdir=~/datasets/BZNSYP/
 fi
 
 if [ ${stage} -le 1 ] && [ ${stop_stage} -ge 1 ]; then
diff --git a/examples/csmsc/voc5/finetune.sh b/examples/csmsc/voc5/finetune.sh
index 048a2970..1ff0f18a 100755
--- a/examples/csmsc/voc5/finetune.sh
+++ b/examples/csmsc/voc5/finetune.sh
@@ -16,7 +16,6 @@ if [ ${stage} -le 0 ] && [ ${stop_stage} -ge 0 ]; then
         --dur-file=durations.txt \
         --output-dir=dump_finetune \
         --phones-dict=fastspeech2_nosil_baker_ckpt_0.4/phone_id_map.txt \
-        --speaker-dict=fastspeech2_nosil_baker_ckpt_0.4/speaker_id_map.txt \
         --dataset=baker \
         --rootdir=~/datasets/BZNSYP/
 fi

From c94f346207c70fbb3c7eef2776e8d165a07eeba1 Mon Sep 17 00:00:00 2001
From: Jerryuhoo <jerryuhoo@gmail.com>
Date: Thu, 6 Jan 2022 15:03:54 +0800
Subject: [PATCH 3/5] move link_wav.py to paddlespeech/t2s/exps/gan_vocoder/

move link_wav.py to paddlespeech/t2s/exps/gan_vocoder/ so that different vocoders can use one script.
---
 examples/csmsc/voc3/finetune.sh               |  2 +-
 examples/csmsc/voc3/local/link_wav.py         | 85 -------------------
 examples/csmsc/voc5/finetune.sh               |  2 +-
 .../t2s/exps/gan_vocoder}/link_wav.py         |  1 -
 4 files changed, 2 insertions(+), 88 deletions(-)
 delete mode 100644 examples/csmsc/voc3/local/link_wav.py
 rename {examples/csmsc/voc5/local => paddlespeech/t2s/exps/gan_vocoder}/link_wav.py (98%)

diff --git a/examples/csmsc/voc3/finetune.sh b/examples/csmsc/voc3/finetune.sh
index 1ff0f18a..ef2349f5 100755
--- a/examples/csmsc/voc3/finetune.sh
+++ b/examples/csmsc/voc3/finetune.sh
@@ -21,7 +21,7 @@ if [ ${stage} -le 0 ] && [ ${stop_stage} -ge 0 ]; then
 fi
 
 if [ ${stage} -le 1 ] && [ ${stop_stage} -ge 1 ]; then
-    python3 local/link_wav.py \
+    python3 ${MAIN_ROOT}/paddlespeech/t2s/exps/gan_vocoder/link_wav.py \
         --old-dump-dir=dump \
         --dump-dir=dump_finetune
 fi
diff --git a/examples/csmsc/voc3/local/link_wav.py b/examples/csmsc/voc3/local/link_wav.py
deleted file mode 100644
index c81e0d4b..00000000
--- a/examples/csmsc/voc3/local/link_wav.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import argparse
-import os
-from operator import itemgetter
-from pathlib import Path
-
-import jsonlines
-import numpy as np
-
-
-def main():
-    # parse config and args
-    parser = argparse.ArgumentParser(
-        description="Preprocess audio and then extract features .")
-
-    parser.add_argument(
-        "--old-dump-dir",
-        default=None,
-        type=str,
-        help="directory to dump feature files.")
-    parser.add_argument(
-        "--dump-dir",
-        type=str,
-        required=True,
-        help="directory to finetune dump feature files.")
-    args = parser.parse_args()
-
-    old_dump_dir = Path(args.old_dump_dir).expanduser()
-    old_dump_dir = old_dump_dir.resolve()
-    dump_dir = Path(args.dump_dir).expanduser()
-    # use absolute path
-    dump_dir = dump_dir.resolve()
-    dump_dir.mkdir(parents=True, exist_ok=True)
-
-    assert old_dump_dir.is_dir()
-    assert dump_dir.is_dir()
-
-    for sub in ["train", "dev", "test"]:
-        # 把 old_dump_dir 里面的 *-wave.npy 软连接到 dump_dir 的对应位置
-        output_dir = dump_dir / sub
-        output_dir.mkdir(parents=True, exist_ok=True)
-        results = []
-        for name in os.listdir(output_dir / "raw"):
-            # 003918_feats.npy
-            utt_id = name.split("_")[0]
-            mel_path = output_dir / ("raw/" + name)
-            gen_mel = np.load(mel_path)
-            wave_name = utt_id + "_wave.npy"
-            wav = np.load(old_dump_dir / sub / ("raw/" + wave_name))
-            os.symlink(old_dump_dir / sub / ("raw/" + wave_name),
-                       output_dir / ("raw/" + wave_name))
-            num_sample = wav.shape[0]
-            num_frames = gen_mel.shape[0]
-            wav_path = output_dir / ("raw/" + wave_name)
-
-            record = {
-                "utt_id": utt_id,
-                "num_samples": num_sample,
-                "num_frames": num_frames,
-                "feats": str(mel_path),
-                "wave": str(wav_path),
-            }
-            results.append(record)
-
-        results.sort(key=itemgetter("utt_id"))
-
-        with jsonlines.open(output_dir / "raw/metadata.jsonl", 'w') as writer:
-            for item in results:
-                writer.write(item)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/examples/csmsc/voc5/finetune.sh b/examples/csmsc/voc5/finetune.sh
index 1ff0f18a..ef2349f5 100755
--- a/examples/csmsc/voc5/finetune.sh
+++ b/examples/csmsc/voc5/finetune.sh
@@ -21,7 +21,7 @@ if [ ${stage} -le 0 ] && [ ${stop_stage} -ge 0 ]; then
 fi
 
 if [ ${stage} -le 1 ] && [ ${stop_stage} -ge 1 ]; then
-    python3 local/link_wav.py \
+    python3 ${MAIN_ROOT}/paddlespeech/t2s/exps/gan_vocoder/link_wav.py \
         --old-dump-dir=dump \
         --dump-dir=dump_finetune
 fi
diff --git a/examples/csmsc/voc5/local/link_wav.py b/paddlespeech/t2s/exps/gan_vocoder/link_wav.py
similarity index 98%
rename from examples/csmsc/voc5/local/link_wav.py
rename to paddlespeech/t2s/exps/gan_vocoder/link_wav.py
index 4bab3d5e..5b24c87d 100644
--- a/examples/csmsc/voc5/local/link_wav.py
+++ b/paddlespeech/t2s/exps/gan_vocoder/link_wav.py
@@ -54,7 +54,6 @@ def main():
         results = []
         files = os.listdir(output_dir / "raw")
         for name in tqdm(files):
-            # 003918_feats.npy
             utt_id = name.split("_feats.npy")[0]
             mel_path = output_dir / ("raw/" + name)
             gen_mel = np.load(mel_path)

From ea8977555f699325d88e291fdfa4628a19e5b837 Mon Sep 17 00:00:00 2001
From: Jerryuhoo <jerryuhoo@gmail.com>
Date: Thu, 6 Jan 2022 15:11:12 +0800
Subject: [PATCH 4/5] Simplify link_wav.py path

---
 examples/csmsc/voc3/finetune.sh | 2 +-
 examples/csmsc/voc5/finetune.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/csmsc/voc3/finetune.sh b/examples/csmsc/voc3/finetune.sh
index ef2349f5..4e58e562 100755
--- a/examples/csmsc/voc3/finetune.sh
+++ b/examples/csmsc/voc3/finetune.sh
@@ -21,7 +21,7 @@ if [ ${stage} -le 0 ] && [ ${stop_stage} -ge 0 ]; then
 fi
 
 if [ ${stage} -le 1 ] && [ ${stop_stage} -ge 1 ]; then
-    python3 ${MAIN_ROOT}/paddlespeech/t2s/exps/gan_vocoder/link_wav.py \
+    python3 ${BIN_DIR}/../link_wav.py \
         --old-dump-dir=dump \
         --dump-dir=dump_finetune
 fi
diff --git a/examples/csmsc/voc5/finetune.sh b/examples/csmsc/voc5/finetune.sh
index ef2349f5..4e58e562 100755
--- a/examples/csmsc/voc5/finetune.sh
+++ b/examples/csmsc/voc5/finetune.sh
@@ -21,7 +21,7 @@ if [ ${stage} -le 0 ] && [ ${stop_stage} -ge 0 ]; then
 fi
 
 if [ ${stage} -le 1 ] && [ ${stop_stage} -ge 1 ]; then
-    python3 ${MAIN_ROOT}/paddlespeech/t2s/exps/gan_vocoder/link_wav.py \
+    python3 ${BIN_DIR}/../link_wav.py \
         --old-dump-dir=dump \
         --dump-dir=dump_finetune
 fi

From d6e9b76e76d6288f1c47da7d47213e787784a1ab Mon Sep 17 00:00:00 2001
From: Jerryuhoo <jerryuhoo@gmail.com>
Date: Thu, 6 Jan 2022 15:28:23 +0800
Subject: [PATCH 5/5] change link_wav.py path, test=tts

---
 examples/csmsc/voc3/finetune.sh                          | 2 +-
 examples/csmsc/voc5/finetune.sh                          | 2 +-
 {paddlespeech/t2s/exps/gan_vocoder => utils}/link_wav.py | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {paddlespeech/t2s/exps/gan_vocoder => utils}/link_wav.py (100%)

diff --git a/examples/csmsc/voc3/finetune.sh b/examples/csmsc/voc3/finetune.sh
index 4e58e562..ca7958cf 100755
--- a/examples/csmsc/voc3/finetune.sh
+++ b/examples/csmsc/voc3/finetune.sh
@@ -21,7 +21,7 @@ if [ ${stage} -le 0 ] && [ ${stop_stage} -ge 0 ]; then
 fi
 
 if [ ${stage} -le 1 ] && [ ${stop_stage} -ge 1 ]; then
-    python3 ${BIN_DIR}/../link_wav.py \
+    python3 link_wav.py \
         --old-dump-dir=dump \
         --dump-dir=dump_finetune
 fi
diff --git a/examples/csmsc/voc5/finetune.sh b/examples/csmsc/voc5/finetune.sh
index 4e58e562..ca7958cf 100755
--- a/examples/csmsc/voc5/finetune.sh
+++ b/examples/csmsc/voc5/finetune.sh
@@ -21,7 +21,7 @@ if [ ${stage} -le 0 ] && [ ${stop_stage} -ge 0 ]; then
 fi
 
 if [ ${stage} -le 1 ] && [ ${stop_stage} -ge 1 ]; then
-    python3 ${BIN_DIR}/../link_wav.py \
+    python3 link_wav.py \
         --old-dump-dir=dump \
         --dump-dir=dump_finetune
 fi
diff --git a/paddlespeech/t2s/exps/gan_vocoder/link_wav.py b/utils/link_wav.py
similarity index 100%
rename from paddlespeech/t2s/exps/gan_vocoder/link_wav.py
rename to utils/link_wav.py