diff --git a/mozilla_voice_tts/bin/train_vocoder.py b/mozilla_voice_tts/bin/train_vocoder.py index 8db77cf2..5d87f6bc 100644 --- a/mozilla_voice_tts/bin/train_vocoder.py +++ b/mozilla_voice_tts/bin/train_vocoder.py @@ -28,8 +28,7 @@ from mozilla_voice_tts.vocoder.datasets.preprocess import (load_wav_data, # init_distributed, reduce_tensor) from mozilla_voice_tts.vocoder.layers.losses import (DiscriminatorLoss, GeneratorLoss) -from mozilla_voice_tts.vocoder.utils.generic_utils import (check_config, - plot_results, +from mozilla_voice_tts.vocoder.utils.generic_utils import (plot_results, setup_discriminator, setup_generator) from mozilla_voice_tts.vocoder.utils.io import save_best_model, save_checkpoint @@ -622,7 +621,7 @@ if __name__ == '__main__': # setup output paths and read configs c = load_config(args.config_path) - check_config(c) + # check_config(c) _ = os.path.dirname(os.path.realpath(__file__)) OUT_PATH = args.continue_path diff --git a/mozilla_voice_tts/vocoder/utils/generic_utils.py b/mozilla_voice_tts/vocoder/utils/generic_utils.py index c6df4ca8..7ab1baec 100644 --- a/mozilla_voice_tts/vocoder/utils/generic_utils.py +++ b/mozilla_voice_tts/vocoder/utils/generic_utils.py @@ -145,5 +145,7 @@ def setup_discriminator(c): ) return model + # def check_config(c): - # pass +# c = None +# pass diff --git a/run_tests.sh b/run_tests.sh index 9dd471b8..27f54b24 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -1,12 +1,12 @@ TF_CPP_MIN_LOG_LEVEL=3 # tests -nosetests tests -x +nosetests tests -x &&\ # runtime tests -./tests/test_server_package.sh -./tests/test_tts_train.sh -./tests/test_vocoder_train.sh +./tests/test_server_package.sh && \ +./tests/test_tts_train.sh && \ +./tests/test_vocoder_train.sh && \ # linter check cardboardlinter --refspec master \ No newline at end of file