From fb7b954de5427aa94612ade3c6a1e354f5509a81 Mon Sep 17 00:00:00 2001 From: Shivam Mehta Date: Fri, 12 Jan 2024 11:21:51 +0000 Subject: [PATCH] Updating different url for hifigan as well --- matcha/app.py | 4 ++-- matcha/cli.py | 6 +++--- matcha/utils/utils.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/matcha/app.py b/matcha/app.py index 0091e7a..d68fbaa 100644 --- a/matcha/app.py +++ b/matcha/app.py @@ -51,9 +51,9 @@ RADIO_OPTIONS = { } # Ensure all the required models are downloaded -assert_model_downloaded(MATCHA_TTS_LOC("matcha_ljspeech"), MATCHA_URLS["matcha_ljspeech"], use_wget=True) +assert_model_downloaded(MATCHA_TTS_LOC("matcha_ljspeech"), MATCHA_URLS["matcha_ljspeech"]) assert_model_downloaded(VOCODER_LOC("hifigan_T2_v1"), VOCODER_URLS["hifigan_T2_v1"]) -assert_model_downloaded(MATCHA_TTS_LOC("matcha_vctk"), MATCHA_URLS["matcha_vctk"], use_wget=True) +assert_model_downloaded(MATCHA_TTS_LOC("matcha_vctk"), MATCHA_URLS["matcha_vctk"]) assert_model_downloaded(VOCODER_LOC("hifigan_univ_v1"), VOCODER_URLS["hifigan_univ_v1"]) device = get_device(args) diff --git a/matcha/cli.py b/matcha/cli.py index 29d4f48..579d7d6 100644 --- a/matcha/cli.py +++ b/matcha/cli.py @@ -23,8 +23,8 @@ MATCHA_URLS = { } VOCODER_URLS = { - "hifigan_T2_v1": "https://drive.google.com/file/d/14NENd4equCBLyyCSke114Mv6YR_j_uFs/view?usp=drive_link", - "hifigan_univ_v1": "https://drive.google.com/file/d/1qpgI41wNXFcH-iKq1Y42JlBC9j0je8PW/view?usp=drive_link", + "hifigan_T2_v1": "https://github.com/shivammehta25/Matcha-TTS-checkpoints/releases/download/v1.0/generator_v1", # Old url: https://drive.google.com/file/d/14NENd4equCBLyyCSke114Mv6YR_j_uFs/view?usp=drive_link + "hifigan_univ_v1": "https://github.com/shivammehta25/Matcha-TTS-checkpoints/releases/download/v1.0/g_02500000", # Old url: https://drive.google.com/file/d/1qpgI41wNXFcH-iKq1Y42JlBC9j0je8PW/view?usp=drive_link } MULTISPEAKER_MODEL = { @@ -74,7 +74,7 @@ def assert_required_models_available(args): model_path = args.checkpoint_path else: model_path = save_dir / f"{args.model}.ckpt" - assert_model_downloaded(model_path, MATCHA_URLS[args.model], use_wget=True) + assert_model_downloaded(model_path, MATCHA_URLS[args.model]) vocoder_path = save_dir / f"{args.vocoder}" assert_model_downloaded(vocoder_path, VOCODER_URLS[args.vocoder]) diff --git a/matcha/utils/utils.py b/matcha/utils/utils.py index adb9290..af65e09 100644 --- a/matcha/utils/utils.py +++ b/matcha/utils/utils.py @@ -205,7 +205,7 @@ def get_user_data_dir(appname="matcha_tts"): return final_path -def assert_model_downloaded(checkpoint_path, url, use_wget=False): +def assert_model_downloaded(checkpoint_path, url, use_wget=True): if Path(checkpoint_path).exists(): log.debug(f"[+] Model already present at {checkpoint_path}!") print(f"[+] Model already present at {checkpoint_path}!")