fix: correct all lib.rvc.lib imports to lib.rvc

- Replace 'from lib.rvc.lib.' with 'from lib.rvc.' in all files
- Fixes ModuleNotFoundError when loading VoiceConverter

lib/rvc/algorithm/attentions.py

@@ -2,7 +2,7 @@ import math
 
 import torch
 
-from lib.rvc.lib.algorithm.commons import convert_pad_shape
+from lib.rvc.algorithm.commons import convert_pad_shape
 
 
 class MultiHeadAttention(torch.nn.Module):

lib/rvc/algorithm/encoders.py

@@ -3,10 +3,10 @@ import math
 
 import torch
 
-from lib.rvc.lib.algorithm.attentions import FFN, MultiHeadAttention
-from lib.rvc.lib.algorithm.commons import sequence_mask
-from lib.rvc.lib.algorithm.modules import WaveNet
-from lib.rvc.lib.algorithm.normalization import LayerNorm
+from lib.rvc.algorithm.attentions import FFN, MultiHeadAttention
+from lib.rvc.algorithm.commons import sequence_mask
+from lib.rvc.algorithm.modules import WaveNet
+from lib.rvc.algorithm.normalization import LayerNorm
 
 logger = logging.getLogger(__name__)
 

lib/rvc/algorithm/generators/hifigan.py

@@ -6,8 +6,8 @@ import torch
 from torch.nn.utils import remove_weight_norm
 from torch.nn.utils.parametrizations import weight_norm
 
-from lib.rvc.lib.algorithm.commons import init_weights
-from lib.rvc.lib.algorithm.residuals import LRELU_SLOPE, ResBlock
+from lib.rvc.algorithm.commons import init_weights
+from lib.rvc.algorithm.residuals import LRELU_SLOPE, ResBlock
 
 
 class HiFiGANGenerator(torch.nn.Module):

lib/rvc/algorithm/generators/hifigan_nsf.py

@@ -7,9 +7,9 @@ from torch.nn.utils import remove_weight_norm
 from torch.nn.utils.parametrizations import weight_norm
 from torch.utils.checkpoint import checkpoint
 
-from lib.rvc.lib.algorithm.commons import init_weights
-from lib.rvc.lib.algorithm.generators.hifigan import SineGenerator
-from lib.rvc.lib.algorithm.residuals import LRELU_SLOPE, ResBlock
+from lib.rvc.algorithm.commons import init_weights
+from lib.rvc.algorithm.generators.hifigan import SineGenerator
+from lib.rvc.algorithm.residuals import LRELU_SLOPE, ResBlock
 
 
 class SourceModuleHnNSF(torch.nn.Module):

lib/rvc/algorithm/generators/refinegan.py

@@ -8,7 +8,7 @@ from torch.nn.utils import remove_weight_norm
 from torch.nn.utils.parametrizations import weight_norm
 from torch.utils.checkpoint import checkpoint
 
-from lib.rvc.lib.algorithm.commons import get_padding, init_weights
+from lib.rvc.algorithm.commons import get_padding, init_weights
 
 
 class ResBlock(nn.Module):

lib/rvc/algorithm/modules.py

@@ -1,6 +1,6 @@
 import torch
 
-from lib.rvc.lib.algorithm.commons import fused_add_tanh_sigmoid_multiply
+from lib.rvc.algorithm.commons import fused_add_tanh_sigmoid_multiply
 
 
 class WaveNet(torch.nn.Module):

lib/rvc/algorithm/residuals.py

@@ -6,8 +6,8 @@ import torch
 from torch.nn.utils import remove_weight_norm
 from torch.nn.utils.parametrizations import weight_norm
 
-from lib.rvc.lib.algorithm.commons import get_padding, init_weights
-from lib.rvc.lib.algorithm.modules import WaveNet
+from lib.rvc.algorithm.commons import get_padding, init_weights
+from lib.rvc.algorithm.modules import WaveNet
 
 LRELU_SLOPE = 0.1
 

lib/rvc/algorithm/synthesizers.py

@@ -4,13 +4,13 @@ import logging
 
 import torch
 
-from lib.rvc.lib.algorithm.commons import rand_slice_segments, slice_segments
-from lib.rvc.lib.algorithm.encoders import PosteriorEncoder, TextEncoder
-from lib.rvc.lib.algorithm.generators.hifigan import HiFiGANGenerator
-from lib.rvc.lib.algorithm.generators.hifigan_mrf import HiFiGANMRFGenerator
-from lib.rvc.lib.algorithm.generators.hifigan_nsf import HiFiGANNSFGenerator
-from lib.rvc.lib.algorithm.generators.refinegan import RefineGANGenerator
-from lib.rvc.lib.algorithm.residuals import ResidualCouplingBlock
+from lib.rvc.algorithm.commons import rand_slice_segments, slice_segments
+from lib.rvc.algorithm.encoders import PosteriorEncoder, TextEncoder
+from lib.rvc.algorithm.generators.hifigan import HiFiGANGenerator
+from lib.rvc.algorithm.generators.hifigan_mrf import HiFiGANMRFGenerator
+from lib.rvc.algorithm.generators.hifigan_nsf import HiFiGANNSFGenerator
+from lib.rvc.algorithm.generators.refinegan import RefineGANGenerator
+from lib.rvc.algorithm.residuals import ResidualCouplingBlock
 
 logger = logging.getLogger(__name__)
 

lib/rvc/converter.py

@@ -32,9 +32,9 @@ import lazy_loader as lazy
 
 from lib.rvc.config import Config
 from lib.rvc.pipeline import Pipeline as VC
-from lib.rvc.lib.algorithm.synthesizers import Synthesizer
-from lib.rvc.lib.tools.split_audio import merge_audio, process_audio
-from lib.rvc.lib.utils import load_audio_infer, load_embedding
+from lib.rvc.algorithm.synthesizers import Synthesizer
+from lib.rvc.tools.split_audio import merge_audio, process_audio
+from lib.rvc.utils import load_audio_infer, load_embedding
 
 if TYPE_CHECKING:
     import noisereduce as nr

lib/rvc/predictors/F0Extractor.py

@@ -16,7 +16,7 @@ from lib.rvc.common import RVC_MODELS_DIR
 from lib.rvc.configs.config import Config
 
 # from tools.anyf0.rmvpe import RMVPE
-from lib.rvc.lib.predictors.RMVPE import RMVPE0Predictor
+from lib.rvc.predictors.RMVPE import RMVPE0Predictor
 
 config = Config()
 

lib/rvc/predictors/f0.py

@@ -6,7 +6,7 @@ import torch
 import torchcrepe
 
 from lib.rvc.common import RVC_MODELS_DIR
-from lib.rvc.lib.predictors.RMVPE import RMVPE0Predictor
+from lib.rvc.predictors.RMVPE import RMVPE0Predictor
 
 
 class RMVPE: