From dace5a6f99941c753ce185ae261d2ebe9aeabbe1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 2 Sep 2023 11:50:52 +0800 Subject: [PATCH] Format code (#1162) Co-authored-by: github-actions[bot] --- gui_v1.py | 4 +++- infer/lib/infer_pack/models.py | 17 +++++++++++++---- infer/lib/infer_pack/models_onnx.py | 5 ++++- infer/lib/infer_pack/onnx_inference.py | 1 + infer/lib/train/data_utils.py | 1 + infer/lib/train/mel_processing.py | 1 + infer/modules/train/train.py | 1 + infer/modules/uvr5/mdxnet.py | 1 + infer/modules/uvr5/modules.py | 1 + infer/modules/uvr5/preprocess.py | 1 + infer/modules/vc/modules.py | 13 +++++++++++-- infer/modules/vc/pipeline.py | 5 ++--- infer/modules/vc/utils.py | 1 + tools/calc_rvc_model_similarity.py | 1 + tools/infer/infer-pm-index256.py | 1 + tools/infer/train-index-v2.py | 1 + tools/infer/train-index.py | 1 + tools/rvc_for_realtime.py | 9 ++++++++- 18 files changed, 53 insertions(+), 12 deletions(-) diff --git a/gui_v1.py b/gui_v1.py index 23d9627..470f085 100644 --- a/gui_v1.py +++ b/gui_v1.py @@ -718,7 +718,9 @@ if __name__ == "__main__": sd.default.device[1] = output_device_indices[ output_devices.index(output_device) ] - logger.info("Input device:" + str(sd.default.device[0]) + ":" + str(input_device)) + logger.info( + "Input device:" + str(sd.default.device[0]) + ":" + str(input_device) + ) logger.info( "Output device:" + str(sd.default.device[1]) + ":" + str(output_device) ) diff --git a/infer/lib/infer_pack/models.py b/infer/lib/infer_pack/models.py index c16700a..cf21e3b 100644 --- a/infer/lib/infer_pack/models.py +++ b/infer/lib/infer_pack/models.py @@ -1,5 +1,6 @@ import math import logging + logger = logging.getLogger(__name__) import numpy as np @@ -615,7 +616,9 @@ class SynthesizerTrnMs256NSFsid(nn.Module): inter_channels, hidden_channels, 5, 1, 3, gin_channels=gin_channels ) self.emb_g = nn.Embedding(self.spk_embed_dim, gin_channels) - logger.debug("gin_channels:", gin_channels, "self.spk_embed_dim:", self.spk_embed_dim) + logger.debug( + "gin_channels:", gin_channels, "self.spk_embed_dim:", self.spk_embed_dim + ) def remove_weight_norm(self): self.dec.remove_weight_norm() @@ -731,7 +734,9 @@ class SynthesizerTrnMs768NSFsid(nn.Module): inter_channels, hidden_channels, 5, 1, 3, gin_channels=gin_channels ) self.emb_g = nn.Embedding(self.spk_embed_dim, gin_channels) - logger.debug("gin_channels:", gin_channels, "self.spk_embed_dim:", self.spk_embed_dim) + logger.debug( + "gin_channels:", gin_channels, "self.spk_embed_dim:", self.spk_embed_dim + ) def remove_weight_norm(self): self.dec.remove_weight_norm() @@ -844,7 +849,9 @@ class SynthesizerTrnMs256NSFsid_nono(nn.Module): inter_channels, hidden_channels, 5, 1, 3, gin_channels=gin_channels ) self.emb_g = nn.Embedding(self.spk_embed_dim, gin_channels) - logger.debug("gin_channels:", gin_channels, "self.spk_embed_dim:", self.spk_embed_dim) + logger.debug( + "gin_channels:", gin_channels, "self.spk_embed_dim:", self.spk_embed_dim + ) def remove_weight_norm(self): self.dec.remove_weight_norm() @@ -950,7 +957,9 @@ class SynthesizerTrnMs768NSFsid_nono(nn.Module): inter_channels, hidden_channels, 5, 1, 3, gin_channels=gin_channels ) self.emb_g = nn.Embedding(self.spk_embed_dim, gin_channels) - logger.debug("gin_channels:", gin_channels, "self.spk_embed_dim:", self.spk_embed_dim) + logger.debug( + "gin_channels:", gin_channels, "self.spk_embed_dim:", self.spk_embed_dim + ) def remove_weight_norm(self): self.dec.remove_weight_norm() diff --git a/infer/lib/infer_pack/models_onnx.py b/infer/lib/infer_pack/models_onnx.py index dc16e00..e55dff4 100644 --- a/infer/lib/infer_pack/models_onnx.py +++ b/infer/lib/infer_pack/models_onnx.py @@ -1,5 +1,6 @@ import math import logging + logger = logging.getLogger(__name__) import numpy as np @@ -619,7 +620,9 @@ class SynthesizerTrnMsNSFsidM(nn.Module): ) self.emb_g = nn.Embedding(self.spk_embed_dim, gin_channels) self.speaker_map = None - logger.debug("gin_channels:", gin_channels, "self.spk_embed_dim:", self.spk_embed_dim) + logger.debug( + "gin_channels:", gin_channels, "self.spk_embed_dim:", self.spk_embed_dim + ) def remove_weight_norm(self): self.dec.remove_weight_norm() diff --git a/infer/lib/infer_pack/onnx_inference.py b/infer/lib/infer_pack/onnx_inference.py index 5dc9d59..3d8328b 100644 --- a/infer/lib/infer_pack/onnx_inference.py +++ b/infer/lib/infer_pack/onnx_inference.py @@ -4,6 +4,7 @@ import onnxruntime import soundfile import logging + logger = logging.getLogger(__name__) diff --git a/infer/lib/train/data_utils.py b/infer/lib/train/data_utils.py index a29929c..9256b85 100644 --- a/infer/lib/train/data_utils.py +++ b/infer/lib/train/data_utils.py @@ -1,6 +1,7 @@ import os import traceback import logging + logger = logging.getLogger(__name__) import numpy as np diff --git a/infer/lib/train/mel_processing.py b/infer/lib/train/mel_processing.py index 00ad0b9..a92a311 100644 --- a/infer/lib/train/mel_processing.py +++ b/infer/lib/train/mel_processing.py @@ -2,6 +2,7 @@ import torch import torch.utils.data from librosa.filters import mel as librosa_mel_fn import logging + logger = logging.getLogger(__name__) MAX_WAV_VALUE = 32768.0 diff --git a/infer/modules/train/train.py b/infer/modules/train/train.py index f033d94..1c2ab2b 100644 --- a/infer/modules/train/train.py +++ b/infer/modules/train/train.py @@ -1,6 +1,7 @@ import os import sys import logging + logger = logging.getLogger(__name__) now_dir = os.getcwd() diff --git a/infer/modules/uvr5/mdxnet.py b/infer/modules/uvr5/mdxnet.py index 52c1c7e..86a0668 100644 --- a/infer/modules/uvr5/mdxnet.py +++ b/infer/modules/uvr5/mdxnet.py @@ -1,5 +1,6 @@ import os import logging + logger = logging.getLogger(__name__) import librosa diff --git a/infer/modules/uvr5/modules.py b/infer/modules/uvr5/modules.py index 9961a31..f627ca9 100644 --- a/infer/modules/uvr5/modules.py +++ b/infer/modules/uvr5/modules.py @@ -1,6 +1,7 @@ import os import traceback import logging + logger = logging.getLogger(__name__) import ffmpeg diff --git a/infer/modules/uvr5/preprocess.py b/infer/modules/uvr5/preprocess.py index bbb15cb..19f1111 100644 --- a/infer/modules/uvr5/preprocess.py +++ b/infer/modules/uvr5/preprocess.py @@ -1,5 +1,6 @@ import os import logging + logger = logging.getLogger(__name__) import librosa diff --git a/infer/modules/vc/modules.py b/infer/modules/vc/modules.py index 01d8927..530fb8b 100644 --- a/infer/modules/vc/modules.py +++ b/infer/modules/vc/modules.py @@ -1,5 +1,6 @@ import traceback import logging + logger = logging.getLogger(__name__) import numpy as np @@ -52,8 +53,16 @@ class VC: if not sid: if self.hubert_model is not None: # 考虑到轮询, 需要加个判断看是否 sid 是由有模型切换到无模型的 logger.info("Clean model cache") - del self.net_g, self.n_spk, self.vc, self.hubert_model, self.tgt_sr # ,cpt - self.hubert_model = self.net_g = self.n_spk = self.vc = self.hubert_model = self.tgt_sr = None + del ( + self.net_g, + self.n_spk, + self.vc, + self.hubert_model, + self.tgt_sr, + ) # ,cpt + self.hubert_model = ( + self.net_g + ) = self.n_spk = self.vc = self.hubert_model = self.tgt_sr = None if torch.cuda.is_available(): torch.cuda.empty_cache() ###楼下不这么折腾清理不干净 diff --git a/infer/modules/vc/pipeline.py b/infer/modules/vc/pipeline.py index 8a07d8c..6fcefca 100644 --- a/infer/modules/vc/pipeline.py +++ b/infer/modules/vc/pipeline.py @@ -2,6 +2,7 @@ import os import sys import traceback import logging + logger = logging.getLogger(__name__) from functools import lru_cache @@ -267,9 +268,7 @@ class Pipeline(object): with torch.no_grad(): hasp = pitch is not None and pitchf is not None arg = (feats, p_len, pitch, pitchf, sid) if hasp else (feats, p_len, sid) - audio1 = ( - (net_g.infer(*arg)[0][0, 0]).data.cpu().float().numpy() - ) + audio1 = (net_g.infer(*arg)[0][0, 0]).data.cpu().float().numpy() del hasp, arg del feats, p_len, padding_mask if torch.cuda.is_available(): diff --git a/infer/modules/vc/utils.py b/infer/modules/vc/utils.py index 9517d32..c128707 100644 --- a/infer/modules/vc/utils.py +++ b/infer/modules/vc/utils.py @@ -2,6 +2,7 @@ import os from fairseq import checkpoint_utils + def get_index_path_from_model(sid): return next( ( diff --git a/tools/calc_rvc_model_similarity.py b/tools/calc_rvc_model_similarity.py index 807dc19..42496e0 100644 --- a/tools/calc_rvc_model_similarity.py +++ b/tools/calc_rvc_model_similarity.py @@ -2,6 +2,7 @@ # Fill in the path of the model to be queried and the root directory of the reference models, and this script will return the similarity between the model to be queried and all reference models. import os import logging + logger = logging.getLogger(__name__) import torch diff --git a/tools/infer/infer-pm-index256.py b/tools/infer/infer-pm-index256.py index 5d1ba47..bdd18d0 100644 --- a/tools/infer/infer-pm-index256.py +++ b/tools/infer/infer-pm-index256.py @@ -4,6 +4,7 @@ """ import os import logging + logger = logging.getLogger(__name__) import parselmouth diff --git a/tools/infer/train-index-v2.py b/tools/infer/train-index-v2.py index 70ba553..0efef7c 100644 --- a/tools/infer/train-index-v2.py +++ b/tools/infer/train-index-v2.py @@ -4,6 +4,7 @@ import os import traceback import logging + logger = logging.getLogger(__name__) from multiprocessing import cpu_count diff --git a/tools/infer/train-index.py b/tools/infer/train-index.py index c0f2f0e..39d64c4 100644 --- a/tools/infer/train-index.py +++ b/tools/infer/train-index.py @@ -3,6 +3,7 @@ """ import os import logging + logger = logging.getLogger(__name__) import faiss diff --git a/tools/rvc_for_realtime.py b/tools/rvc_for_realtime.py index 906bf1e..9e7d006 100644 --- a/tools/rvc_for_realtime.py +++ b/tools/rvc_for_realtime.py @@ -2,6 +2,7 @@ import os import sys import traceback import logging + logger = logging.getLogger(__name__) from time import time as ttime @@ -341,5 +342,11 @@ class RVC: .float() ) t5 = ttime() - logger.info("Spent time: fea = %s, index = %s, f0 = %s, model = %s", t2 - t1, t3 - t2, t4 - t3, t5 - t4) + logger.info( + "Spent time: fea = %s, index = %s, f0 = %s, model = %s", + t2 - t1, + t3 - t2, + t4 - t3, + t5 - t4, + ) return infered_audio