From a1c431e6a983fd26c698480efefe70e588fc457e Mon Sep 17 00:00:00 2001 From: Eren G??lge Date: Mon, 26 Jun 2023 12:55:18 +0200 Subject: [PATCH] Fixups --- TTS/tts/configs/fast_pitch_config.py | 2 +- TTS/utils/audio/processor.py | 5 ++++- TTS/utils/manage.py | 1 + TTS/vc/models/freevc.py | 4 ++-- requirements.txt | 6 +++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/TTS/tts/configs/fast_pitch_config.py b/TTS/tts/configs/fast_pitch_config.py index 90b15021..d086d265 100644 --- a/TTS/tts/configs/fast_pitch_config.py +++ b/TTS/tts/configs/fast_pitch_config.py @@ -113,7 +113,7 @@ class FastPitchConfig(BaseTTSConfig): base_model: str = "forward_tts" # model specific params - model_args: ForwardTTSArgs = ForwardTTSArgs() + model_args: ForwardTTSArgs = field(default_factory=ForwardTTSArgs) # multi-speaker settings num_speakers: int = 0 diff --git a/TTS/utils/audio/processor.py b/TTS/utils/audio/processor.py index 579f375c..b0920dc9 100644 --- a/TTS/utils/audio/processor.py +++ b/TTS/utils/audio/processor.py @@ -540,7 +540,10 @@ class AudioProcessor(object): def _griffin_lim(self, S): angles = np.exp(2j * np.pi * np.random.rand(*S.shape)) - S_complex = np.abs(S).astype(np.complex) + try: + S_complex = np.abs(S).astype(np.complex) + except AttributeError: # np.complex is deprecated since numpy 1.20.0 + S_complex = np.abs(S).astype(complex) y = self._istft(S_complex * angles) if not np.isfinite(y).all(): print(" [!] Waveform is not finite everywhere. Skipping the GL.") diff --git a/TTS/utils/manage.py b/TTS/utils/manage.py index dca936b8..354e193a 100644 --- a/TTS/utils/manage.py +++ b/TTS/utils/manage.py @@ -287,6 +287,7 @@ class ModelManager(object): "author": "fairseq", "description": "this model is released by Meta under Fairseq repo. Visit https://github.com/facebookresearch/fairseq/tree/main/examples/mms for more info.", } + model_item["model_name"] = model_name else: # get model from models.json model_item = self.models_dict[model_type][lang][dataset][model] diff --git a/TTS/vc/models/freevc.py b/TTS/vc/models/freevc.py index 4aa26724..ae22ad28 100644 --- a/TTS/vc/models/freevc.py +++ b/TTS/vc/models/freevc.py @@ -794,8 +794,8 @@ class FreeVCConfig(BaseVCConfig): model: str = "freevc" # model specific params - model_args: FreeVCArgs = FreeVCArgs() - audio: FreeVCAudioConfig = FreeVCAudioConfig() + model_args: FreeVCArgs = field(default_factory=FreeVCArgs) + audio: FreeVCAudioConfig = field(default_factory=FreeVCAudioConfig) # optimizer # TODO with training support diff --git a/requirements.txt b/requirements.txt index c90cef37..049a6660 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # core deps -numpy==1.22.0 -numpy==1.22.0 +numpy==1.22.0;python_version<="3.10" +numpy==1.24.3;python_version>"3.10" cython==0.29.30 scipy>=1.4.0 torch>=1.7 @@ -8,7 +8,7 @@ torchaudio soundfile librosa==0.10.0.* numba==0.55.1;python_version<"3.9" -numba==0.56.4;python_version>="3.9" +numba==0.57.0;python_version>="3.9" inflect==5.6.0 tqdm anyascii