Revert "removed npy as it's not needed anymore"

This reverts commit e02094b.

RVC-GUI.bat

@@ -1,2 +1,2 @@
-python rvcgui.py --pycmd python
+python.exe rvcgui.py --pycmd python.exe
 pause

rvcgui.py

@@ -95,7 +95,7 @@ def vc_single(
  f0_file,
  f0_method,
  file_index,
- # file_big_npy,
+ file_big_npy,
  index_rate,
  output_path=None,
 ): # spk_item, input_audio0, vc_transform0,f0_file,f0method0
@@ -117,10 +117,10 @@ def vc_single(
  .strip(" ")
  .replace("trained", "added")
  ) # 防止小白写错，自动帮他替换掉
- # file_big_npy = (
- # file_big_npy.strip(" ").strip('"').strip(
- # "\n").strip('"').strip(" "))
-
+ file_big_npy = (
+ file_big_npy.strip(" ").strip('"').strip(
+ "\n").strip('"').strip(" ")
+ )
  audio_opt = vc.pipeline(
  hubert_model,
  net_g,
@@ -130,12 +130,14 @@ def vc_single(
  f0_up_key,
  f0_method,
  file_index,
- # file_big_npy,
+ file_big_npy,
  index_rate,
  if_f0,
  f0_file=f0_file,
  )
-
+ print(
+ "npy: ", times[0], "s, f0: ", times[1], "s, infer: ", times[2], "s", sep=""
+ )
 
  if output_path is not None:
  sf.write(output_path, audio_opt, tgt_sr)
@@ -147,7 +149,59 @@ def vc_single(
  return info, (None, None)
 
 
-
+def vc_multi(
+ sid,
+ dir_path,
+ opt_root,
+ paths,
+ f0_up_key,
+ f0_method,
+ file_index,
+ file_big_npy,
+ index_rate,
+):
+ try:
+ dir_path = (
+ dir_path.strip(" ").strip('"').strip("\n").strip('"').strip(" ")
+ ) # 防止小白拷路径头尾带了空格和"和回车
+ opt_root = opt_root.strip(" ").strip(
+ '"').strip("\n").strip('"').strip(" ")
+ os.makedirs(opt_root, exist_ok=True)
+ try:
+ if dir_path != "":
+ paths = [os.path.join(dir_path, name)
+ for name in os.listdir(dir_path)]
+ else:
+ paths = [path.name for path in paths]
+ except:
+ traceback.print_exc()
+ paths = [path.name for path in paths]
+ infos = []
+ for path in paths:
+ info, opt = vc_single(
+ sid,
+ path,
+ f0_up_key,
+ None,
+ f0_method,
+ file_index,
+ file_big_npy,
+ index_rate,
+ )
+ if info == "Success":
+ try:
+ tgt_sr, audio_opt = opt
+ wavfile.write(
+ "%s/%s" % (opt_root, os.path.basename(path)
+ ), tgt_sr, audio_opt
+ )
+ except:
+ info = traceback.format_exc()
+ infos.append("%s->%s" % (os.path.basename(path), info))
+ yield "\n".join(infos)
+ yield "\n".join(infos)
+ except:
+ yield traceback.format_exc()
 
 
 def get_vc(weight_path, sid):
@@ -281,20 +335,20 @@ def on_button_click():
  f0_file = f0_file_entry.get()
  f0_method = f0_method_entry.get()
  file_index = file_index_entry.get()
- # file_big_npy = file_big_npy_entry.get()
+ file_big_npy = file_big_npy_entry.get()
  index_rate = round(index_rate_entry.get(),2)
  global output_file
  output_file = get_output_path(input_audio)
  print("sid: ", sid, "input_audio: ", input_audio, "f0_pitch: ", f0_pitch, "f0_file: ", f0_file, "f0_method: ", f0_method,
- "file_index: ", file_index, "index_rate: ", index_rate, "output_file: ", output_file)
+ "file_index: ", file_index, "file_big_npy: ", file_big_npy, "index_rate: ", index_rate, "output_file: ", output_file)
  # Call the vc_single function with the user input values
  if model_loaded == True and os.path.isfile(input_audio):
  try:
  loading_progress.pack(padx=10, pady=10)
  loading_progress.start()
 
  result, audio_opt = vc_single(
- 0, input_audio, f0_pitch, None, f0_method, file_index, index_rate, output_file)
+ 0, input_audio, f0_pitch, None, f0_method, file_index, file_big_npy, index_rate, output_file)
  # output_label.configure(text=result + "\n saved at" + output_file)
  print(os.path.join(output_file))
  if os.path.exists(output_file) and os.path.getsize(output_file) > 0:
@@ -355,27 +409,27 @@ def start_processing():
 def selected_model(choice):
 
  file_index_entry.delete(0, ctk.END)
- # file_big_npy_entry.delete(0, ctk.END)
+ file_big_npy_entry.delete(0, ctk.END)
  model_dir = os.path.normpath(os.path.join(models_dir, choice))
  pth_file = [f for f in os.listdir(model_dir) if os.path.isfile(
  os.path.join(model_dir, f)) and f.endswith(".pth")]
  if pth_file:
  global pth_file_path
  pth_file_path = os.path.join(model_dir, pth_file[0])
- index_files = [f for f in os.listdir(model_dir) if os.path.isfile(
- os.path.join(model_dir, f)) and  f.endswith(".index")]
- if index_files:
- index_files_dir = [os.path.join(model_dir, f) for f in index_files]
- if len(index_files_dir) == 2:
+ npy_files = [f for f in os.listdir(model_dir) if os.path.isfile(
+ os.path.join(model_dir, f)) and (f.endswith(".npy") or f.endswith(".index"))]
+ if npy_files:
+ npy_files_dir = [os.path.join(model_dir, f) for f in npy_files]
+ if len(npy_files_dir) == 2:
  index_file = [
- f for f in index_files_dir if f.endswith(".index")][0]
-
+ f for f in npy_files_dir if f.endswith(".index")][0]
+ npy_file = [f for f in npy_files_dir if f.endswith(".npy")][0]
  print(f".pth file directory: {pth_file_path}")
  print(f".index file directory: {index_file}")
- # print(f".npy file directory: {npy_file}")
+ print(f".npy file directory: {npy_file}")
 
  file_index_entry.insert(0, index_file)
-
+  file_big_npy_entry.insert(0, npy_file)
 
  else:
  print(
@@ -488,7 +542,9 @@ def update_config(selected):
 file_index_label = ctk.CTkLabel(right_frame, text=".index File (Recommended)")
 file_index_entry = ctk.CTkEntry(right_frame, width=250)
 
-
+# intiilizing big npy file widget
+file_big_npy_label = ctk.CTkLabel(right_frame, text=".npy File (Recommended)")
+file_big_npy_entry = ctk.CTkEntry(right_frame, width=250)
 
 # intiilizing index rate widget
 index_rate_entry = ctk.CTkSlider(
@@ -562,6 +618,8 @@ def update_config(selected):
 f0_file_entry.grid(padx=10, pady=10)
 file_index_label.grid(padx=10, pady=10)
 file_index_entry.grid(padx=10, pady=10)
+file_big_npy_label.grid(padx=10, pady=10)
+file_big_npy_entry.grid(padx=10, pady=10)
 index_rate_label.grid(padx=10, pady=10)
 index_rate_entry.grid(padx=10, pady=10)
 run_button.grid(padx=30, pady=30)