From f880641eb5e82508b2a801014e859bf71c52e0c8 Mon Sep 17 00:00:00 2001 From: tsukumi Date: Wed, 6 Mar 2024 22:29:12 +0000 Subject: [PATCH] Remove: modules under common/ that have been rewritten --- app.py | 8 ++++---- attentions.py | 2 +- bert_gen.py | 4 ++-- common/constants.py | 28 ---------------------------- common/log.py | 17 ----------------- common/stdout_wrapper.py | 40 ---------------------------------------- config.py | 2 +- data_utils.py | 2 +- default_style.py | 4 ++-- infer.py | 2 +- initialize.py | 2 +- losses.py | 2 +- preprocess_text.py | 4 ++-- resample.py | 4 ++-- server_fastapi.py | 4 ++-- slice.py | 4 ++-- speech_mos.py | 2 +- style_gen.py | 4 ++-- text/japanese.py | 2 +- train_ms.py | 4 ++-- train_ms_jp_extra.py | 4 ++-- transcribe.py | 6 +++--- utils.py | 2 +- webui_dataset.py | 4 ++-- webui_merge.py | 4 ++-- webui_style_vectors.py | 4 ++-- webui_train.py | 8 ++++---- 27 files changed, 44 insertions(+), 129 deletions(-) delete mode 100644 common/constants.py delete mode 100644 common/log.py delete mode 100644 common/stdout_wrapper.py diff --git a/app.py b/app.py index 1514444..acdb646 100644 --- a/app.py +++ b/app.py @@ -10,7 +10,7 @@ import gradio as gr import torch import yaml -from common.constants import ( +from style_bert_vits2.constants import ( DEFAULT_ASSIST_TEXT_WEIGHT, DEFAULT_LENGTH, DEFAULT_LINE_SPLIT, @@ -21,10 +21,10 @@ from common.constants import ( DEFAULT_STYLE, DEFAULT_STYLE_WEIGHT, GRADIO_THEME, - LATEST_VERSION, + VERSION, Languages, ) -from common.log import logger +from style_bert_vits2.logging import logger from common.tts_model import ModelHolder from infer import InvalidToneError from text.japanese import g2kata_tone, kata_tone2phone_tone, text_normalize @@ -202,7 +202,7 @@ examples = [ ] initial_md = f""" -# Style-Bert-VITS2 ver {LATEST_VERSION} 音声合成 +# Style-Bert-VITS2 ver {VERSION} 音声合成 - Ver 2.3で追加されたエディターのほうが実際に読み上げさせるには使いやすいかもしれません。`Editor.bat`か`python server_editor.py`で起動できます。 diff --git a/attentions.py b/attentions.py index 87a7f08..1cca086 100644 --- a/attentions.py +++ b/attentions.py @@ -4,7 +4,7 @@ from torch import nn from torch.nn import functional as F from style_bert_vits2.models import commons -from common.log import logger as logging +from style_bert_vits2.logging import logger as logging class LayerNorm(nn.Module): diff --git a/bert_gen.py b/bert_gen.py index 70af9fd..fd0b54e 100644 --- a/bert_gen.py +++ b/bert_gen.py @@ -7,8 +7,8 @@ from tqdm import tqdm from style_bert_vits2.models import commons import utils -from common.log import logger -from common.stdout_wrapper import SAFE_STDOUT +from style_bert_vits2.logging import logger +from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT from config import config from text import cleaned_text_to_sequence, get_bert diff --git a/common/constants.py b/common/constants.py deleted file mode 100644 index fe62019..0000000 --- a/common/constants.py +++ /dev/null @@ -1,28 +0,0 @@ -import enum - -# Built-in theme: "default", "base", "monochrome", "soft", "glass" -# See https://huggingface.co/spaces/gradio/theme-gallery for more themes -GRADIO_THEME: str = "NoCrypt/miku" - -LATEST_VERSION: str = "2.3.1" - -USER_DICT_DIR = "dict_data" - -DEFAULT_STYLE: str = "Neutral" -DEFAULT_STYLE_WEIGHT: float = 5.0 - - -class Languages(str, enum.Enum): - JP = "JP" - EN = "EN" - ZH = "ZH" - - -DEFAULT_SDP_RATIO: float = 0.2 -DEFAULT_NOISE: float = 0.6 -DEFAULT_NOISEW: float = 0.8 -DEFAULT_LENGTH: float = 1.0 -DEFAULT_LINE_SPLIT: bool = True -DEFAULT_SPLIT_INTERVAL: float = 0.5 -DEFAULT_ASSIST_TEXT_WEIGHT: float = 0.7 -DEFAULT_ASSIST_TEXT_WEIGHT: float = 1.0 diff --git a/common/log.py b/common/log.py deleted file mode 100644 index 679bb2c..0000000 --- a/common/log.py +++ /dev/null @@ -1,17 +0,0 @@ -""" -logger封装 -""" - -from loguru import logger - -from .stdout_wrapper import SAFE_STDOUT - -# 移除所有默认的处理器 -logger.remove() - -# 自定义格式并添加到标准输出 -log_format = ( - "{time:MM-DD HH:mm:ss} |{level:^8}| {file}:{line} | {message}" -) - -logger.add(SAFE_STDOUT, format=log_format, backtrace=True, diagnose=True) diff --git a/common/stdout_wrapper.py b/common/stdout_wrapper.py deleted file mode 100644 index 192f908..0000000 --- a/common/stdout_wrapper.py +++ /dev/null @@ -1,40 +0,0 @@ -""" -`sys.stdout` wrapper for both Google Colab and local environment. -""" - -import sys -import tempfile - - -class StdoutWrapper: - def __init__(self): - self.temp_file = tempfile.NamedTemporaryFile( - mode="w+", delete=False, encoding="utf-8" - ) - self.original_stdout = sys.stdout - - def write(self, message: str): - self.temp_file.write(message) - self.temp_file.flush() - print(message, end="", file=self.original_stdout) - - def flush(self): - self.temp_file.flush() - - def read(self): - self.temp_file.seek(0) - return self.temp_file.read() - - def close(self): - self.temp_file.close() - - def fileno(self): - return self.temp_file.fileno() - - -try: - import google.colab - - SAFE_STDOUT = StdoutWrapper() -except ImportError: - SAFE_STDOUT = sys.stdout diff --git a/config.py b/config.py index 056e7f1..6369e6b 100644 --- a/config.py +++ b/config.py @@ -9,7 +9,7 @@ from typing import Dict, List import torch import yaml -from common.log import logger +from style_bert_vits2.logging import logger # If not cuda available, set possible devices to cpu cuda_available = torch.cuda.is_available() diff --git a/data_utils.py b/data_utils.py index 81c0ade..1118102 100644 --- a/data_utils.py +++ b/data_utils.py @@ -11,7 +11,7 @@ from style_bert_vits2.models import commons from config import config from mel_processing import mel_spectrogram_torch, spectrogram_torch from text import cleaned_text_to_sequence -from common.log import logger +from style_bert_vits2.logging import logger from utils import load_filepaths_and_text, load_wav_to_torch """Multi speaker version""" diff --git a/default_style.py b/default_style.py index 9198ca8..763e291 100644 --- a/default_style.py +++ b/default_style.py @@ -1,6 +1,6 @@ import os -from common.log import logger -from common.constants import DEFAULT_STYLE +from style_bert_vits2.logging import logger +from style_bert_vits2.constants import DEFAULT_STYLE import numpy as np import json diff --git a/infer.py b/infer.py index b976486..525219d 100644 --- a/infer.py +++ b/infer.py @@ -7,7 +7,7 @@ from models_jp_extra import SynthesizerTrn as SynthesizerTrnJPExtra from text import cleaned_text_to_sequence, get_bert from text.cleaner import clean_text from text.symbols import symbols -from common.log import logger +from style_bert_vits2.logging import logger class InvalidToneError(ValueError): diff --git a/initialize.py b/initialize.py index 5e35061..927a91a 100644 --- a/initialize.py +++ b/initialize.py @@ -5,7 +5,7 @@ from pathlib import Path import yaml from huggingface_hub import hf_hub_download -from common.log import logger +from style_bert_vits2.logging import logger def download_bert_models(): diff --git a/losses.py b/losses.py index 763cc02..4a890ba 100644 --- a/losses.py +++ b/losses.py @@ -2,7 +2,7 @@ import torch import torchaudio from transformers import AutoModel -from common.log import logger +from style_bert_vits2.logging import logger def feature_loss(fmap_r, fmap_g): diff --git a/preprocess_text.py b/preprocess_text.py index b3aaa17..126ba2c 100644 --- a/preprocess_text.py +++ b/preprocess_text.py @@ -7,8 +7,8 @@ from typing import Optional import click from tqdm import tqdm -from common.log import logger -from common.stdout_wrapper import SAFE_STDOUT +from style_bert_vits2.logging import logger +from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT from config import config from text.cleaner import clean_text diff --git a/resample.py b/resample.py index 5aff5ef..7001af6 100644 --- a/resample.py +++ b/resample.py @@ -7,8 +7,8 @@ import pyloudnorm as pyln import soundfile from tqdm import tqdm -from common.log import logger -from common.stdout_wrapper import SAFE_STDOUT +from style_bert_vits2.logging import logger +from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT from config import config DEFAULT_BLOCK_SIZE: float = 0.400 # seconds diff --git a/server_fastapi.py b/server_fastapi.py index ce6ed04..132cc17 100644 --- a/server_fastapi.py +++ b/server_fastapi.py @@ -20,7 +20,7 @@ from fastapi.middleware.cors import CORSMiddleware from fastapi.responses import FileResponse, Response from scipy.io import wavfile -from common.constants import ( +from style_bert_vits2.constants import ( DEFAULT_ASSIST_TEXT_WEIGHT, DEFAULT_LENGTH, DEFAULT_LINE_SPLIT, @@ -32,7 +32,7 @@ from common.constants import ( DEFAULT_STYLE_WEIGHT, Languages, ) -from common.log import logger +from style_bert_vits2.logging import logger from common.tts_model import Model, ModelHolder from config import config diff --git a/slice.py b/slice.py index 2d56427..c69f8bf 100644 --- a/slice.py +++ b/slice.py @@ -8,8 +8,8 @@ import torch import yaml from tqdm import tqdm -from common.log import logger -from common.stdout_wrapper import SAFE_STDOUT +from style_bert_vits2.logging import logger +from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT vad_model, utils = torch.hub.load( repo_or_dir="snakers4/silero-vad", diff --git a/speech_mos.py b/speech_mos.py index d69a23a..15cccef 100644 --- a/speech_mos.py +++ b/speech_mos.py @@ -10,7 +10,7 @@ import pandas as pd import torch from tqdm import tqdm -from common.log import logger +from style_bert_vits2.logging import logger from common.tts_model import Model from config import config diff --git a/style_gen.py b/style_gen.py index 97a0aee..1c1f034 100644 --- a/style_gen.py +++ b/style_gen.py @@ -7,8 +7,8 @@ import torch from tqdm import tqdm import utils -from common.log import logger -from common.stdout_wrapper import SAFE_STDOUT +from style_bert_vits2.logging import logger +from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT from config import config warnings.filterwarnings("ignore", category=UserWarning) diff --git a/text/japanese.py b/text/japanese.py index 47b21c5..12dc349 100644 --- a/text/japanese.py +++ b/text/japanese.py @@ -8,7 +8,7 @@ import pyopenjtalk from num2words import num2words from transformers import AutoTokenizer -from common.log import logger +from style_bert_vits2.logging import logger from text import punctuation from text.japanese_mora_list import ( mora_kata_to_mora_phonemes, diff --git a/train_ms.py b/train_ms.py index 0631ffe..3e9e707 100644 --- a/train_ms.py +++ b/train_ms.py @@ -18,8 +18,8 @@ from tqdm import tqdm from style_bert_vits2.models import commons import default_style import utils -from common.log import logger -from common.stdout_wrapper import SAFE_STDOUT +from style_bert_vits2.logging import logger +from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT from config import config from data_utils import ( DistributedBucketSampler, diff --git a/train_ms_jp_extra.py b/train_ms_jp_extra.py index aa5925b..9a964c3 100644 --- a/train_ms_jp_extra.py +++ b/train_ms_jp_extra.py @@ -18,8 +18,8 @@ from huggingface_hub import HfApi from style_bert_vits2.models import commons import default_style import utils -from common.log import logger -from common.stdout_wrapper import SAFE_STDOUT +from style_bert_vits2.logging import logger +from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT from config import config from data_utils import ( DistributedBucketSampler, diff --git a/transcribe.py b/transcribe.py index b3f9014..18509c9 100644 --- a/transcribe.py +++ b/transcribe.py @@ -7,9 +7,9 @@ import yaml from faster_whisper import WhisperModel from tqdm import tqdm -from common.constants import Languages -from common.log import logger -from common.stdout_wrapper import SAFE_STDOUT +from style_bert_vits2.constants import Languages +from style_bert_vits2.logging import logger +from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT def transcribe(wav_path: Path, initial_prompt=None, language="ja"): diff --git a/utils.py b/utils.py index ca194bf..80dfa66 100644 --- a/utils.py +++ b/utils.py @@ -13,7 +13,7 @@ from safetensors import safe_open from safetensors.torch import save_file from scipy.io.wavfile import read -from common.log import logger +from style_bert_vits2.logging import logger MATPLOTLIB_FLAG = False diff --git a/webui_dataset.py b/webui_dataset.py index fec7a9a..169cc4d 100644 --- a/webui_dataset.py +++ b/webui_dataset.py @@ -4,8 +4,8 @@ import os import gradio as gr import yaml -from common.constants import GRADIO_THEME -from common.log import logger +from style_bert_vits2.constants import GRADIO_THEME +from style_bert_vits2.logging import logger from common.subprocess_utils import run_script_with_log # Get path settings diff --git a/webui_merge.py b/webui_merge.py index a58471a..0a39902 100644 --- a/webui_merge.py +++ b/webui_merge.py @@ -11,8 +11,8 @@ import yaml from safetensors import safe_open from safetensors.torch import save_file -from common.constants import DEFAULT_STYLE, GRADIO_THEME -from common.log import logger +from style_bert_vits2.constants import DEFAULT_STYLE, GRADIO_THEME +from style_bert_vits2.logging import logger from common.tts_model import Model, ModelHolder voice_keys = ["dec"] diff --git a/webui_style_vectors.py b/webui_style_vectors.py index b89c9c9..cf53ca2 100644 --- a/webui_style_vectors.py +++ b/webui_style_vectors.py @@ -12,8 +12,8 @@ from sklearn.cluster import DBSCAN, AgglomerativeClustering, KMeans from sklearn.manifold import TSNE from umap import UMAP -from common.constants import DEFAULT_STYLE, GRADIO_THEME -from common.log import logger +from style_bert_vits2.constants import DEFAULT_STYLE, GRADIO_THEME +from style_bert_vits2.logging import logger from config import config # Get path settings diff --git a/webui_train.py b/webui_train.py index 59cc9f5..0f272e8 100644 --- a/webui_train.py +++ b/webui_train.py @@ -14,9 +14,9 @@ from pathlib import Path import gradio as gr import yaml -from common.constants import GRADIO_THEME, LATEST_VERSION -from common.log import logger -from common.stdout_wrapper import SAFE_STDOUT +from style_bert_vits2.constants import GRADIO_THEME, VERSION +from style_bert_vits2.logging import logger +from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT from common.subprocess_utils import run_script_with_log, second_elem_of logger_handler = None @@ -399,7 +399,7 @@ def run_tensorboard(model_name): initial_md = f""" -# Style-Bert-VITS2 ver {LATEST_VERSION} 学習用WebUI +# Style-Bert-VITS2 ver {VERSION} 学習用WebUI ## 使い方