From c42369af5f31d8ce5c9fc764cb17934a99500c24 Mon Sep 17 00:00:00 2001 From: WeberJulian Date: Fri, 25 Mar 2022 18:39:12 +0100 Subject: [PATCH] Fix style --- tests/tts_tests/test_align_tts_train.py | 10 +++++----- tests/tts_tests/test_fast_pitch_speaker_emb_train.py | 10 +++++----- tests/tts_tests/test_fast_pitch_train.py | 10 +++++----- tests/tts_tests/test_glow_tts_d-vectors_train.py | 10 +++++----- tests/tts_tests/test_glow_tts_speaker_emb_train.py | 10 +++++----- tests/tts_tests/test_glow_tts_train.py | 10 +++++----- tests/tts_tests/test_speedy_speech_train.py | 10 +++++----- tests/tts_tests/test_tacotron2_d-vectors_train.py | 10 +++++----- tests/tts_tests/test_tacotron2_speaker_emb_train.py | 10 +++++----- tests/tts_tests/test_tacotron2_train.py | 10 +++++----- .../test_vits_multilingual_speaker_emb_train.py | 10 +++++----- .../test_vits_multilingual_train-d_vectors.py | 10 +++++----- tests/tts_tests/test_vits_speaker_emb_train.py | 10 +++++----- tests/tts_tests/test_vits_train.py | 10 +++++----- 14 files changed, 70 insertions(+), 70 deletions(-) diff --git a/tests/tts_tests/test_align_tts_train.py b/tests/tts_tests/test_align_tts_train.py index 9858def6..75c5643c 100644 --- a/tests/tts_tests/test_align_tts_train.py +++ b/tests/tts_tests/test_align_tts_train.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -56,11 +56,11 @@ continue_restore_path, _ = get_last_checkpoint(continue_path) out_wav_path = os.path.join(get_tests_output_path(), "output.wav") # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example.' --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}" diff --git a/tests/tts_tests/test_fast_pitch_speaker_emb_train.py b/tests/tts_tests/test_fast_pitch_speaker_emb_train.py index bfe4bae4..9553d745 100644 --- a/tests/tts_tests/test_fast_pitch_speaker_emb_train.py +++ b/tests/tts_tests/test_fast_pitch_speaker_emb_train.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -76,11 +76,11 @@ speaker_id = "ljspeech-1" continue_speakers_path = os.path.join(continue_path, "speakers.json") # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example.' --speaker_idx {speaker_id} --speakers_file_path {continue_speakers_path} --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}" diff --git a/tests/tts_tests/test_fast_pitch_train.py b/tests/tts_tests/test_fast_pitch_train.py index de30a6f4..134cd4ba 100644 --- a/tests/tts_tests/test_fast_pitch_train.py +++ b/tests/tts_tests/test_fast_pitch_train.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -75,11 +75,11 @@ continue_restore_path, _ = get_last_checkpoint(continue_path) out_wav_path = os.path.join(get_tests_output_path(), "output.wav") # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example.' --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}" diff --git a/tests/tts_tests/test_glow_tts_d-vectors_train.py b/tests/tts_tests/test_glow_tts_d-vectors_train.py index 3aa985a9..3a9c8fcc 100644 --- a/tests/tts_tests/test_glow_tts_d-vectors_train.py +++ b/tests/tts_tests/test_glow_tts_d-vectors_train.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -63,11 +63,11 @@ speaker_id = "ljspeech-1" continue_speakers_path = config.d_vector_file # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example.' --speaker_idx {speaker_id} --speakers_file_path {continue_speakers_path} --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}" diff --git a/tests/tts_tests/test_glow_tts_speaker_emb_train.py b/tests/tts_tests/test_glow_tts_speaker_emb_train.py index d33f1aa1..322b506e 100644 --- a/tests/tts_tests/test_glow_tts_speaker_emb_train.py +++ b/tests/tts_tests/test_glow_tts_speaker_emb_train.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -60,11 +60,11 @@ speaker_id = "ljspeech-1" continue_speakers_path = os.path.join(continue_path, "speakers.json") # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example.' --speaker_idx {speaker_id} --speakers_file_path {continue_speakers_path} --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}" diff --git a/tests/tts_tests/test_glow_tts_train.py b/tests/tts_tests/test_glow_tts_train.py index a254f3c6..cf9a04f4 100644 --- a/tests/tts_tests/test_glow_tts_train.py +++ b/tests/tts_tests/test_glow_tts_train.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -57,11 +57,11 @@ continue_restore_path, _ = get_last_checkpoint(continue_path) out_wav_path = os.path.join(get_tests_output_path(), "output.wav") # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example.' --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}" diff --git a/tests/tts_tests/test_speedy_speech_train.py b/tests/tts_tests/test_speedy_speech_train.py index dd0752ed..c4adcee3 100644 --- a/tests/tts_tests/test_speedy_speech_train.py +++ b/tests/tts_tests/test_speedy_speech_train.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -56,11 +56,11 @@ continue_restore_path, _ = get_last_checkpoint(continue_path) out_wav_path = os.path.join(get_tests_output_path(), "output.wav") # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example for it.' --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}" diff --git a/tests/tts_tests/test_tacotron2_d-vectors_train.py b/tests/tts_tests/test_tacotron2_d-vectors_train.py index 358f1143..0d02fa98 100644 --- a/tests/tts_tests/test_tacotron2_d-vectors_train.py +++ b/tests/tts_tests/test_tacotron2_d-vectors_train.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -63,11 +63,11 @@ speaker_id = "ljspeech-1" continue_speakers_path = config.d_vector_file # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example.' --speaker_idx {speaker_id} --speakers_file_path {continue_speakers_path} --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}" diff --git a/tests/tts_tests/test_tacotron2_speaker_emb_train.py b/tests/tts_tests/test_tacotron2_speaker_emb_train.py index 8c93b3ce..2e812d90 100644 --- a/tests/tts_tests/test_tacotron2_speaker_emb_train.py +++ b/tests/tts_tests/test_tacotron2_speaker_emb_train.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -61,11 +61,11 @@ speaker_id = "ljspeech-1" continue_speakers_path = os.path.join(continue_path, "speakers.json") # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example.' --speaker_idx {speaker_id} --speakers_file_path {continue_speakers_path} --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}" diff --git a/tests/tts_tests/test_tacotron2_train.py b/tests/tts_tests/test_tacotron2_train.py index c3529d22..d1941022 100644 --- a/tests/tts_tests/test_tacotron2_train.py +++ b/tests/tts_tests/test_tacotron2_train.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -56,11 +56,11 @@ continue_restore_path, _ = get_last_checkpoint(continue_path) out_wav_path = os.path.join(get_tests_output_path(), "output.wav") # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example.' --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}" diff --git a/tests/tts_tests/test_vits_multilingual_speaker_emb_train.py b/tests/tts_tests/test_vits_multilingual_speaker_emb_train.py index 96d9a7af..683bb0a7 100644 --- a/tests/tts_tests/test_vits_multilingual_speaker_emb_train.py +++ b/tests/tts_tests/test_vits_multilingual_speaker_emb_train.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -94,11 +94,11 @@ continue_speakers_path = os.path.join(continue_path, "speakers.json") continue_languages_path = os.path.join(continue_path, "language_ids.json") # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example.' --speaker_idx {speaker_id} --speakers_file_path {continue_speakers_path} --language_ids_file_path {continue_languages_path} --language_idx {languae_id} --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}" diff --git a/tests/tts_tests/test_vits_multilingual_train-d_vectors.py b/tests/tts_tests/test_vits_multilingual_train-d_vectors.py index 1ce70299..e4a82cdd 100644 --- a/tests/tts_tests/test_vits_multilingual_train-d_vectors.py +++ b/tests/tts_tests/test_vits_multilingual_train-d_vectors.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -101,11 +101,11 @@ continue_speakers_path = config.d_vector_file continue_languages_path = os.path.join(continue_path, "language_ids.json") # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example.' --speaker_idx {speaker_id} --speakers_file_path {continue_speakers_path} --language_ids_file_path {continue_languages_path} --language_idx {languae_id} --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}" diff --git a/tests/tts_tests/test_vits_speaker_emb_train.py b/tests/tts_tests/test_vits_speaker_emb_train.py index 2c958317..48597241 100644 --- a/tests/tts_tests/test_vits_speaker_emb_train.py +++ b/tests/tts_tests/test_vits_speaker_emb_train.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -67,11 +67,11 @@ speaker_id = "ljspeech-1" continue_speakers_path = os.path.join(continue_path, "speakers.json") # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example.' --speaker_idx {speaker_id} --speakers_file_path {continue_speakers_path} --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}" diff --git a/tests/tts_tests/test_vits_train.py b/tests/tts_tests/test_vits_train.py index 61af76ee..64ff63f3 100644 --- a/tests/tts_tests/test_vits_train.py +++ b/tests/tts_tests/test_vits_train.py @@ -1,7 +1,7 @@ import glob +import json import os import shutil -import json from trainer import get_last_checkpoint @@ -56,11 +56,11 @@ continue_restore_path, _ = get_last_checkpoint(continue_path) out_wav_path = os.path.join(get_tests_output_path(), "output.wav") # Check integrity of the config -with open(continue_config_path, "r") as f: +with open(continue_config_path, "r", encoding="utf-8") as f: config_loaded = json.load(f) -assert config_loaded['characters'] != None -assert config_loaded['output_path'] in continue_path -assert config_loaded['test_delay_epochs'] == 0 +assert config_loaded["characters"] is not None +assert config_loaded["output_path"] in continue_path +assert config_loaded["test_delay_epochs"] == 0 # Load the model and run inference inference_command = f"CUDA_VISIBLE_DEVICES='{get_device_id()}' tts --text 'This is an example.' --config_path {continue_config_path} --model_path {continue_restore_path} --out_path {out_wav_path}"