refactor: import get_last_checkpoint from trainer.io

TTS/bin/compute_attention_masks.py

@@ -80,7 +80,7 @@ Example run:
     num_chars = len(phonemes) if C.use_phonemes else len(symbols)
     # TODO: handle multi-speaker
     model = setup_model(C)
-    model, _ = load_checkpoint(model, args.model_path, args.use_cuda, True)
+    model, _ = load_checkpoint(model, args.model_path, use_cuda=args.use_cuda, eval=True)
 
     # data loader
     preprocessor = importlib.import_module("TTS.tts.datasets.formatters")

TTS/encoder/utils/training.py

@@ -2,9 +2,9 @@ import os
 from dataclasses import dataclass, field
 
 from coqpit import Coqpit
-from trainer import TrainerArgs, get_last_checkpoint
+from trainer import TrainerArgs
 from trainer.generic_utils import get_experiment_folder_path, get_git_branch
-from trainer.io import copy_model_files
+from trainer.io import copy_model_files, get_last_checkpoint
 from trainer.logging import logger_factory
 from trainer.logging.console_logger import ConsoleLogger
 

tests/tts_tests/test_neuralhmm_tts_train.py

@@ -4,7 +4,7 @@ import os
 import shutil
 
 import torch
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.neuralhmm_tts_config import NeuralhmmTTSConfig

tests/tts_tests/test_overflow_train.py

@@ -4,7 +4,7 @@ import os
 import shutil
 
 import torch
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.overflow_config import OverflowConfig

tests/tts_tests/test_speedy_speech_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.speedy_speech_config import SpeedySpeechConfig

tests/tts_tests/test_tacotron2_d-vectors_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.tacotron2_config import Tacotron2Config

tests/tts_tests/test_tacotron2_speaker_emb_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.tacotron2_config import Tacotron2Config

tests/tts_tests/test_tacotron2_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.tacotron2_config import Tacotron2Config

tests/tts_tests/test_tacotron_train.py

@@ -2,7 +2,7 @@ import glob
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.tacotron_config import TacotronConfig

tests/tts_tests/test_vits_multilingual_speaker_emb_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.config.shared_configs import BaseDatasetConfig

tests/tts_tests/test_vits_multilingual_train-d_vectors.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.config.shared_configs import BaseDatasetConfig

tests/tts_tests/test_vits_speaker_emb_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.vits_config import VitsConfig

tests/tts_tests/test_vits_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.vits_config import VitsConfig

tests/tts_tests2/test_align_tts_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.align_tts_config import AlignTTSConfig

tests/tts_tests2/test_delightful_tts_d-vectors_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.delightful_tts_config import DelightfulTtsAudioConfig, DelightfulTTSConfig

tests/tts_tests2/test_delightful_tts_emb_spk.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.delightful_tts_config import DelightfulTtsAudioConfig, DelightfulTTSConfig

tests/tts_tests2/test_delightful_tts_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.config.shared_configs import BaseAudioConfig

tests/tts_tests2/test_fast_pitch_speaker_emb_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.config.shared_configs import BaseAudioConfig

tests/tts_tests2/test_fast_pitch_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.config.shared_configs import BaseAudioConfig

tests/tts_tests2/test_fastspeech_2_speaker_emb_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.config.shared_configs import BaseAudioConfig

tests/tts_tests2/test_fastspeech_2_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.config.shared_configs import BaseAudioConfig

tests/tts_tests2/test_glow_tts_d-vectors_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.glow_tts_config import GlowTTSConfig

tests/tts_tests2/test_glow_tts_speaker_emb_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.glow_tts_config import GlowTTSConfig

tests/tts_tests2/test_glow_tts_train.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 
-from trainer import get_last_checkpoint
+from trainer.io import get_last_checkpoint
 
 from tests import get_device_id, get_tests_output_path, run_cli
 from TTS.tts.configs.glow_tts_config import GlowTTSConfig