Sounakray2003/issue91

.gitignore

@@ -5,6 +5,7 @@
 
 # Byte-compiled / optimized / DLL files
 *__pycache__/
+__pycache__/
 *.py[cod]
 *$py.class
 

NeuralSeq/README.md

@@ -0,0 +1 @@
+In this directory, we support FastSpeech, GenerSpeech, SyntaSpeech, DiffSinger

text_to_sing/DiffSinger/data_gen/tts/base_preprocess.py → NeuralSeq/data_gen/tts/base_preprocess.py

@@ -110,11 +110,6 @@ def process(self):
                 f.writelines([f'{l}\n' for l in mfa_dict])
         with open(f"{processed_dir}/{self.meta_csv_filename}.json", 'w') as f:
             f.write(re.sub(r'\n\s+([\d+\]])', r'\1', json.dumps(items, ensure_ascii=False, sort_keys=False, indent=1)))
-
-        # save to csv
-        meta_df = pd.DataFrame(items)
-        meta_df.to_csv(f"{processed_dir}/metadata_phone.csv")
-
         remove_file(wav_processed_tmp_dir)
 
 

text_to_speech/data_gen/tts/txt_processors/en.py → NeuralSeq/data_gen/tts/txt_processors/en.py

@@ -6,9 +6,8 @@
 from nltk import pos_tag
 from nltk.tokenize import TweetTokenizer
 
-from text_to_speech.data_gen.tts.txt_processors.base_text_processor import BaseTxtProcessor, register_txt_processors
-from text_to_speech.utils.text.text_encoder import PUNCS, is_sil_phoneme
-
+from data_gen.tts.txt_processors.base_text_processor import BaseTxtProcessor, register_txt_processors
+from data_gen.tts.data_gen_utils import is_sil_phoneme, PUNCS
 
 class EnG2p(G2p):
     word_tokenize = TweetTokenizer().tokenize
@@ -75,4 +74,4 @@ def process(cls, txt, preprocess_args):
             else:
                 txt_struct[i_word][1].append(p)
         txt_struct = cls.postprocess(txt_struct, preprocess_args)
-        return txt_struct, txt
+        return txt_struct, txt

text_to_sing/DiffSinger/data_gen/tts/txt_processors/zh.py → NeuralSeq/data_gen/tts/txt_processors/zh.py

@@ -1,4 +1,5 @@
 import re
+import jieba
 from pypinyin import pinyin, Style
 from data_gen.tts.data_gen_utils import PUNCS
 from data_gen.tts.txt_processors.base_text_processor import BaseTxtProcessor
@@ -20,6 +21,7 @@ def preprocess_text(text):
         text = re.sub(f"([{PUNCS}])+", r"\1", text)  # !! -> !
         text = re.sub(f"([{PUNCS}])", r" \1 ", text)
         text = re.sub(rf"\s+", r"", text)
+        text = re.sub(rf"[A-Za-z]+", r"$", text)
         return text
 
     @classmethod

text_to_speech/data_gen/tts/wav_processors/common_processors.py → NeuralSeq/data_gen/tts/wav_processors/common_processors.py

@@ -2,11 +2,10 @@
 import subprocess
 import librosa
 import numpy as np
-from text_to_speech.data_gen.tts.wav_processors.base_processor import BaseWavProcessor, register_wav_processors
-from text_to_speech.utils.audio import trim_long_silences
-from text_to_speech.utils.audio.io import save_wav
-from text_to_speech.utils.audio.rnnoise import rnnoise
-from text_to_speech.utils.commons.hparams import hparams
+from data_gen.tts.wav_processors.base_processor import BaseWavProcessor, register_wav_processors
+from data_gen.tts.data_gen_utils import trim_long_silences
+from utils.audio import save_wav, rnnoise
+from utils.hparams import hparams
 
 
 @register_wav_processors(name='sox_to_wav')

text_to_speech/egs/datasets/audio/lj/preprocess.py → NeuralSeq/egs/datasets/audio/lj/preprocess.py

@@ -1,4 +1,4 @@
-from text_to_speech.data_gen.tts.base_preprocess import BasePreprocessor
+from data_gen.tts.base_preprocess import BasePreprocessor
 
 
 class LJPreprocess(BasePreprocessor):

text_to_sing/DiffSinger/usr/configs/base.yaml → NeuralSeq/egs/egs_bases/svs/base.yaml

@@ -1,4 +1,4 @@
-task_cls: usr.task.DiffFsTask
+task_cls: tasks.svs.task.DiffFsTask
 pitch_type: frame
 timesteps: 100
 dilation_cycle_length: 1

text_to_sing/DiffSinger/usr/configs/lj_ds_beta6.yaml → NeuralSeq/egs/egs_bases/svs/lj_ds_beta6.yaml

