rename utils.utils to utils.common

indextts/gpt/conformer_encoder.py

@@ -7,7 +7,7 @@ from gpt.conformer.subsampling import Conv2dSubsampling4, Conv2dSubsampling6, \
     Conv2dSubsampling8, LinearNoSubsampling, Conv2dSubsampling2
 from gpt.conformer.embedding import PositionalEncoding, RelPositionalEncoding, NoPositionalEncoding
 from gpt.conformer.attention import MultiHeadedAttention, RelPositionMultiHeadedAttention
-from utils.utils import make_pad_mask
+from utils.common import make_pad_mask
 
 
 class PositionwiseFeedForward(torch.nn.Module):

indextts/infer.py

@@ -5,7 +5,7 @@ import torch
 import torchaudio
 from omegaconf import OmegaConf
 import sentencepiece as spm
-from utils.utils import tokenize_by_CJK_char
+from utils.common import tokenize_by_CJK_char
 from utils.feature_extractors import MelSpectrogramFeatures
 from indextts.vqvae.xtts_dvae import DiscreteVAE
 from indextts.utils.checkpoint import load_checkpoint

indextts/utils/feature_extractors.py

@@ -1,7 +1,7 @@
 import torch
 import torchaudio
 from torch import nn
-from utils import safe_log
+from common import safe_log
 
 
 class FeatureExtractor(nn.Module):

webui.py

@@ -10,7 +10,6 @@ sys.path.append(os.path.join(current_dir, "indextts"))
 import gradio as gr
 from indextts.infer import IndexTTS
 from tools.i18n.i18n import I18nAuto
-from utils.webui_utils import next_page, prev_page
 
 i18n = I18nAuto(language="zh_CN")
 MODE = 'local'