Merge pull request #1219 from IAHispano/py312

Py312

Author: Vidalnt

.github/workflows/pre_compiled.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ["3.11"]
+        python-version: ["3.12"]
 
     steps:
       - uses: actions/checkout@v4

app.py

@@ -73,14 +73,7 @@
 
 # Define Gradio interface
 with gr.Blocks(
-    theme=my_applio,
     title="Applio",
-    css="footer{display:none !important}",
-    js=(
-        pathlib.Path(os.path.join(now_dir, "tabs", "realtime", "main.js")).read_text()
-        if client_mode
-        else None
-    ),
 ) as Applio:
     gr.Markdown("# Applio")
     gr.Markdown(
@@ -138,6 +131,13 @@ def launch_gradio(server_name: str, server_port: int) -> None:
         server_name=server_name,
         server_port=server_port,
         prevent_thread_lock=client_mode,
+        theme=my_applio,
+        css="footer{display:none !important}",
+        js=(
+            pathlib.Path(os.path.join(now_dir, "tabs", "realtime", "main.js")).read_text()
+            if client_mode
+            else None
+        ),
     )
 
     if client_mode:

assets/Applio.ipynb

@@ -86,13 +86,8 @@
         "%cd {repo_name}\n",
         "clear_output()\n",
         "\n",
-        "# Install older python\n",
         "!apt update -y\n",
-        "!apt install -y python3.11 python3.11-distutils python3.11-dev portaudio19-dev\n",
-        "!update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 2\n",
-        "!update-alternatives --set python3 /usr/bin/python3.11\n",
-        "from sys import path\n",
-        "path.append('/usr/local/lib/python3.11/dist-packages')\n",
+        "!apt install -y portaudio19-dev\n",
         "\n",
         "print(\"Installing requirements...\")\n",
         "!curl -LsSf https://astral.sh/uv/install.sh | sh\n",

assets/Applio_Kaggle.ipynb

@@ -56,9 +56,7 @@
     "!git clone --depth 1 $uioawhd $new_name --branch 3.6.1\n",
     "clear_output()\n",
     "!apt update -y\n",
-    "!apt install -y python3.11 python3.11-distutils python3.11-dev portaudio19-dev psmisc\n",
-    "!update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 2\n",
-    "!update-alternatives --set python3 /usr/bin/python3.11\n",
+    "!apt install -y portaudio19-dev psmisc\n",
     "!uv pip install -q -r /kaggle/working/program_ml/requirements.txt --extra-index-url https://download.pytorch.org/whl/cu128 --index-strategy unsafe-best-match --system\n",
     "%cd /kaggle/working/program_ml\n",
     "!python core.py \"prerequisites\" --models \"True\" --exe \"True\" --pretraineds_hifigan \"True\" > /dev/null 2>&1\n",

assets/Applio_NoUI.ipynb

@@ -87,13 +87,8 @@
         "!git clone https://github.com/IAHispano/Applio --branch 3.6.1 --single-branch\n",
         "%cd /content/Applio\n",
         "\n",
-        "# Install older python\n",
         "!apt update -y\n",
-        "!apt install -y python3.11 python3.11-distutils python3.11-dev portaudio19-dev\n",
-        "!update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 2\n",
-        "!update-alternatives --set python3 /usr/bin/python3.11\n",
-        "from sys import path\n",
-        "path.append('/usr/local/lib/python3.11/dist-packages')\n",
+        "!apt install -y portaudio19-dev\n",
         "\n",
         "print(\"Installing requirements...\")\n",
         "!curl -LsSf https://astral.sh/uv/install.sh | sh\n",

requirements.txt

@@ -2,16 +2,16 @@
 pip>=23.3; sys_platform == 'darwin'
 wheel; sys_platform == 'darwin'
 PyYAML; sys_platform == 'darwin'
-numpy==1.26.4
+numpy==2.3.5
 requests>=2.31.0,<2.32.0
 tqdm
 wget
 
 # Audio processing
 ffmpeg-python>=0.2.0
-faiss-cpu==1.7.3
+faiss-cpu==1.13.2
 librosa==0.11.0
-scipy==1.11.1
+scipy==1.16.3
 soundfile==0.12.1
 noisereduce
 pedalboard
@@ -20,23 +20,22 @@ soxr
 
 # Machine learning and deep learning
 omegaconf>=2.0.6; sys_platform == 'darwin'
-numba; sys_platform == 'linux'
-numba==0.61.0; sys_platform == 'darwin' or sys_platform == 'win32'
+numba==0.63.1
 torch==2.7.1; sys_platform == 'darwin'
 torch==2.7.1+cu128; sys_platform == 'linux' or sys_platform == 'win32'
 torchaudio==2.7.1; sys_platform == 'darwin'
 torchaudio==2.7.1+cu128; sys_platform == 'linux' or sys_platform == 'win32'
 torchvision==0.22.1; sys_platform == 'darwin'
 torchvision==0.22.1+cu128; sys_platform == 'linux' or sys_platform == 'win32'
-torchcrepe==0.0.23
+torchcrepe
 torchfcpe
 einops
 transformers==4.44.2
 
 # Visualization and UI
-matplotlib==3.7.2
+matplotlib==3.10.8
 tensorboard
-gradio==6.4.0
+gradio==6.5.1
 
 # Miscellaneous utilities
 certifi>=2023.07.22; sys_platform == 'darwin'

run-install.bat

@@ -8,7 +8,7 @@ echo.
 set "INSTALL_DIR=%cd%"
 set "MINICONDA_DIR=%UserProfile%\Miniconda3"
 set "ENV_DIR=%INSTALL_DIR%\env"
