Merge branch 'main' into dev-main-backup

Author: kalomaze

README.md

@@ -1,10 +1,5 @@
 # 7/25 Changelog:
-- Fixed the cli inferencing traceback.
-- SQL Databases implemented for formanting training stop.
-- Gradio browser tab renamed to `Mangio-RVC-Web 💻`.
-- Rudimentary functions from `infer-web.py` removed.
-- Formanting now accepts any audio format, as long as it is supported by FFmpeg.
-
+- Better MacOS installation script. For inference, all that needs to be done is running the `run.sh` from the extracted zip folder, where it will install Python 3.8, Homebrew, and other dependencies for you automatically. M1 Macs are natively supported for GPU acceleration, and training should work if you choose to download the pretrained models.
 
 # 7/23 Changelog:
 - Fp16 detection now works how it did before the last RVC beta; no more training slowdowns compared to how it was before then

extract_f0_print.py

@@ -19,8 +19,10 @@
 
 DoFormant = False
 
-Quefrency = 0.0
-Timbre = 0.0
+with open("formanting.txt", "r") as fvf:
+    content = fvf.readlines()
+    Quefrency, Timbre = content[1].split("\n")[0], content[2].split("\n")[0]
+
 
 def printt(strr):
     print(strr)

formanting.txt

@@ -0,0 +1,3 @@
+False
+8.0
+1.2

infer-web.py

@@ -105,4 +105,4 @@ def load_audio(file, sr, DoFormant, Quefrency, Timbre):
         converted = False
 
     conn.close()
-    return np.frombuffer(out, np.float32).flatten()
+    return np.frombuffer(out, np.float32).flatten()

my_utils.py

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# Define common paths for Homebrew
+BREW_PATHS=(
+  "/usr/local/bin"
+  "/opt/homebrew/bin"
+)
+
 if [[ "$(uname)" == "Darwin" ]]; then
   # macOS specific env:
   export PYTORCH_ENABLE_MPS_FALLBACK=1
@@ -11,6 +17,74 @@ fi
 
 requirements_file="requirements.txt"
 
+# Function to add a path to PATH
+add_to_path() {
+  echo "Homebrew found in $1, which is not in your PATH."
+  read -p "Do you want to add this path to your PATH? (y/n) " -n 1 -r
+  echo
+  if [[ $REPLY =~ ^[Yy]$ ]]; then
+    echo "Adding $1 to PATH..."
+
+    # Detect the shell and choose the right profile file
+    local shell_profile
+    if [[ $SHELL == *"/bash"* ]]; then
+      shell_profile="$HOME/.bashrc"
+      [[ ! -f "$shell_profile" ]] && shell_profile="$HOME/.bash_profile"
+    elif [[ $SHELL == *"/zsh"* ]]; then
+      shell_profile="$HOME/.zshrc"
+    else
+      echo "Unsupported shell. Please add the following line to your shell profile file manually:"
+      echo "export PATH=\"$PATH:$1\""
+      return
+    fi
+
+    # Add the export line to the shell profile file
+    echo "export PATH=\"$PATH:$1\"" >> "$shell_profile"
+
+    # Source the shell profile file
+    source "$shell_profile"
+
+    # Verify that the new PATH includes Homebrew
+    if ! command -v brew &> /dev/null; then
+      echo "Failed to add Homebrew to the PATH."
+    fi
+  fi
+}
+
+# Check if Homebrew is in PATH
+if command -v brew &> /dev/null; then
+  echo "Homebrew is already in your PATH."
+else
+  # If not, check common paths for Homebrew
+  echo "Homebrew not found in PATH. Checking common paths..."
+  for path in "${BREW_PATHS[@]}"; do
+    if [[ -x "$path/brew" ]]; then
+      add_to_path "$path"
+      break
+    fi
+  done
+fi
+
+# Check again if Homebrew is in PATH
+if ! command -v brew &> /dev/null; then
+  echo "Homebrew still not found. Attempting to install..."
+  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+fi
+
+# Verifying if Homebrew has been installed successfully
+if command -v brew &> /dev/null; then
+  echo "Homebrew installed successfully."
+else
+  echo "Homebrew installation failed."
+  exit 1
+fi
+
+# Installing ffmpeg with Homebrew
+if [[ "$(uname)" == "Darwin" ]]; then
+  echo "Installing ffmpeg..."
+  brew install ffmpeg
+fi
+
 # Check if Python 3.8 is installed
 if ! command -v python3.8 &> /dev/null; then
   echo "Python 3.8 not found. Attempting to install..."