@@ -23,7 +23,7 @@ spec_max: [ -0.5982, -0.0778,  0.1205,  0.2747,  0.4657,  0.5123,  0.5684,  0.70
             0.0086, -0.0698,  0.1385,  0.0941,  0.1864,  0.1225,  0.2176,  0.2566,
             0.1670,  0.1007,  0.1444,  0.0888,  0.1998,  0.2414,  0.2932,  0.3047 ]
 
-task_cls: usr.diffspeech_task.DiffSpeechTask
+task_cls: tasks.svs.diffspeech_task.DiffSpeechTask
 vocoder: vocoders.hifigan.HifiGAN
 vocoder_ckpt: checkpoints/0414_hifi_lj_1
 num_valid_plots: 10

text_to_sing/DiffSinger/usr/configs/midi/cascade/opencs/aux_rel.yaml → NeuralSeq/egs/egs_bases/svs/midi/cascade/opencs/aux_rel.yaml

@@ -1,6 +1,6 @@
 base_config:
   - configs/singing/fs2.yaml
-  - usr/configs/midi/cascade/opencs/opencpop_statis.yaml
+  - egs/egs_bases/svs/midi/cascade/opencs/opencpop_statis.yaml
 
 audio_sample_rate: 24000
 hop_size: 128            # Hop size.
@@ -42,8 +42,8 @@ test_prefixes: [
     '2100',
 ]
 
-task_cls: usr.diffsinger_task.AuxDecoderMIDITask
-#vocoder: usr.singingvocoder.highgan.HighGAN
+task_cls: tasks.svs.diffsinger_task.AuxDecoderMIDITask
+#vocoder: tasks.svs.singingvocoder.highgan.HighGAN
 #vocoder_ckpt: checkpoints/h_2_model/checkpoint-530000steps.pkl
 vocoder: vocoders.hifigan.HifiGAN
 vocoder_ckpt: checkpoints/0109_hifigan_bigpopcs_hop128

text_to_sing/DiffSinger/usr/configs/midi/cascade/opencs/ds60_rel.yaml → NeuralSeq/egs/egs_bases/svs/midi/cascade/opencs/ds60_rel.yaml

@@ -1,6 +1,6 @@
 base_config:
-  - usr/configs/popcs_ds_beta6.yaml
-  - usr/configs/midi/cascade/opencs/opencpop_statis.yaml
+  - egs/egs_bases/svs/popcs_ds_beta6.yaml
+  - egs/egs_bases/svs/midi/cascade/opencs/opencpop_statis.yaml
 
 binarizer_cls: data_gen.singing.binarize.OpencpopBinarizer
 binary_data_dir: 'data/binary/opencpop-midi-dp'
@@ -21,7 +21,7 @@ pe_ckpt: ''
 
 fs2_ckpt: 'checkpoints/0302_opencpop_fs_midi/model_ckpt_steps_160000.ckpt'  #
 #num_valid_plots: 0
-task_cls: usr.diffsinger_task.DiffSingerMIDITask
+task_cls: tasks.svs.diffsinger_task.DiffSingerMIDITask
 
 K_step: 60
 max_tokens: 36000

text_to_sing/DiffSinger/usr/configs/midi/e2e/opencpop/ds1000-10dil.yaml → NeuralSeq/egs/egs_bases/svs/midi/e2e/opencpop/ds1000-10dil.yaml

@@ -1,6 +1,6 @@
 base_config:
-  - usr/configs/popcs_ds_beta6.yaml
-  - usr/configs/midi/cascade/opencs/opencpop_statis.yaml
+  - egs/egs_bases/svs/popcs_ds_beta6.yaml
+  - egs/egs_bases/svs/midi/cascade/opencs/opencpop_statis.yaml
 
 binarizer_cls: data_gen.singing.binarize.OpencpopBinarizer
 binary_data_dir: 'data/binary/opencpop-midi-dp'
@@ -17,7 +17,7 @@ dur_predictor_layers: 5  # *
 
 fs2_ckpt: ''  #
 #num_valid_plots: 0
-task_cls: usr.diffsinger_task.DiffSingerMIDITask
+task_cls: tasks.svs.diffsinger_task.DiffSingerMIDITask
 
 timesteps: 1000
 K_step: 1000

text_to_sing/DiffSinger/usr/configs/midi/e2e/opencpop/ds1000.yaml → NeuralSeq/egs/egs_bases/svs/midi/e2e/opencpop/ds1000.yaml

@@ -1,6 +1,6 @@
 base_config:
