diff --git a/.pylintrc b/.pylintrc index 910a7a55..0bc0be4b 100644 --- a/.pylintrc +++ b/.pylintrc @@ -563,7 +563,7 @@ max-branches=12 max-locals=15 # Maximum number of parents for a class (see R0901). -max-parents=7 +max-parents=15 # Maximum number of public methods for a class (see R0904). max-public-methods=20 diff --git a/TTS/bin/train_encoder.py b/TTS/bin/train_encoder.py index 70c3033b..66ecddfe 100644 --- a/TTS/bin/train_encoder.py +++ b/TTS/bin/train_encoder.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -import argparse import os import sys import time diff --git a/TTS/bin/train_tacotron.py b/TTS/bin/train_tacotron.py index edf89858..9685d0d7 100755 --- a/TTS/bin/train_tacotron.py +++ b/TTS/bin/train_tacotron.py @@ -641,7 +641,7 @@ def main(args): # pylint: disable=redefined-outer-name except (KeyError, RuntimeError): print(" > Partial model initialization...") model_dict = model.state_dict() - model_dict = set_init_dict(model_dict, checkpoint["model"], c) + model_dict = set_init_dict(model_dict, checkpoint["model"], config) model.load_state_dict(model_dict) del model_dict @@ -687,7 +687,7 @@ def main(args): # pylint: disable=redefined-outer-name c_logger.print_epoch_start(epoch, config.epochs) # set gradual training if config.gradual_training is not None: - r, config.batch_size = gradual_training_scheduler(global_step, c) + r, config.batch_size = gradual_training_scheduler(global_step, config) config.r = r model.decoder.set_r(r) if config.bidirectional_decoder: diff --git a/TTS/config/shared_configs.py b/TTS/config/shared_configs.py index d9a4e06a..b10cc9bf 100644 --- a/TTS/config/shared_configs.py +++ b/TTS/config/shared_configs.py @@ -1,5 +1,4 @@ from dataclasses import asdict, dataclass -from typing import List, Union from coqpit import MISSING, Coqpit, check_argument diff --git a/TTS/server/server.py b/TTS/server/server.py index f6335c42..15a6b292 100644 --- a/TTS/server/server.py +++ b/TTS/server/server.py @@ -9,7 +9,7 @@ from typing import Union from flask import Flask, render_template, request, send_file -from TTS.utils.io import load_config +from TTS.config import load_config from TTS.utils.manage import ModelManager from TTS.utils.synthesizer import Synthesizer diff --git a/TTS/tts/configs/tacotron_config.py b/TTS/tts/configs/tacotron_config.py index 5c86f500..6f08e89f 100644 --- a/TTS/tts/configs/tacotron_config.py +++ b/TTS/tts/configs/tacotron_config.py @@ -1,8 +1,6 @@ -from dataclasses import asdict, dataclass +from dataclasses import dataclass from typing import List -from coqpit import check_argument - from .shared_configs import BaseTTSConfig, GSTConfig diff --git a/TTS/utils/generic_utils.py b/TTS/utils/generic_utils.py index 709b2340..a562e86f 100644 --- a/TTS/utils/generic_utils.py +++ b/TTS/utils/generic_utils.py @@ -8,7 +8,6 @@ import shutil import subprocess import sys from pathlib import Path -from typing import List import torch diff --git a/TTS/utils/io.py b/TTS/utils/io.py index b09a71d1..62d972f1 100644 --- a/TTS/utils/io.py +++ b/TTS/utils/io.py @@ -1,15 +1,7 @@ -import json import os import pickle as pickle_tts -import re from shutil import copyfile -import yaml - -from TTS.utils.generic_utils import find_module - -from .generic_utils import find_module - class RenamingUnpickler(pickle_tts.Unpickler): """Overload default pickler to solve module renaming problem""" diff --git a/TTS/vocoder/configs/fullband_melgan_config.py b/TTS/vocoder/configs/fullband_melgan_config.py index d206451f..7baa68ee 100644 --- a/TTS/vocoder/configs/fullband_melgan_config.py +++ b/TTS/vocoder/configs/fullband_melgan_config.py @@ -1,4 +1,4 @@ -from dataclasses import asdict, dataclass, field +from dataclasses import dataclass, field from .shared_configs import BaseGANVocoderConfig diff --git a/TTS/vocoder/configs/hifigan_config.py b/TTS/vocoder/configs/hifigan_config.py index 40b5fc26..cfbf5510 100644 --- a/TTS/vocoder/configs/hifigan_config.py +++ b/TTS/vocoder/configs/hifigan_config.py @@ -1,4 +1,4 @@ -from dataclasses import asdict, dataclass, field +from dataclasses import dataclass, field from .shared_configs import BaseGANVocoderConfig diff --git a/TTS/vocoder/configs/melgan_config.py b/TTS/vocoder/configs/melgan_config.py index f67c7d1e..cee64330 100644 --- a/TTS/vocoder/configs/melgan_config.py +++ b/TTS/vocoder/configs/melgan_config.py @@ -1,4 +1,4 @@ -from dataclasses import asdict, dataclass, field +from dataclasses import dataclass, field from .shared_configs import BaseGANVocoderConfig diff --git a/TTS/vocoder/configs/multiband_melgan_config.py b/TTS/vocoder/configs/multiband_melgan_config.py index f8a99152..98f1d353 100644 --- a/TTS/vocoder/configs/multiband_melgan_config.py +++ b/TTS/vocoder/configs/multiband_melgan_config.py @@ -1,4 +1,4 @@ -from dataclasses import asdict, dataclass, field +from dataclasses import dataclass, field from .shared_configs import BaseGANVocoderConfig diff --git a/TTS/vocoder/configs/parallel_wavegan_config.py b/TTS/vocoder/configs/parallel_wavegan_config.py index 79afa228..b8a489a3 100644 --- a/TTS/vocoder/configs/parallel_wavegan_config.py +++ b/TTS/vocoder/configs/parallel_wavegan_config.py @@ -1,4 +1,4 @@ -from dataclasses import asdict, dataclass, field +from dataclasses import dataclass, field from .shared_configs import BaseGANVocoderConfig diff --git a/TTS/vocoder/configs/shared_configs.py b/TTS/vocoder/configs/shared_configs.py index d403f84c..b335c36f 100644 --- a/TTS/vocoder/configs/shared_configs.py +++ b/TTS/vocoder/configs/shared_configs.py @@ -1,9 +1,8 @@ from dataclasses import dataclass, field -from typing import List from coqpit import MISSING -from TTS.config import BaseAudioConfig, BaseDatasetConfig, BaseTrainingConfig +from TTS.config import BaseAudioConfig, BaseTrainingConfig @dataclass diff --git a/TTS/vocoder/configs/wavegrad_config.py b/TTS/vocoder/configs/wavegrad_config.py index 7638988f..48e3aba2 100644 --- a/TTS/vocoder/configs/wavegrad_config.py +++ b/TTS/vocoder/configs/wavegrad_config.py @@ -1,4 +1,4 @@ -from dataclasses import asdict, dataclass, field +from dataclasses import dataclass, field from .shared_configs import BaseVocoderConfig diff --git a/TTS/vocoder/configs/wavernn_config.py b/TTS/vocoder/configs/wavernn_config.py index daa586f6..0b546a91 100644 --- a/TTS/vocoder/configs/wavernn_config.py +++ b/TTS/vocoder/configs/wavernn_config.py @@ -1,4 +1,4 @@ -from dataclasses import asdict, dataclass, field +from dataclasses import dataclass, field from .shared_configs import BaseVocoderConfig diff --git a/tests/test_loader.py b/tests/test_loader.py index 96bf5993..e2dba37a 100644 --- a/tests/test_loader.py +++ b/tests/test_loader.py @@ -6,7 +6,7 @@ import numpy as np import torch from torch.utils.data import DataLoader -from tests import get_tests_input_path, get_tests_output_path +from tests import get_tests_output_path from TTS.tts.configs import BaseTTSConfig from TTS.tts.datasets import TTSDataset from TTS.tts.datasets.preprocess import ljspeech diff --git a/tests/test_speaker_encoder.py b/tests/test_speaker_encoder.py index 3e8dd947..8939ccf6 100644 --- a/tests/test_speaker_encoder.py +++ b/tests/test_speaker_encoder.py @@ -1,4 +1,3 @@ -import os import unittest import torch as T diff --git a/tests/test_speaker_manager.py b/tests/test_speaker_manager.py index 9992dbc3..ffb98ed7 100644 --- a/tests/test_speaker_manager.py +++ b/tests/test_speaker_manager.py @@ -7,7 +7,6 @@ import torch from tests import get_tests_input_path from TTS.config import load_config from TTS.speaker_encoder.model import SpeakerEncoder -from TTS.speaker_encoder.speaker_encoder_config import SpeakerEncoderConfig from TTS.speaker_encoder.utils.io import save_checkpoint from TTS.tts.utils.speakers import SpeakerManager from TTS.utils.audio import AudioProcessor diff --git a/tests/test_synthesize.py b/tests/test_synthesize.py index ec15cb45..526f7dc8 100644 --- a/tests/test_synthesize.py +++ b/tests/test_synthesize.py @@ -1,6 +1,6 @@ import os -from tests import get_device_id, get_tests_output_path, run_cli +from tests import get_tests_output_path, run_cli def test_synthesize(): diff --git a/tests/test_synthesizer.py b/tests/test_synthesizer.py index 9507e4f8..a1cd4de5 100644 --- a/tests/test_synthesizer.py +++ b/tests/test_synthesizer.py @@ -1,7 +1,7 @@ import os import unittest -from tests import get_tests_input_path, get_tests_output_path +from tests import get_tests_output_path from TTS.config import load_config from TTS.tts.utils.generic_utils import setup_model from TTS.tts.utils.io import save_checkpoint diff --git a/tests/test_text_processing.py b/tests/test_text_processing.py index 9d9bfafe..711021ab 100644 --- a/tests/test_text_processing.py +++ b/tests/test_text_processing.py @@ -1,9 +1,6 @@ -import os - # pylint: disable=unused-wildcard-import # pylint: disable=wildcard-import # pylint: disable=unused-import -from tests import get_tests_input_path, get_tests_path from TTS.tts.configs import TacotronConfig from TTS.tts.utils.text import * diff --git a/tests/vocoder_tests/test_vocoder_wavernn_datasets.py b/tests/vocoder_tests/test_vocoder_wavernn_datasets.py index 588f529f..503b4e24 100644 --- a/tests/vocoder_tests/test_vocoder_wavernn_datasets.py +++ b/tests/vocoder_tests/test_vocoder_wavernn_datasets.py @@ -4,7 +4,7 @@ import shutil import numpy as np from torch.utils.data import DataLoader -from tests import get_tests_input_path, get_tests_output_path, get_tests_path +from tests import get_tests_output_path, get_tests_path from TTS.utils.audio import AudioProcessor from TTS.vocoder.configs import WavernnConfig from TTS.vocoder.datasets.preprocess import load_wav_feat_data, preprocess_wav_files