From 67ff3105c1a7065971319bf71cebe1fef4478b75 Mon Sep 17 00:00:00 2001
From: tsukumi <tsukumijima@users.noreply.github.com>
Date: Fri, 8 Mar 2024 09:40:27 +0000
Subject: [PATCH] Refactor: moved utils.py to style_bert_vits2/models/

---
 bert_gen.py                                  | 2 +-
 data_utils.py                                | 2 +-
 style_bert_vits2/models/infer.py             | 2 +-
 utils.py => style_bert_vits2/models/utils.py | 0
 style_bert_vits2/tts_model.py                | 2 +-
 style_gen.py                                 | 2 +-
 train_ms.py                                  | 2 +-
 train_ms_jp_extra.py                         | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename utils.py => style_bert_vits2/models/utils.py (100%)

diff --git a/bert_gen.py b/bert_gen.py
index 26df64d..0935929 100644
--- a/bert_gen.py
+++ b/bert_gen.py
@@ -5,10 +5,10 @@ import torch
 import torch.multiprocessing as mp
 from tqdm import tqdm
 
-import utils
 from config import config
 from style_bert_vits2.logging import logger
 from style_bert_vits2.models import commons
+from style_bert_vits2.models import utils
 from style_bert_vits2.nlp import cleaned_text_to_sequence, extract_bert_feature
 from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT
 
diff --git a/data_utils.py b/data_utils.py
index 460c15f..99da2e4 100644
--- a/data_utils.py
+++ b/data_utils.py
@@ -9,9 +9,9 @@ from tqdm import tqdm
 
 from config import config
 from mel_processing import mel_spectrogram_torch, spectrogram_torch
-from utils import load_filepaths_and_text, load_wav_to_torch
 from style_bert_vits2.logging import logger
 from style_bert_vits2.models import commons
+from style_bert_vits2.models.utils import load_filepaths_and_text, load_wav_to_torch
 from style_bert_vits2.nlp import cleaned_text_to_sequence
 
 """Multi speaker version"""
diff --git a/style_bert_vits2/models/infer.py b/style_bert_vits2/models/infer.py
index 9265eee..7394d0b 100644
--- a/style_bert_vits2/models/infer.py
+++ b/style_bert_vits2/models/infer.py
@@ -1,10 +1,10 @@
 import torch
 from typing import Optional
 
-import utils
 from style_bert_vits2.constants import Languages
 from style_bert_vits2.logging import logger
 from style_bert_vits2.models import commons
+from style_bert_vits2.models import utils
 from style_bert_vits2.models.models import SynthesizerTrn
 from style_bert_vits2.models.models_jp_extra import SynthesizerTrn as SynthesizerTrnJPExtra
 from style_bert_vits2.nlp import clean_text, cleaned_text_to_sequence, extract_bert_feature
diff --git a/utils.py b/style_bert_vits2/models/utils.py
similarity index 100%
rename from utils.py
rename to style_bert_vits2/models/utils.py
diff --git a/style_bert_vits2/tts_model.py b/style_bert_vits2/tts_model.py
index a5901e1..bf04fe2 100644
--- a/style_bert_vits2/tts_model.py
+++ b/style_bert_vits2/tts_model.py
@@ -7,7 +7,6 @@ import numpy as np
 import torch
 from gradio.processing_utils import convert_to_16_bit_wav
 
-import utils
 from style_bert_vits2.constants import (
     DEFAULT_ASSIST_TEXT_WEIGHT,
     DEFAULT_LENGTH,
@@ -19,6 +18,7 @@ from style_bert_vits2.constants import (
     DEFAULT_STYLE,
     DEFAULT_STYLE_WEIGHT,
 )
+from style_bert_vits2.models import utils
 from style_bert_vits2.models.infer import get_net_g, infer
 from style_bert_vits2.models.models import SynthesizerTrn
 from style_bert_vits2.models.models_jp_extra import SynthesizerTrn as SynthesizerTrnJPExtra
diff --git a/style_gen.py b/style_gen.py
index 1c1f034..d7f692f 100644
--- a/style_gen.py
+++ b/style_gen.py
@@ -6,8 +6,8 @@ import numpy as np
 import torch
 from tqdm import tqdm
 
-import utils
 from style_bert_vits2.logging import logger
+from style_bert_vits2.models import utils
 from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT
 from config import config
 
diff --git a/train_ms.py b/train_ms.py
index 0cb7a82..977b393 100644
--- a/train_ms.py
+++ b/train_ms.py
@@ -15,7 +15,6 @@ from tqdm import tqdm
 
 # logging.getLogger("numba").setLevel(logging.WARNING)
 import default_style
-import utils
 from config import config
 from data_utils import (
     DistributedBucketSampler,
@@ -26,6 +25,7 @@ from losses import discriminator_loss, feature_loss, generator_loss, kl_loss
 from mel_processing import mel_spectrogram_torch, spec_to_mel_torch
 from style_bert_vits2.logging import logger
 from style_bert_vits2.models import commons
+from style_bert_vits2.models import utils
 from style_bert_vits2.models.models import (
     DurationDiscriminator,
     MultiPeriodDiscriminator,
diff --git a/train_ms_jp_extra.py b/train_ms_jp_extra.py
index 7d0636b..3b1c01a 100644
--- a/train_ms_jp_extra.py
+++ b/train_ms_jp_extra.py
@@ -15,7 +15,6 @@ from tqdm import tqdm
 
 # logging.getLogger("numba").setLevel(logging.WARNING)
 import default_style
-import utils
 from config import config
 from data_utils import (
     DistributedBucketSampler,
@@ -26,6 +25,7 @@ from losses import WavLMLoss, discriminator_loss, feature_loss, generator_loss,
 from mel_processing import mel_spectrogram_torch, spec_to_mel_torch
 from style_bert_vits2.logging import logger
 from style_bert_vits2.models import commons
+from style_bert_vits2.models import utils
 from style_bert_vits2.models.models_jp_extra import (
     DurationDiscriminator,
     MultiPeriodDiscriminator,