refactor: import get_last_checkpoint from trainer.io

idiap · Nov 27, 2024 · ba147fe · ba147fe
1 parent 170d3da
commit ba147fe
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 24 deletions.
diff --git a/TTS/encoder/utils/training.py b/TTS/encoder/utils/training.py
@@ -2,9 +2,9 @@
 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
 

diff --git a/tests/tts_tests/test_neuralhmm_tts_train.py b/tests/tts_tests/test_neuralhmm_tts_train.py
@@ -4,7 +4,7 @@
 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

diff --git a/tests/tts_tests/test_overflow_train.py b/tests/tts_tests/test_overflow_train.py
@@ -4,7 +4,7 @@
 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

diff --git a/tests/tts_tests/test_speedy_speech_train.py b/tests/tts_tests/test_speedy_speech_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests/test_tacotron2_d-vectors_train.py b/tests/tts_tests/test_tacotron2_d-vectors_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests/test_tacotron2_speaker_emb_train.py b/tests/tts_tests/test_tacotron2_speaker_emb_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests/test_tacotron2_train.py b/tests/tts_tests/test_tacotron2_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests/test_tacotron_train.py b/tests/tts_tests/test_tacotron_train.py
@@ -2,7 +2,7 @@
 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

diff --git a/tests/tts_tests/test_vits_multilingual_speaker_emb_train.py b/tests/tts_tests/test_vits_multilingual_speaker_emb_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests/test_vits_multilingual_train-d_vectors.py b/tests/tts_tests/test_vits_multilingual_train-d_vectors.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests/test_vits_speaker_emb_train.py b/tests/tts_tests/test_vits_speaker_emb_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests/test_vits_train.py b/tests/tts_tests/test_vits_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests2/test_align_tts_train.py b/tests/tts_tests2/test_align_tts_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests2/test_delightful_tts_d-vectors_train.py b/tests/tts_tests2/test_delightful_tts_d-vectors_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests2/test_delightful_tts_emb_spk.py b/tests/tts_tests2/test_delightful_tts_emb_spk.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests2/test_delightful_tts_train.py b/tests/tts_tests2/test_delightful_tts_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests2/test_fast_pitch_speaker_emb_train.py b/tests/tts_tests2/test_fast_pitch_speaker_emb_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests2/test_fast_pitch_train.py b/tests/tts_tests2/test_fast_pitch_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests2/test_fastspeech_2_speaker_emb_train.py b/tests/tts_tests2/test_fastspeech_2_speaker_emb_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests2/test_fastspeech_2_train.py b/tests/tts_tests2/test_fastspeech_2_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests2/test_glow_tts_d-vectors_train.py b/tests/tts_tests2/test_glow_tts_d-vectors_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests2/test_glow_tts_speaker_emb_train.py b/tests/tts_tests2/test_glow_tts_speaker_emb_train.py
@@ -3,7 +3,7 @@
 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

diff --git a/tests/tts_tests2/test_glow_tts_train.py b/tests/tts_tests2/test_glow_tts_train.py
@@ -3,7 +3,7 @@
 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