fix #835: some broken imports

infer-web.py

@@ -34,7 +34,7 @@ from lib.infer_pack.models import (
 from lib.infer_pack.models_onnx import SynthesizerTrnMsNSFsidM
 from infer_uvr5 import _audio_pre_, _audio_pre_new
 from my_utils import load_audio
-from train.process_ckpt import change_info, extract_small_model, merge, show_info
+from lib.train.process_ckpt import change_info, extract_small_model, merge, show_info
 from vc_infer_pipeline import VC
 from sklearn.cluster import MiniBatchKMeans
 

lib/train/data_utils.py

@@ -3,8 +3,8 @@ import numpy as np
 import torch
 import torch.utils.data
 
-from mel_processing import spectrogram_torch
-from utils import load_wav_to_torch, load_filepaths_and_text
+from lib.train.mel_processing import spectrogram_torch
+from lib.train.utils import load_wav_to_torch, load_filepaths_and_text
 
 
 class TextAudioLoaderMultiNSFsid(torch.utils.data.Dataset):

lib/train/losses.py

@@ -1,5 +1,4 @@
 import torch
-from torch.nn import functional as F
 
 
 def feature_loss(fmap_r, fmap_g):

lib/train/process_ckpt.py

@@ -1,4 +1,4 @@
-import torch, traceback, os, pdb, sys
+import torch, traceback, os, sys
 
 now_dir = os.getcwd()
 sys.path.append(now_dir)

lib/train/utils.py

@@ -44,9 +44,10 @@ def load_checkpoint_d(checkpoint_path, combd, sbd, optimizer=None, load_opt=1):
             model.module.load_state_dict(new_state_dict, strict=False)
         else:
             model.load_state_dict(new_state_dict, strict=False)
+        return model
 
     go(combd, "combd")
-    go(sbd, "sbd")
+    model = go(sbd, "sbd")
     #############
     logger.info("Loaded model weights")