From d96d55a8b4580985fe0ca89ace332a2e20db62fa Mon Sep 17 00:00:00 2001 From: James Betker Date: Thu, 19 May 2022 10:37:57 -0600 Subject: [PATCH] Fix faulty merge --- tortoise/read.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tortoise/read.py b/tortoise/read.py index 373e135..81b582b 100644 --- a/tortoise/read.py +++ b/tortoise/read.py @@ -19,14 +19,10 @@ if __name__ == '__main__': parser.add_argument('--preset', type=str, help='Which voice preset to use.', default='standard') parser.add_argument('--regenerate', type=str, help='Comma-separated list of clip numbers to re-generate, or nothing.', default=None) parser.add_argument('--model_dir', type=str, help='Where to find pretrained model checkpoints. Tortoise automatically downloads these to .models, so this' -<<<<<<< HEAD - 'should only be specified if you have custom checkpoints.', default='.models') + 'should only be specified if you have custom checkpoints.', default=MODELS_DIR) parser.add_argument('--seed', type=int, help='Random seed which can be used to reproduce results.', default=None) parser.add_argument('--produce_debug_state', type=bool, help='Whether or not to produce debug_state.pth, which can aid in reproducing problems. Defaults to true.', default=True) -======= - 'should only be specified if you have custom checkpoints.', default=MODELS_DIR) ->>>>>>> origin/main args = parser.parse_args() tts = TextToSpeech(models_dir=args.model_dir)