Fix rebase issues

TTS/bin/compute_embeddings.py

@@ -19,28 +19,11 @@ parser = argparse.ArgumentParser(
     formatter_class=RawTextHelpFormatter,
 )
 parser.add_argument("model_path", type=str, help="Path to model checkpoint file.")
-<<<<<<< HEAD
 parser.add_argument("config_path", type=str, help="Path to model config file.")
 parser.add_argument("config_dataset_path", type=str, help="Path to dataset config file.")
 parser.add_argument("--output_path", type=str, help="Path for output `pth` or `json` file.", default="speakers.pth")
 parser.add_argument("--old_file", type=str, help="Previous embedding file to only compute new audios.", default=None)
 parser.add_argument("--disable_cuda", type=bool, help="Flag to disable cuda.", default=False)
-=======
-parser.add_argument(
-    "config_path",
-    type=str,
-    help="Path to model config file.",
-)
-
-parser.add_argument(
-    "config_dataset_path",
-    type=str,
-    help="Path to dataset config file.",
-)
-parser.add_argument("output_path", type=str, help="path for output .json file.")
-parser.add_argument("--old_file", type=str, help="Previous .json file, only compute for new audios.", default=None)
-parser.add_argument("--use_cuda", type=bool, help="flag to set cuda.", default=False)
->>>>>>> Fix compute embeddings issue
 parser.add_argument("--no_eval", type=bool, help="Do not compute eval?. Default False", default=False)
 parser.add_argument(
     "--use_predicted_label", type=bool, help="If True and predicted label is available with will use it.", default=False

TTS/tts/models/vits.py

@@ -551,7 +551,7 @@ class VitsArgs(Coqpit):
     emotion_embedding_squeezer_input_dim: int = 0
     use_speaker_embedding_squeezer: bool = False
     speaker_embedding_squeezer_input_dim: int = 0
-    
+
     use_speaker_embedding_as_emotion: bool = False
 
     # prosody encoder