-set "MINICONDA_URL=https://repo.anaconda.com/miniconda/Miniconda3-py311_25.5.1-1-Windows-x86_64.exe"
+set "MINICONDA_URL=https://repo.anaconda.com/miniconda/Miniconda3-py312_25.11.1-1-Windows-x86_64.exe"
 set "CONDA_EXE=%MINICONDA_DIR%\Scripts\conda.exe"
 
 set "startTime=%TIME%"
@@ -75,7 +75,7 @@ exit /b 0
 
 :create_conda_env
 echo Creating Conda environment...
-call "%MINICONDA_DIR%\_conda.exe" create --no-shortcuts -y -k --prefix "%ENV_DIR%" python=3.11
+call "%MINICONDA_DIR%\_conda.exe" create --no-shortcuts -y -k --prefix "%ENV_DIR%" python=3.12
 if errorlevel 1 goto :error
 echo Conda environment created successfully.
 echo.
@@ -110,4 +110,4 @@ goto :error
 :error
 echo An error occurred during installation. Please check the output above for details.
 pause
-exit /b 1
+exit /b 1

run-install.sh

@@ -3,7 +3,7 @@ set -e  # Exit immediately if a command exits with a non-zero status
 
 printf "\033]0;Installer\007"
 clear
-rm -f *.bat  
+rm -f *.bat
 
 # Function to log messages with timestamps
 log_message() {
@@ -13,13 +13,13 @@ log_message() {
 
 # Function to find a suitable Python version
 find_python() {
-    for py in python3.11 python3 python; do
+    for py in python3.12 python3 python; do
         if command -v "$py" > /dev/null 2>&1; then
             echo "$py"
             return
         fi
     done
-    log_message "No compatible Python installation found. Please install Python 3.11."
+    log_message "No compatible Python installation found. Please install Python 3.12."
     exit 1
 }
 
@@ -97,13 +97,13 @@ create_venv() {
     py=$(find_python)
 
     curl -LsSf https://astral.sh/uv/install.sh | sh
-    uv venv .venv --python 3.11
+    uv venv .venv --python 3.12
 
     log_message "Activating virtual environment..."
     source .venv/bin/activate
 
     install_ffmpeg
-    install_python_ffmpeg  
+    install_python_ffmpeg
 
     log_message "Installing dependencies..."
     if [ -f "requirements.txt" ]; then
@@ -134,41 +134,39 @@ if [ "$(uname)" = "Darwin" ]; then
     # Add more detailed Python version check
     log_message "Checking Python versions..."
     log_message "python3 path: $(which python3)"
-    log_message "python3.11 path: $(which python3.11 2>/dev/null || echo 'not found')"
-    
-    if command -v python3.11 >/dev/null 2>&1; then
-        python_version=$(python3.11 --version | awk '{print $2}' | cut -d'.' -f1,2)
+    log_message "python3.12 path: $(which python3.12 2>/dev/null || echo 'not found')"
+
+    if command -v python3.12 >/dev/null 2>&1; then
+        python_version=$(python3.12 --version | awk '{print $2}' | cut -d'.' -f1,2)
     else
         python_version=$(python3 --version | awk '{print $2}' | cut -d'.' -f1,2)
     fi
-    
+
     log_message "Detected Python version: $python_version"
 
-    if [ "$python_version" = "3.11" ]; then
-        log_message "Found compatible Python 3.11"
+    if [ "$python_version" = "3.12" ]; then
+        log_message "Found compatible Python 3.12"
     else
-        log_message "Python version $python_version is not 3.11. Installing Python 3.11 using Homebrew..."
-        brew install python@3.11
-        export PATH="$(brew --prefix)/opt/python@3.11/bin:$PATH"
+        log_message "Python version $python_version is not 3.12. Installing Python 3.12 using Homebrew..."
+        brew install python@3.12
+        export PATH="$(brew --prefix)/opt/python@3.12/bin:$PATH"
         # Verify the installed version
         log_message "Verifying installed Python version..."
-        python_version=$(python3.11 --version | awk '{print $2}' | cut -d'.' -f1,2)
-        if [ "$python_version" != "3.11" ]; then
-            log_message "Failed to install Python 3.11. Current version: $python_version"
+        python_version=$(python3.12 --version | awk '{print $2}' | cut -d'.' -f1,2)
+        if [ "$python_version" != "3.12" ]; then
+            log_message "Failed to install Python 3.12. Current version: $python_version"
             exit 1
         fi
     fi
 
     brew install faiss
     export PYTORCH_ENABLE_MPS_FALLBACK=1
     export PYTORCH_MPS_HIGH_WATERMARK_RATIO=0.0
-    export PATH="$(brew --prefix)/bin:$PATH"  
+    export PATH="$(brew --prefix)/bin:$PATH"
 elif [ "$(uname)" != "Linux" ]; then
     log_message "Unsupported operating system. Are you using Windows?"
     log_message "If yes, use the batch (.bat) file instead of this one!"
     exit 1
 fi
 
 prepare_install
-
-

rvc/train/utils.py

@@ -188,8 +188,10 @@ def plot_spectrogram_to_numpy(spectrogram):
     plt.tight_layout()
 
     fig.canvas.draw()
-    data = np.frombuffer(fig.canvas.tostring_rgb(), dtype=np.uint8)
-    data = data.reshape(fig.canvas.get_width_height()[::-1] + (3,))
+    buf = fig.canvas.renderer.buffer_rgba()
+    w, h = fig.canvas.get_width_height()
+    data = np.frombuffer(buf, dtype=np.uint8).reshape(h, w, 4)[..., :3]
+
     plt.close(fig)
     return data