e9dd11bddb
* Optimize latency (#1259) * add attribute: configs/config.py Optimize latency: tools/rvc_for_realtime.py * new file: assets/Synthesizer_inputs.pth * fix: configs/config.py fix: tools/rvc_for_realtime.py * fix bug: infer/lib/infer_pack/models.py * new file: assets/hubert_inputs.pth new file: assets/rmvpe_inputs.pth modified: configs/config.py new features: infer/lib/rmvpe.py new features: tools/jit_export/__init__.py new features: tools/jit_export/get_hubert.py new features: tools/jit_export/get_rmvpe.py new features: tools/jit_export/get_synthesizer.py optimize: tools/rvc_for_realtime.py * optimize: tools/jit_export/get_synthesizer.py fix bug: tools/jit_export/__init__.py * Fixed a bug caused by using half on the CPU: infer/lib/rmvpe.py Fixed a bug caused by using half on the CPU: tools/jit_export/__init__.py Fixed CIRCULAR IMPORT: tools/jit_export/get_rmvpe.py Fixed CIRCULAR IMPORT: tools/jit_export/get_synthesizer.py Fixed a bug caused by using half on the CPU: tools/rvc_for_realtime.py * Remove useless code: infer/lib/rmvpe.py * Delete gui_v1 copy.py * Delete .vscode/launch.json * Delete jit_export_test.py * Delete tools/rvc_for_realtime copy.py * Delete configs/config.json * Delete .gitignore * Fix exceptions caused by switching inference devices: infer/lib/rmvpe.py Fix exceptions caused by switching inference devices: tools/jit_export/__init__.py Fix exceptions caused by switching inference devices: tools/rvc_for_realtime.py * restore * replace(you can undo this commit) * remove debug_print --------- Co-authored-by: Ftps <ftpsflandre@gmail.com> * Fixed some bugs when exporting ONNX model (#1254) * fix import (#1280) * fix import * lint * 🎨 同步 locale (#1242) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Fix jit load and import issue (#1282) * fix jit model loading : infer/lib/rmvpe.py * modified: assets/hubert/.gitignore move file: assets/hubert_inputs.pth -> assets/hubert/hubert_inputs.pth modified: assets/rmvpe/.gitignore move file: assets/rmvpe_inputs.pth -> assets/rmvpe/rmvpe_inputs.pth fix import: gui_v1.py * feat(workflow): trigger on dev * feat(workflow): add close-pr on non-dev branch * Add input wav and delay time monitor for real-time gui (#1293) * feat(workflow): trigger on dev * feat(workflow): add close-pr on non-dev branch * 🎨 同步 locale (#1289) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * feat: edit PR template * add input wav and delay time monitor --------- Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: RVC-Boss <129054828+RVC-Boss@users.noreply.github.com> * Optimize latency using scripted jit (#1291) * feat(workflow): trigger on dev * feat(workflow): add close-pr on non-dev branch * 🎨 同步 locale (#1289) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * feat: edit PR template * Optimize-latency-using-scripted: configs/config.py Optimize-latency-using-scripted: infer/lib/infer_pack/attentions.py Optimize-latency-using-scripted: infer/lib/infer_pack/commons.py Optimize-latency-using-scripted: infer/lib/infer_pack/models.py Optimize-latency-using-scripted: infer/lib/infer_pack/modules.py Optimize-latency-using-scripted: infer/lib/jit/__init__.py Optimize-latency-using-scripted: infer/lib/jit/get_hubert.py Optimize-latency-using-scripted: infer/lib/jit/get_rmvpe.py Optimize-latency-using-scripted: infer/lib/jit/get_synthesizer.py Optimize-latency-using-scripted: infer/lib/rmvpe.py Optimize-latency-using-scripted: tools/rvc_for_realtime.py * modified: infer/lib/infer_pack/models.py * fix some bug: configs/config.py fix some bug: infer/lib/infer_pack/models.py fix some bug: infer/lib/rmvpe.py * Fixed abnormal reference of logger in multiprocessing: infer/modules/train/train.py --------- Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Format code (#1298) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * 🎨 同步 locale (#1299) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * feat: optimize actions * feat(workflow): add sync dev * feat: optimize actions * feat: optimize actions * feat: optimize actions * feat: optimize actions * feat: add jit options (#1303) Delete useless code: infer/lib/jit/get_synthesizer.py Optimized code: tools/rvc_for_realtime.py * Code refactor + re-design inference ui (#1304) * Code refacor + re-design inference ui * Fix tabname * i18n jp --------- Co-authored-by: Ftps <ftpsflandre@gmail.com> * feat: optimize actions * feat: optimize actions * Update README & en_US locale file (#1309) * critical: some bug fixes (#1322) * JIT acceleration switch does not support hot update * fix padding bug of rmvpe in torch-directml * fix padding bug of rmvpe in torch-directml * Fix STFT under torch_directml (#1330) * chore(format): run black on dev (#1318) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * chore(i18n): sync locale on dev (#1317) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * feat: allow for tta to be passed to uvr (#1361) * chore(format): run black on dev (#1373) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Added script for automatically download all needed models at install (#1366) * Delete modules.py * Add files via upload * Add files via upload * Add files via upload * Add files via upload * chore(i18n): sync locale on dev (#1377) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * chore(format): run black on dev (#1376) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Update IPEX library (#1362) * Update IPEX library * Update ipex index * chore(format): run black on dev (#1378) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Chengjia Jiang <46401978+ChasonJiang@users.noreply.github.com> Co-authored-by: Ftps <ftpsflandre@gmail.com> Co-authored-by: shizuku_nia <102004222+ShizukuNia@users.noreply.github.com> Co-authored-by: Ftps <63702646+Tps-F@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com> Co-authored-by: yxlllc <33565655+yxlllc@users.noreply.github.com> Co-authored-by: RVC-Boss <129054828+RVC-Boss@users.noreply.github.com> Co-authored-by: Blaise <133521603+blaise-tk@users.noreply.github.com> Co-authored-by: Rice Cake <gak141808@gmail.com> Co-authored-by: AWAS666 <33494149+AWAS666@users.noreply.github.com> Co-authored-by: Dmitry <nda2911@yandex.ru> Co-authored-by: Disty0 <47277141+Disty0@users.noreply.github.com>
252 lines
7.9 KiB
Python
252 lines
7.9 KiB
Python
import argparse
|
|
import os
|
|
import sys
|
|
import json
|
|
from multiprocessing import cpu_count
|
|
|
|
import torch
|
|
|
|
try:
|
|
import intel_extension_for_pytorch as ipex # pylint: disable=import-error, unused-import
|
|
|
|
if torch.xpu.is_available():
|
|
from infer.modules.ipex import ipex_init
|
|
|
|
ipex_init()
|
|
except Exception: # pylint: disable=broad-exception-caught
|
|
pass
|
|
import logging
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
version_config_list = [
|
|
"v1/32k.json",
|
|
"v1/40k.json",
|
|
"v1/48k.json",
|
|
"v2/48k.json",
|
|
"v2/32k.json",
|
|
]
|
|
|
|
|
|
def singleton_variable(func):
|
|
def wrapper(*args, **kwargs):
|
|
if not wrapper.instance:
|
|
wrapper.instance = func(*args, **kwargs)
|
|
return wrapper.instance
|
|
|
|
wrapper.instance = None
|
|
return wrapper
|
|
|
|
|
|
@singleton_variable
|
|
class Config:
|
|
def __init__(self):
|
|
self.device = "cuda:0"
|
|
self.is_half = True
|
|
self.use_jit = False
|
|
self.n_cpu = 0
|
|
self.gpu_name = None
|
|
self.json_config = self.load_config_json()
|
|
self.gpu_mem = None
|
|
(
|
|
self.python_cmd,
|
|
self.listen_port,
|
|
self.iscolab,
|
|
self.noparallel,
|
|
self.noautoopen,
|
|
self.dml,
|
|
) = self.arg_parse()
|
|
self.instead = ""
|
|
self.x_pad, self.x_query, self.x_center, self.x_max = self.device_config()
|
|
|
|
@staticmethod
|
|
def load_config_json() -> dict:
|
|
d = {}
|
|
for config_file in version_config_list:
|
|
with open(f"configs/{config_file}", "r") as f:
|
|
d[config_file] = json.load(f)
|
|
return d
|
|
|
|
@staticmethod
|
|
def arg_parse() -> tuple:
|
|
exe = sys.executable or "python"
|
|
parser = argparse.ArgumentParser()
|
|
parser.add_argument("--port", type=int, default=7865, help="Listen port")
|
|
parser.add_argument("--pycmd", type=str, default=exe, help="Python command")
|
|
parser.add_argument("--colab", action="store_true", help="Launch in colab")
|
|
parser.add_argument(
|
|
"--noparallel", action="store_true", help="Disable parallel processing"
|
|
)
|
|
parser.add_argument(
|
|
"--noautoopen",
|
|
action="store_true",
|
|
help="Do not open in browser automatically",
|
|
)
|
|
parser.add_argument(
|
|
"--dml",
|
|
action="store_true",
|
|
help="torch_dml",
|
|
)
|
|
cmd_opts = parser.parse_args()
|
|
|
|
cmd_opts.port = cmd_opts.port if 0 <= cmd_opts.port <= 65535 else 7865
|
|
|
|
return (
|
|
cmd_opts.pycmd,
|
|
cmd_opts.port,
|
|
cmd_opts.colab,
|
|
cmd_opts.noparallel,
|
|
cmd_opts.noautoopen,
|
|
cmd_opts.dml,
|
|
)
|
|
|
|
# has_mps is only available in nightly pytorch (for now) and MasOS 12.3+.
|
|
# check `getattr` and try it for compatibility
|
|
@staticmethod
|
|
def has_mps() -> bool:
|
|
if not torch.backends.mps.is_available():
|
|
return False
|
|
try:
|
|
torch.zeros(1).to(torch.device("mps"))
|
|
return True
|
|
except Exception:
|
|
return False
|
|
|
|
@staticmethod
|
|
def has_xpu() -> bool:
|
|
if hasattr(torch, "xpu") and torch.xpu.is_available():
|
|
return True
|
|
else:
|
|
return False
|
|
|
|
def use_fp32_config(self):
|
|
for config_file in version_config_list:
|
|
self.json_config[config_file]["train"]["fp16_run"] = False
|
|
with open(f"configs/{config_file}", "r") as f:
|
|
strr = f.read().replace("true", "false")
|
|
with open(f"configs/{config_file}", "w") as f:
|
|
f.write(strr)
|
|
with open("infer/modules/train/preprocess.py", "r") as f:
|
|
strr = f.read().replace("3.7", "3.0")
|
|
with open("infer/modules/train/preprocess.py", "w") as f:
|
|
f.write(strr)
|
|
print("overwrite preprocess and configs.json")
|
|
|
|
def device_config(self) -> tuple:
|
|
if torch.cuda.is_available():
|
|
if self.has_xpu():
|
|
self.device = self.instead = "xpu:0"
|
|
self.is_half = True
|
|
i_device = int(self.device.split(":")[-1])
|
|
self.gpu_name = torch.cuda.get_device_name(i_device)
|
|
if (
|
|
("16" in self.gpu_name and "V100" not in self.gpu_name.upper())
|
|
or "P40" in self.gpu_name.upper()
|
|
or "P10" in self.gpu_name.upper()
|
|
or "1060" in self.gpu_name
|
|
or "1070" in self.gpu_name
|
|
or "1080" in self.gpu_name
|
|
):
|
|
logger.info("Found GPU %s, force to fp32", self.gpu_name)
|
|
self.is_half = False
|
|
self.use_fp32_config()
|
|
else:
|
|
logger.info("Found GPU %s", self.gpu_name)
|
|
self.gpu_mem = int(
|
|
torch.cuda.get_device_properties(i_device).total_memory
|
|
/ 1024
|
|
/ 1024
|
|
/ 1024
|
|
+ 0.4
|
|
)
|
|
if self.gpu_mem <= 4:
|
|
with open("infer/modules/train/preprocess.py", "r") as f:
|
|
strr = f.read().replace("3.7", "3.0")
|
|
with open("infer/modules/train/preprocess.py", "w") as f:
|
|
f.write(strr)
|
|
elif self.has_mps():
|
|
logger.info("No supported Nvidia GPU found")
|
|
self.device = self.instead = "mps"
|
|
self.is_half = False
|
|
self.use_fp32_config()
|
|
else:
|
|
logger.info("No supported Nvidia GPU found")
|
|
self.device = self.instead = "cpu"
|
|
self.is_half = False
|
|
self.use_fp32_config()
|
|
|
|
if self.n_cpu == 0:
|
|
self.n_cpu = cpu_count()
|
|
|
|
if self.is_half:
|
|
# 6G显存配置
|
|
x_pad = 3
|
|
x_query = 10
|
|
x_center = 60
|
|
x_max = 65
|
|
else:
|
|
# 5G显存配置
|
|
x_pad = 1
|
|
x_query = 6
|
|
x_center = 38
|
|
x_max = 41
|
|
|
|
if self.gpu_mem is not None and self.gpu_mem <= 4:
|
|
x_pad = 1
|
|
x_query = 5
|
|
x_center = 30
|
|
x_max = 32
|
|
if self.dml:
|
|
logger.info("Use DirectML instead")
|
|
if (
|
|
os.path.exists(
|
|
"runtime\Lib\site-packages\onnxruntime\capi\DirectML.dll"
|
|
)
|
|
== False
|
|
):
|
|
try:
|
|
os.rename(
|
|
"runtime\Lib\site-packages\onnxruntime",
|
|
"runtime\Lib\site-packages\onnxruntime-cuda",
|
|
)
|
|
except:
|
|
pass
|
|
try:
|
|
os.rename(
|
|
"runtime\Lib\site-packages\onnxruntime-dml",
|
|
"runtime\Lib\site-packages\onnxruntime",
|
|
)
|
|
except:
|
|
pass
|
|
# if self.device != "cpu":
|
|
import torch_directml
|
|
|
|
self.device = torch_directml.device(torch_directml.default_device())
|
|
self.is_half = False
|
|
else:
|
|
if self.instead:
|
|
logger.info(f"Use {self.instead} instead")
|
|
if (
|
|
os.path.exists(
|
|
"runtime\Lib\site-packages\onnxruntime\capi\onnxruntime_providers_cuda.dll"
|
|
)
|
|
== False
|
|
):
|
|
try:
|
|
os.rename(
|
|
"runtime\Lib\site-packages\onnxruntime",
|
|
"runtime\Lib\site-packages\onnxruntime-dml",
|
|
)
|
|
except:
|
|
pass
|
|
try:
|
|
os.rename(
|
|
"runtime\Lib\site-packages\onnxruntime-cuda",
|
|
"runtime\Lib\site-packages\onnxruntime",
|
|
)
|
|
except:
|
|
pass
|
|
print("is_half:%s, device:%s" % (self.is_half, self.device))
|
|
return x_pad, x_query, x_center, x_max
|