From 2e2a72f0e530dd2e5e55a19699ca800137f65e7a Mon Sep 17 00:00:00 2001 From: Ftps Date: Sat, 19 Aug 2023 19:40:08 +0900 Subject: [PATCH] replace infer_pack --- {lib => infer/lib}/infer_pack/attentions.py | 6 +++--- {lib => infer/lib}/infer_pack/commons.py | 0 {lib => infer/lib}/infer_pack/models.py | 12 ++++++------ {lib => infer/lib}/infer_pack/models_onnx.py | 12 ++++++------ {lib => infer/lib}/infer_pack/modules.py | 6 +++--- .../infer_pack/modules/F0Predictor/DioF0Predictor.py | 2 +- .../infer_pack/modules/F0Predictor/F0Predictor.py | 0 .../modules/F0Predictor/HarvestF0Predictor.py | 2 +- .../infer_pack/modules/F0Predictor/PMF0Predictor.py | 2 +- .../lib}/infer_pack/modules/F0Predictor/__init__.py | 0 {lib => infer/lib}/infer_pack/onnx_inference.py | 0 {lib => infer/lib}/infer_pack/transforms.py | 0 12 files changed, 21 insertions(+), 21 deletions(-) rename {lib => infer/lib}/infer_pack/attentions.py (96%) rename {lib => infer/lib}/infer_pack/commons.py (100%) rename {lib => infer/lib}/infer_pack/models.py (99%) rename {lib => infer/lib}/infer_pack/models_onnx.py (98%) rename {lib => infer/lib}/infer_pack/modules.py (95%) rename {lib => infer/lib}/infer_pack/modules/F0Predictor/DioF0Predictor.py (94%) rename {lib => infer/lib}/infer_pack/modules/F0Predictor/F0Predictor.py (100%) rename {lib => infer/lib}/infer_pack/modules/F0Predictor/HarvestF0Predictor.py (94%) rename {lib => infer/lib}/infer_pack/modules/F0Predictor/PMF0Predictor.py (95%) rename {lib => infer/lib}/infer_pack/modules/F0Predictor/__init__.py (100%) rename {lib => infer/lib}/infer_pack/onnx_inference.py (100%) rename {lib => infer/lib}/infer_pack/transforms.py (100%) diff --git a/lib/infer_pack/attentions.py b/infer/lib/infer_pack/attentions.py similarity index 96% rename from lib/infer_pack/attentions.py rename to infer/lib/infer_pack/attentions.py index 84d5c87..fc3538b 100644 --- a/lib/infer_pack/attentions.py +++ b/infer/lib/infer_pack/attentions.py @@ -5,9 +5,9 @@ import torch from torch import nn from torch.nn import functional as F -from lib.infer_pack import commons -from lib.infer_pack import modules -from lib.infer_pack.modules import LayerNorm +from infer.lib.infer_pack import commons +from infer.lib.infer_pack import modules +from infer.lib.infer_pack.modules import LayerNorm class Encoder(nn.Module): diff --git a/lib/infer_pack/commons.py b/infer/lib/infer_pack/commons.py similarity index 100% rename from lib/infer_pack/commons.py rename to infer/lib/infer_pack/commons.py diff --git a/lib/infer_pack/models.py b/infer/lib/infer_pack/models.py similarity index 99% rename from lib/infer_pack/models.py rename to infer/lib/infer_pack/models.py index 4749738..8c598cf 100644 --- a/lib/infer_pack/models.py +++ b/infer/lib/infer_pack/models.py @@ -3,15 +3,15 @@ from time import time as ttime import torch from torch import nn from torch.nn import functional as F -from lib.infer_pack import modules -from lib.infer_pack import attentions -from lib.infer_pack import commons -from lib.infer_pack.commons import init_weights, get_padding +from infer.lib.infer_pack import modules +from infer.lib.infer_pack import attentions +from infer.lib.infer_pack import commons +from infer.lib.infer_pack.commons import init_weights, get_padding from torch.nn import Conv1d, ConvTranspose1d, AvgPool1d, Conv2d from torch.nn.utils import weight_norm, remove_weight_norm, spectral_norm -from lib.infer_pack.commons import init_weights +from infer.lib.infer_pack.commons import init_weights import numpy as np -from lib.infer_pack import commons +from infer.lib.infer_pack import commons class TextEncoder256(nn.Module): diff --git a/lib/infer_pack/models_onnx.py b/infer/lib/infer_pack/models_onnx.py similarity index 98% rename from lib/infer_pack/models_onnx.py rename to infer/lib/infer_pack/models_onnx.py index 963e67b..f4b2a15 100644 --- a/lib/infer_pack/models_onnx.py +++ b/infer/lib/infer_pack/models_onnx.py @@ -3,15 +3,15 @@ from time import time as ttime import torch from torch import nn from torch.nn import functional as F -from lib.infer_pack import modules -from lib.infer_pack import attentions -from lib.infer_pack import commons -from lib.infer_pack.commons import init_weights, get_padding +from infer.lib.infer_pack import modules +from infer.lib.infer_pack import attentions +from infer.lib.infer_pack import commons +from infer.lib.infer_pack.commons import init_weights, get_padding from torch.nn import Conv1d, ConvTranspose1d, AvgPool1d, Conv2d from torch.nn.utils import weight_norm, remove_weight_norm, spectral_norm -from lib.infer_pack.commons import init_weights +from infer.lib.infer_pack.commons import init_weights import numpy as np -from lib.infer_pack import commons +from infer.lib.infer_pack import commons class TextEncoder256(nn.Module): diff --git a/lib/infer_pack/modules.py b/infer/lib/infer_pack/modules.py similarity index 95% rename from lib/infer_pack/modules.py rename to infer/lib/infer_pack/modules.py index b54dc47..386f7a2 100644 --- a/lib/infer_pack/modules.py +++ b/infer/lib/infer_pack/modules.py @@ -9,9 +9,9 @@ from torch.nn import functional as F from torch.nn import Conv1d, ConvTranspose1d, AvgPool1d, Conv2d from torch.nn.utils import weight_norm, remove_weight_norm -from lib.infer_pack import commons -from lib.infer_pack.commons import init_weights, get_padding -from lib.infer_pack.transforms import piecewise_rational_quadratic_transform +from infer.lib.infer_pack import commons +from infer.lib.infer_pack.commons import init_weights, get_padding +from infer.lib.infer_pack.transforms import piecewise_rational_quadratic_transform LRELU_SLOPE = 0.1 diff --git a/lib/infer_pack/modules/F0Predictor/DioF0Predictor.py b/infer/lib/infer_pack/modules/F0Predictor/DioF0Predictor.py similarity index 94% rename from lib/infer_pack/modules/F0Predictor/DioF0Predictor.py rename to infer/lib/infer_pack/modules/F0Predictor/DioF0Predictor.py index b5a8e3e..e82a7fe 100644 --- a/lib/infer_pack/modules/F0Predictor/DioF0Predictor.py +++ b/infer/lib/infer_pack/modules/F0Predictor/DioF0Predictor.py @@ -1,4 +1,4 @@ -from lib.infer_pack.modules.F0Predictor.F0Predictor import F0Predictor +from infer.lib.infer_pack.modules.F0Predictor.F0Predictor import F0Predictor import pyworld import numpy as np diff --git a/lib/infer_pack/modules/F0Predictor/F0Predictor.py b/infer/lib/infer_pack/modules/F0Predictor/F0Predictor.py similarity index 100% rename from lib/infer_pack/modules/F0Predictor/F0Predictor.py rename to infer/lib/infer_pack/modules/F0Predictor/F0Predictor.py diff --git a/lib/infer_pack/modules/F0Predictor/HarvestF0Predictor.py b/infer/lib/infer_pack/modules/F0Predictor/HarvestF0Predictor.py similarity index 94% rename from lib/infer_pack/modules/F0Predictor/HarvestF0Predictor.py rename to infer/lib/infer_pack/modules/F0Predictor/HarvestF0Predictor.py index f8dae30..eb96c52 100644 --- a/lib/infer_pack/modules/F0Predictor/HarvestF0Predictor.py +++ b/infer/lib/infer_pack/modules/F0Predictor/HarvestF0Predictor.py @@ -1,4 +1,4 @@ -from lib.infer_pack.modules.F0Predictor.F0Predictor import F0Predictor +from infer.lib.infer_pack.modules.F0Predictor.F0Predictor import F0Predictor import pyworld import numpy as np diff --git a/lib/infer_pack/modules/F0Predictor/PMF0Predictor.py b/infer/lib/infer_pack/modules/F0Predictor/PMF0Predictor.py similarity index 95% rename from lib/infer_pack/modules/F0Predictor/PMF0Predictor.py rename to infer/lib/infer_pack/modules/F0Predictor/PMF0Predictor.py index b70de29..384ff4c 100644 --- a/lib/infer_pack/modules/F0Predictor/PMF0Predictor.py +++ b/infer/lib/infer_pack/modules/F0Predictor/PMF0Predictor.py @@ -1,4 +1,4 @@ -from lib.infer_pack.modules.F0Predictor.F0Predictor import F0Predictor +from infer.lib.infer_pack.modules.F0Predictor.F0Predictor import F0Predictor import parselmouth import numpy as np diff --git a/lib/infer_pack/modules/F0Predictor/__init__.py b/infer/lib/infer_pack/modules/F0Predictor/__init__.py similarity index 100% rename from lib/infer_pack/modules/F0Predictor/__init__.py rename to infer/lib/infer_pack/modules/F0Predictor/__init__.py diff --git a/lib/infer_pack/onnx_inference.py b/infer/lib/infer_pack/onnx_inference.py similarity index 100% rename from lib/infer_pack/onnx_inference.py rename to infer/lib/infer_pack/onnx_inference.py diff --git a/lib/infer_pack/transforms.py b/infer/lib/infer_pack/transforms.py similarity index 100% rename from lib/infer_pack/transforms.py rename to infer/lib/infer_pack/transforms.py