@@ -27,7 +101,7 @@ fi
 
 # Check if required packages are installed and install them if not
 if [ -f "${requirements_file}" ]; then
-  installed_packages=$(python3.8 -m pip freeze)
+  installed_packages=$(python3.8 -m pip list --format=freeze)
   while IFS= read -r package; do
     [[ "${package}" =~ ^#.* ]] && continue
     package_name=$(echo "${package}" | sed 's/[<>=!].*//')
@@ -41,5 +115,27 @@ else
   exit 1
 fi
 
+# Install onnxruntime package
+echo "Installing onnxruntime..."
+python3.8 -m pip install onnxruntime
+
+download_if_not_exists() {
+  local filename=$1
+  local url=$2
+  if [ ! -f "$filename" ]; then
+    echo "$filename does not exist, downloading..."
+    curl -# -L -o "$filename" "$url"
+    echo "Download finished."
+  else
+    echo "$filename already exists."
+  fi
+}
+
+# Check and download hubert_base.pt
+download_if_not_exists "hubert_base.pt" "https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main/hubert_base.pt"
+
+# Check and download rmvpe.pt
+download_if_not_exists "rmvpe.pt" "https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main/rmvpe.pt"
+
 # Run the main script
-python3.8 infer-web.py --pycmd python3.8
+python3.8 infer-web.py --pycmd python3.8

run.sh

@@ -33,8 +33,6 @@
     DistributedBucketSampler,
 )
 
-import sqlite3
-
 if hps.version == "v1":
     from lib.infer_pack.models import (
         SynthesizerTrnMs256NSFsid as RVC_Model_f0,
@@ -256,7 +254,6 @@ def run(rank, n_gpus, hps):
 def train_and_evaluate(
     rank, epoch, hps, nets, optims, schedulers, scaler, loaders, logger, writers, cache
 ):
-    
     net_g, net_d = nets
     optim_g, optim_d = optims
     train_loader, eval_loader = loaders
@@ -353,10 +350,6 @@ def train_and_evaluate(
 
     # Run steps
     epoch_recorder = EpochRecorder()
-    
-    conn = sqlite3.connect('TEMP/db:cachedb?mode=memory&cache=shared', check_same_thread=False)
-    cursor = conn.cursor()
-    
     for batch_idx, info in data_iterator:
         # Data
         ## Unpack
@@ -575,33 +568,33 @@ def train_and_evaluate(
                     ),
                 )
             )
-    
-    cursor.execute("SELECT stop FROM stop_train LIMIT 1")
-    if bool(cursor.fetchone()) == True:
-        logger.info("Stop Button was pressed. The program is closed.")
-        if hasattr(net_g, "module"):
-            ckpt = net_g.module.state_dict()
-        else:
-            ckpt = net_g.state_dict()
-        logger.info(
-            "saving final ckpt:%s"
-            % (
-                savee(
-                    ckpt,
-                    hps.sample_rate,
-                    hps.if_f0,
-                    hps.name,
-                    epoch,
-                    hps.version,
-                    hps,
+
+    with open("stop.txt", "r+") as tostop:
+        content = tostop.read()
+        if "stop" in content:
+            logger.info("Stop Button was pressed. The program is closed.")
+            if hasattr(net_g, "module"):
+                ckpt = net_g.module.state_dict()
+            else:
+                ckpt = net_g.state_dict()
+            logger.info(
+                "saving final ckpt:%s"
+                % (
+                    savee(
+                        ckpt,
+                        hps.sample_rate,
+                        hps.if_f0,
+                        hps.name,
+                        epoch,
+                        hps.version,
+                        hps,
+                    )
                 )
             )
-        )
-        sleep(1)
-        cursor.execute("DELETE FROM stop_train")
-        conn.commit()
-        conn.close()
-        os._exit(2333333)
+
+            tostop.truncate(0)
+            tostop.writelines("not")
+            os._exit(2333333)
 
     if rank == 0:
         logger.info("====> Epoch: {} {}".format(epoch, epoch_recorder.record()))
@@ -621,11 +614,7 @@ def train_and_evaluate(
             )
         )
         sleep(1)
-        cursor.execute("DELETE FROM stop_train")
-        conn.commit()
-        conn.close()
         os._exit(2333333)
-        
 
 
 if __name__ == "__main__":