fumiama/Retrieval-based-Voice-Conversion-WebUI
1
0
Fork 0
mirror of https://github.com/fumiama/Retrieval-based-Voice-Conversion-WebUI.git synced 2026-06-08 20:10:44 +08:00
Code Activity

optimize(infer): move transforms into rvc

Browse Source
This commit is contained in:
源文雨
2024-06-07 19:53:23 +09:00
parent 49488dcae9
commit 978abd8aac
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
infer/lib/infer_pack/modules.py
View File

@@ -12,7 +12,7 @@ from torch.nn.utils import remove_weight_norm, weight_norm
from rvc import utils from rvc import utils
from rvc.utils import get_padding, call_weight_data_normal_if_Conv from rvc.utils import get_padding, call_weight_data_normal_if_Conv
from infer.lib.infer_pack.transforms import piecewise_rational_quadratic_transform from rvc.transforms import piecewise_rational_quadratic_transform
LRELU_SLOPE = 0.1 LRELU_SLOPE = 0.1
@@ -583,7 +583,7 @@ class ConvFlow(nn.Module):
reverse=False, reverse=False,
): ):
x0, x1 = torch.split(x, [self.half_channels] * 2, 1) x0, x1 = torch.split(x, [self.half_channels] * 2, 1)
h = self.pre(x0) h: torch.Tensor = self.pre(x0)
h = self.convs(h, x_mask, g=g) h = self.convs(h, x_mask, g=g)
h = self.proj(h) * x_mask h = self.proj(h) * x_mask

38
infer/lib/infer_pack/transforms.py → rvc/transforms.py
View File

@@ -8,13 +8,13 @@ DEFAULT_MIN_DERIVATIVE = 1e-3
def piecewise_rational_quadratic_transform( def piecewise_rational_quadratic_transform(
inputs, inputs: torch.Tensor,
unnormalized_widths, unnormalized_widths: torch.Tensor,
unnormalized_heights, unnormalized_heights: torch.Tensor,
unnormalized_derivatives, unnormalized_derivatives: torch.Tensor,
inverse=False, inverse: bool = False,
tails=None, tails: str | None = None,
tail_bound=1.0, tail_bound: float = 1.0,
min_bin_width=DEFAULT_MIN_BIN_WIDTH, min_bin_width=DEFAULT_MIN_BIN_WIDTH,
min_bin_height=DEFAULT_MIN_BIN_HEIGHT, min_bin_height=DEFAULT_MIN_BIN_HEIGHT,
min_derivative=DEFAULT_MIN_DERIVATIVE, min_derivative=DEFAULT_MIN_DERIVATIVE,
@@ -46,13 +46,13 @@ def searchsorted(bin_locations, inputs, eps=1e-6):
def unconstrained_rational_quadratic_spline( def unconstrained_rational_quadratic_spline(
inputs, inputs: torch.Tensor,
unnormalized_widths, unnormalized_widths: torch.Tensor,
unnormalized_heights, unnormalized_heights: torch.Tensor,
unnormalized_derivatives, unnormalized_derivatives: torch.Tensor,
inverse=False, inverse: bool = False,
tails="linear", tails: str = "linear",
tail_bound=1.0, tail_bound: float = 1.0,
min_bin_width=DEFAULT_MIN_BIN_WIDTH, min_bin_width=DEFAULT_MIN_BIN_WIDTH,
min_bin_height=DEFAULT_MIN_BIN_HEIGHT, min_bin_height=DEFAULT_MIN_BIN_HEIGHT,
min_derivative=DEFAULT_MIN_DERIVATIVE, min_derivative=DEFAULT_MIN_DERIVATIVE,
@@ -96,11 +96,11 @@ def unconstrained_rational_quadratic_spline(
def rational_quadratic_spline( def rational_quadratic_spline(
inputs, inputs: torch.Tensor,
unnormalized_widths, unnormalized_widths: torch.Tensor,
unnormalized_heights, unnormalized_heights: torch.Tensor,
unnormalized_derivatives, unnormalized_derivatives: torch.Tensor,
inverse=False, inverse: bool = False,
left=0.0, left=0.0,
right=1.0, right=1.0,
bottom=0.0, bottom=0.0,