From a0f488136a91c7b3e6231b0198035c58199b403a Mon Sep 17 00:00:00 2001
From: erogol <erogol@hotmail.com>
Date: Fri, 17 Jul 2020 13:14:34 +0200
Subject: [PATCH] update imports for convert* scripts

---
 TTS/bin/compute_statistics.py            |  4 +--
 TTS/bin/convert_melgan_tflite.py         |  2 +-
 TTS/bin/convert_melgan_torch_to_tf.py    |  2 +-
 TTS/bin/convert_tacotron2_tflite.py      |  8 +++---
 TTS/bin/convert_tacotron2_torch_to_tf.py | 31 ++++++++++++++----------
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/TTS/bin/compute_statistics.py b/TTS/bin/compute_statistics.py
index 0227333d..1c6ef94d 100755
--- a/TTS/bin/compute_statistics.py
+++ b/TTS/bin/compute_statistics.py
@@ -8,8 +8,8 @@ import numpy as np
 from tqdm import tqdm
 
 from TTS.tts.datasets.preprocess import load_meta_data
-from TTS.tts.utils.io import load_config
-from TTS.tts.utils.audio import AudioProcessor
+from TTS.utils.io import load_config
+from TTS.utils.audio import AudioProcessor
 
 def main():
     """Run preprocessing process."""
diff --git a/TTS/bin/convert_melgan_tflite.py b/TTS/bin/convert_melgan_tflite.py
index 8f346784..9a652b57 100644
--- a/TTS/bin/convert_melgan_tflite.py
+++ b/TTS/bin/convert_melgan_tflite.py
@@ -2,7 +2,7 @@
 
 import argparse
 
-from TTS.tts.utils.io import load_config
+from TTS.utils.io import load_config
 from TTS.vocoder.tf.utils.generic_utils import setup_generator
 from TTS.vocoder.tf.utils.io import load_checkpoint
 from TTS.vocoder.tf.utils.tflite import convert_melgan_to_tflite
diff --git a/TTS/bin/convert_melgan_torch_to_tf.py b/TTS/bin/convert_melgan_torch_to_tf.py
index 8d0d3d4b..4c8515d9 100644
--- a/TTS/bin/convert_melgan_torch_to_tf.py
+++ b/TTS/bin/convert_melgan_torch_to_tf.py
@@ -6,7 +6,7 @@ import tensorflow as tf
 import torch
 from fuzzywuzzy import fuzz
 
-from TTS.tts.utils.io import load_config
+from TTS.utils.io import load_config
 from TTS.vocoder.tf.utils.convert_torch_to_tf_utils import (
     compare_torch_tf, convert_tf_name, transfer_weights_torch_to_tf)
 from TTS.vocoder.tf.utils.generic_utils import \
diff --git a/TTS/bin/convert_tacotron2_tflite.py b/TTS/bin/convert_tacotron2_tflite.py
index 5743691c..d69e1a75 100644
--- a/TTS/bin/convert_tacotron2_tflite.py
+++ b/TTS/bin/convert_tacotron2_tflite.py
@@ -2,11 +2,11 @@
 
 import argparse
 
-from TTS.tts.utils.io import load_config
+from TTS.utils.io import load_config
 from TTS.tts.utils.text.symbols import symbols, phonemes
-from TTS.tf.utils.generic_utils import setup_model
-from TTS.tf.utils.io import load_checkpoint
-from TTS.tf.utils.tflite import convert_tacotron2_to_tflite
+from TTS.tts.tf.utils.generic_utils import setup_model
+from TTS.tts.tf.utils.io import load_checkpoint
+from TTS.tts.tf.utils.tflite import convert_tacotron2_to_tflite
 
 
 parser = argparse.ArgumentParser()
diff --git a/TTS/bin/convert_tacotron2_torch_to_tf.py b/TTS/bin/convert_tacotron2_torch_to_tf.py
index 839f4e49..9c3d86c0 100644
--- a/TTS/bin/convert_tacotron2_torch_to_tf.py
+++ b/TTS/bin/convert_tacotron2_torch_to_tf.py
@@ -1,21 +1,29 @@
 # %%
-import sys
-sys.path.append('/home/erogol/Projects')
-import os
-os.environ['CUDA_VISIBLE_DEVICES'] = ''
 # %%
 import argparse
+import os
+import sys
+# %%
+# print variable match
+from pprint import pprint
+
 import numpy as np
-import torch
 import tensorflow as tf
+import torch
 from fuzzywuzzy import fuzz
 
-from TTS.tts.utils.text.symbols import phonemes, symbols
 from TTS.tts.utils.generic_utils import setup_model
-from TTS.tts.utils.io import load_config
-from TTS.tf.models.tacotron2 import Tacotron2
-from TTS.tf.utils.convert_torch_to_tf_utils import compare_torch_tf, tf_create_dummy_inputs, transfer_weights_torch_to_tf, convert_tf_name
-from TTS.tf.utils.generic_utils import save_checkpoint
+from TTS.tts.utils.text.symbols import phonemes, symbols
+from TTS.utils.io import load_config
+from TTS.tts.tf.models.tacotron2 import Tacotron2
+from TTS.tts.tf.utils.convert_torch_to_tf_utils import (
+    compare_torch_tf, convert_tf_name, tf_create_dummy_inputs,
+    transfer_weights_torch_to_tf)
+from TTS.tts.tf.utils.generic_utils import save_checkpoint
+
+sys.path.append('/home/erogol/Projects')
+os.environ['CUDA_VISIBLE_DEVICES'] = ''
+
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--torch_model_path',
@@ -108,9 +116,6 @@ for tf_name in tf_var_names:
     del torch_var_names[max_idx]
     var_map.append((tf_name, matching_name))
 
-# %%
-# print variable match
-from pprint import pprint
 pprint(var_map)
 pprint(torch_var_names)