-  - usr/configs/popcs_ds_beta6.yaml
-  - usr/configs/midi/cascade/opencs/opencpop_statis.yaml
+  - egs/egs_bases/svs/popcs_ds_beta6.yaml
+  - egs/egs_bases/svs/midi/cascade/opencs/opencpop_statis.yaml
 
 binarizer_cls: data_gen.singing.binarize.OpencpopBinarizer
 binary_data_dir: 'data/binary/opencpop-midi-dp'
@@ -17,7 +17,7 @@ dur_predictor_layers: 5  # *
 
 fs2_ckpt: ''  #
 #num_valid_plots: 0
-task_cls: usr.diffsinger_task.DiffSingerMIDITask
+task_cls: tasks.svs.diffsinger_task.DiffSingerMIDITask
 
 # for diffusion schedule
 timesteps: 1000

text_to_sing/DiffSinger/usr/configs/midi/e2e/opencpop/ds100_adj_rel.yaml → NeuralSeq/egs/egs_bases/svs/midi/e2e/opencpop/ds100_adj_rel.yaml

@@ -1,6 +1,6 @@
 base_config:
-  - usr/configs/popcs_ds_beta6.yaml
-  - usr/configs/midi/cascade/opencs/opencpop_statis.yaml
+  - egs/egs_bases/svs/popcs_ds_beta6.yaml
+  - egs/egs_bases/svs/midi/cascade/opencs/opencpop_statis.yaml
 
 binarizer_cls: data_gen.singing.binarize.OpencpopBinarizer
 binary_data_dir: 'data/binary/opencpop-midi-dp'
@@ -17,7 +17,7 @@ dur_predictor_layers: 5  # *
 
 fs2_ckpt: ''  #
 #num_valid_plots: 0
-task_cls: usr.diffsinger_task.DiffSingerMIDITask
+task_cls: tasks.svs.diffsinger_task.DiffSingerMIDITask
 
 K_step: 100
 max_tokens: 36000

text_to_sing/DiffSinger/usr/configs/midi/e2e/popcs/ds100_adj_rel.yaml → NeuralSeq/egs/egs_bases/svs/midi/e2e/popcs/ds100_adj_rel.yaml

@@ -1,6 +1,6 @@
 base_config:
-  - usr/configs/popcs_ds_beta6.yaml
-  - usr/configs/midi/cascade/popcs/popcs_statis.yaml
+  - egs/egs_bases/svs/popcs_ds_beta6.yaml
+  - egs/egs_bases/svs/midi/cascade/popcs/popcs_statis.yaml
 
 binarizer_cls: data_gen.singing.binarize.MidiSingingBinarizer
 binary_data_dir: 'data/binary/popcs-midi-dp'
@@ -17,7 +17,7 @@ dur_predictor_layers: 5  # *
 
 fs2_ckpt: ''  #
 #num_valid_plots: 0
-task_cls: usr.diffsinger_task.DiffSingerMIDITask
+task_cls: tasks.svs.diffsinger_task.DiffSingerMIDITask
 
 K_step: 100
 max_tokens: 40000

text_to_sing/DiffSinger/usr/configs/popcs_ds_beta6.yaml → NeuralSeq/egs/egs_bases/svs/popcs_ds_beta6.yaml

@@ -48,8 +48,8 @@ spec_max: [ 0.2645,  0.0583, -0.2344, -0.0184,  0.1227,  0.1533,  0.1103,  0.121
             -0.8770, -0.9520, -0.8749, -0.7297, -0.8374, -0.8667, -0.7157, -0.9035,
             -0.9219, -0.8801, -0.9298, -0.9009, -0.9604, -1.0537, -1.0781, -1.3766]
 
-task_cls: usr.diffsinger_task.DiffSingerTask
-#vocoder: usr.singingvocoder.highgan.HighGAN
+task_cls: tasks.svs.diffsinger_task.DiffSingerTask
+#vocoder: tasks.svs.singingvocoder.highgan.HighGAN
 #vocoder_ckpt: checkpoints/h_2_model/checkpoint-530000steps.pkl
 vocoder: vocoders.hifigan.HifiGAN
 vocoder_ckpt: checkpoints/0109_hifigan_bigpopcs_hop128

text_to_sing/DiffSinger/usr/configs/popcs_ds_beta6_offline.yaml → NeuralSeq/egs/egs_bases/svs/popcs_ds_beta6_offline.yaml

@@ -3,7 +3,7 @@ base_config:
 
 fs2_ckpt: checkpoints/popcs_fs2_pmf0_1230/model_ckpt_steps_160000.ckpt  # to be infer
 num_valid_plots: 0
-task_cls: usr.diffsinger_task.DiffSingerOfflineTask
+task_cls: tasks.svs.diffsinger_task.DiffSingerOfflineTask
 
 # tmp:
 #pe_enable: true

text_to_sing/DiffSinger/usr/configs/popcs_fs2.yaml → NeuralSeq/egs/egs_bases/svs/popcs_fs2.yaml

