launcher upgrades

+added fix for RVC installer
+moved rvc launcher webui + realtime into seperate .bat file
This commit is contained in:
deffcolony
2024-09-12 17:00:36 +02:00
parent 4268635d9d
commit 090cdec213
4 changed files with 64 additions and 20 deletions

View File

@@ -1597,7 +1597,8 @@ echo %cyan_fg_strong%^| What would you like to do?
echo 1. Start AllTalk
echo 2. Start XTTS
echo 3. Start RVC
echo 3. Start RVC WEBUI
echo 4. Start RVC REALTIME [Voice Changer to use with Discord, Steam, etc...]
echo %cyan_fg_strong% ______________________________________________________________%reset%
echo %cyan_fg_strong%^| Menu Options: ^|%reset%
echo 0. Back
@@ -1609,16 +1610,40 @@ echo %cyan_fg_strong%^|
for /f %%A in ('"prompt $H &echo on &for %%B in (1) do rem"') do set "BS=%%A"
:: Set the prompt with spaces
set /p "app_launcher_voice_gen_choice=%BS% Choose Your Destiny: "
set /p "app_launcher_voice_generation_choice=%BS% Choose Your Destiny: "
REM ########## APP LAUNCHER TEXT COMPLETION - BACKEND #########
if "%app_launcher_voice_gen_choice%"=="1" (
if "%app_launcher_voice_generation_choice%"=="1" (
call :start_alltalk
) else if "%app_launcher_voice_gen_choice%"=="2" (
) else if "%app_launcher_voice_generation_choice%"=="2" (
call :start_xtts
) else if "%app_launcher_voice_gen_choice%"=="3" (
call :start_rvc
) else if "%app_launcher_voice_gen_choice%"=="0" (
) else if "%app_launcher_voice_generation_choice%"=="3" (
set "caller=app_launcher_voice_generation"
if exist "%app_launcher_voice_generation_dir%\start_rvc.bat" (
call %app_launcher_voice_generation_dir%\start_rvc.bat
goto :home
) else (
echo [%DATE% %TIME%] ERROR: start_rvc.bat not found in: app_launcher_voice_generation_dir% >> %logs_stl_console_path%
echo %red_bg%[%time%]%reset% %red_fg_strong%[ERROR] start_rvc.bat not found in: %app_launcher_voice_generation_dir%%reset%
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Running Automatic Repair...
git pull
pause
goto :home
)
) else if "%app_launcher_voice_generation_choice%"=="4" (
set "caller=app_launcher_voice_generation"
if exist "%app_launcher_voice_generation_dir%\start_rvc_realtime.bat" (
call %app_launcher_voice_generation_dir%\start_rvc_realtime.bat
goto :home
) else (
echo [%DATE% %TIME%] ERROR: start_rvc_realtime.bat not found in: app_launcher_voice_generation_dir% >> %logs_stl_console_path%
echo %red_bg%[%time%]%reset% %red_fg_strong%[ERROR] start_rvc_realtime.bat not found in: %app_launcher_voice_generation_dir%%reset%
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Running Automatic Repair...
git pull
pause
goto :home
)
) else if "%app_launcher_voice_generation_choice%"=="0" (
goto :app_launcher
) else (
echo [%DATE% %TIME%] %log_invalidinput% >> %logs_stl_console_path%
@@ -1666,16 +1691,6 @@ start cmd /k "title XTTSv2 API Server && cd /d %xtts_install_path% && %xtts_star
goto :home
:start_rvc
REM Activate the alltalk environment
call conda activate rvc
REM Start RVC with desired configurations
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% RVC launched in a new window.
start cmd /k "title RVC && cd /d %rvc_install_path% && python infer-web.py --port 7897"
goto :home
REM ############################################################
REM ######## APP LAUNCHER IMAGE GENERATION - FRONTEND ##########
REM ############################################################

View File

@@ -90,29 +90,35 @@ call "%miniconda_path%\Scripts\activate.bat"
REM Create a Conda environment named rvc
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Creating Conda environment: %cyan_fg_strong%rvc%reset%
call conda create -n rvc python=3.10.6 -y
call conda create -n rvc python=3.10.9 -y
REM Activate the rvc environment
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Activating Conda environment: %cyan_fg_strong%rvc%reset%
call conda activate rvc
REM Downgrade pip to version 24.0.0 because fairseq from facebookresearch fails at pip-24.2
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Downgrading pip-24.2 to: %cyan_fg_strong%pip-24.0%reset%
python -m pip install pip==24.0.0
REM Use the GPU choice made earlier to install requirements for RVC
if "%GPU_CHOICE%"=="1" (
echo %blue_bg%[%time%]%reset% %cyan_fg_strong%[rvc]%reset% %blue_fg_strong%[INFO]%reset% Installing NVIDIA version from requirements.txt in conda enviroment: %cyan_fg_strong%rvc%reset%
pip install -r requirements.txt
pip install torch==2.2.1+cu121 torchaudio==2.2.1+cu121 --upgrade --force-reinstall --extra-index-url https://download.pytorch.org/whl/cu121
pip install -r requirements.txt
goto :install_rvc_final
) else if "%GPU_CHOICE%"=="2" (
echo %blue_bg%[%time%]%reset% %cyan_fg_strong%[rvc]%reset% %blue_fg_strong%[INFO]%reset% Installing AMD version from requirements-amd.txt in conda enviroment: %cyan_fg_strong%rvc%reset%
pip install -r requirements-amd.txt
pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/rocm5.6
pip install -r requirements-amd.txt
goto :install_rvc_final
) else if "%GPU_CHOICE%"=="3" (
echo %blue_bg%[%time%]%reset% %cyan_fg_strong%[rvc]%reset% %blue_fg_strong%[INFO]%reset% Installing AMD/Intel DirectML version from requirements-dml.txt in conda enviroment: %cyan_fg_strong%rvc%reset%
pip install torch torchvision torchaudio
pip install -r requirements-dml.txt
goto :install_rvc_final
) else if "%GPU_CHOICE%"=="4" (
echo %blue_bg%[%time%]%reset% %cyan_fg_strong%[rvc]%reset% %blue_fg_strong%[INFO]%reset% Installing Intel Arc IPEX version from requirements-ipex.txt in conda enviroment: %cyan_fg_strong%rvc%reset%
pip install torch torchvision torchaudio
pip install -r requirements-ipex.txt
goto :install_rvc_final
)
@@ -121,7 +127,10 @@ REM Install pip packages that are not in requirements list
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Installing pip modules for GUI
pip install FreeSimpleGUI
pip install sounddevice
REM pip install python-dotenv
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% %green_fg_strong%RVC successfully installed.%reset%
echo %yellow_bg%[%time%]%reset% %yellow_fg_strong%[WARN] In order to start RVC correctly please install FFMPEG from: / Home / Toolbox / App Installer / Core Utilities / Install FFmpeg%reset%
pause
goto :app_installer_voice_generation

View File

@@ -0,0 +1,10 @@
@echo off
:start_rvc
REM Activate the alltalk environment
call conda activate rvc
REM Start RVC with desired configurations
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% RVC launched in a new window.
start cmd /k "title RVC WEBUI && cd /d %rvc_install_path% && python infer-web.py --port 7897"
goto :home

View File

@@ -0,0 +1,10 @@
@echo off
:start_rvc
REM Activate the alltalk environment
call conda activate rvc
REM Start RVC with desired configurations
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% RVC launched in a new window.
start cmd /k "title RVC REALTIME && cd /d %rvc_install_path% && python gui_v1.py"
goto :home