Skip to content

Commit

Permalink
Fix faulty merge
Browse files Browse the repository at this point in the history
  • Loading branch information
neonbjb committed May 19, 2022
1 parent 1a8c9f7 commit f4bd9c4
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions tortoise/read.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,10 @@
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)

Expand Down

0 comments on commit f4bd9c4

Please sign in to comment.