@@ -26,7 +26,7 @@ test_prefixes: [
 ]
 
 task_cls: tasks.tts.fs2.FastSpeech2Task
-#vocoder: usr.singingvocoder.highgan.HighGAN
+#vocoder: tasks.svs.singingvocoder.highgan.HighGAN
 #vocoder_ckpt: checkpoints/h_2_model/checkpoint-530000steps.pkl
 vocoder: vocoders.hifigan.HifiGAN
 vocoder_ckpt: checkpoints/0109_hifigan_bigpopcs_hop128

text_to_speech/egs/egs_bases/tts/ps.yaml → NeuralSeq/egs/egs_bases/tts/ps.yaml

@@ -1,4 +1,4 @@
-base_config: ./fs.yaml
+base_config: ./fs2.yaml
 
 ###########################
 # models

text_to_speech/egs/egs_bases/tts/ps_flow.yaml → NeuralSeq/egs/egs_bases/tts/ps_flow.yaml

@@ -1,4 +1,4 @@
-base_config: ./ps.yaml
+base_config: ./ps2.yaml
 task_cls: tasks.tts.ps_flow.PortaSpeechFlowTask
 
 use_post_flow: true

text_to_sing/DiffSinger/inference/svs/ds_cascade.py → NeuralSeq/inference/svs/ds_cascade.py

@@ -1,11 +1,9 @@
 import torch
-# from inference.tts.fs import FastSpeechInfer
-# from modules.tts.fs2_orig import FastSpeech2Orig
 from inference.svs.base_svs_infer import BaseSVSInfer
 from utils import load_ckpt
 from utils.hparams import hparams
-from usr.diff.shallow_diffusion_tts import GaussianDiffusion
-from usr.diffsinger_task import DIFF_DECODERS
+from modulesmodules.diff.shallow_diffusion_tts import GaussianDiffusion
+from tasks.svs.diffsinger_task import DIFF_DECODERS
 
 class DiffSingerCascadeInfer(BaseSVSInfer):
     def build_model(self):
@@ -53,4 +51,4 @@ def forward_model(self, inp):
     }  # input like Opencpop dataset.
     DiffSingerCascadeInfer.example_run(inp)
 
-# # CUDA_VISIBLE_DEVICES=1 python inference/svs/ds_cascade.py --config usr/configs/midi/cascade/opencs/ds60_rel.yaml --exp_name 0303_opencpop_ds58_midi
+# # CUDA_VISIBLE_DEVICES=1 python inference/svs/ds_cascade.py --config egs/egs_bases/svs/midi/cascade/opencs/ds60_rel.yaml --exp_name 0303_opencpop_ds58_midi

text_to_sing/DiffSinger/inference/svs/ds_e2e.py → NeuralSeq/inference/svs/ds_e2e.py

@@ -4,8 +4,8 @@
 from inference.svs.base_svs_infer import BaseSVSInfer
 from utils import load_ckpt
 from utils.hparams import hparams
-from usr.diff.shallow_diffusion_tts import GaussianDiffusion
-from usr.diffsinger_task import DIFF_DECODERS
+from modules.diff.shallow_diffusion_tts import GaussianDiffusion
+from tasks.svs.diffsinger_task import DIFF_DECODERS
 from modules.fastspeech.pe import PitchExtractor
 import utils
 
@@ -64,4 +64,4 @@ def forward_model(self, inp):
     DiffSingerE2EInfer.example_run(inp)
 
 
-# CUDA_VISIBLE_DEVICES=3 python inference/svs/ds_e2e.py --config usr/configs/midi/e2e/opencpop/ds100_adj_rel.yaml --exp_name 0228_opencpop_ds100_rel
+# CUDA_VISIBLE_DEVICES=3 python inference/svs/ds_e2e.py --config egs/egs_bases/svs/midi/e2e/opencpop/ds100_adj_rel.yaml --exp_name 0228_opencpop_ds100_rel

text_to_sing/DiffSinger/inference/svs/opencpop/map.py → NeuralSeq/inference/svs/opencpop/map.py

@@ -1,7 +1,7 @@
 def cpop_pinyin2ph_func():
     # In the README file of opencpop dataset, they defined a "pinyin to phoneme mapping table"
     pinyin2phs = {'AP': 'AP', 'SP': 'SP'}
-    with open('text_to_sing/DiffSinger/inference/svs/opencpop/cpop_pinyin2ph.txt') as rf:
+    with open('NeuralSeq/inference/svs/opencpop/cpop_pinyin2ph.txt') as rf:
         for line in rf.readlines():
             elements = [x.strip() for x in line.split('|') if x.strip() != '']
             pinyin2phs[elements[0]] = elements[1]