diff --git a/scripts/Clean.bat b/scripts/Clean.bat deleted file mode 100644 index aed7a1d..0000000 --- a/scripts/Clean.bat +++ /dev/null @@ -1,66 +0,0 @@ -chcp 65001 > NUL -@echo off -setlocal -echo 不要になった以下のフォルダ・ファイルを削除します: -echo 注: 学習やマージ等はApp.batへ統合されました。 -echo Style-Bert-VITS2\common\ -echo Style-Bert-VITS2\monotonic_align\ -echo Style-Bert-VITS2\text\ -echo Style-Bert-VITS2\tools\ -echo Style-Bert-VITS2\attentions.py -echo Style-Bert-VITS2\commons.py -echo Style-Bert-VITS2\Dataset.bat -echo Style-Bert-VITS2\infer.py -echo Style-Bert-VITS2\Merge.bat -echo Style-Bert-VITS2\models_jp_extra.py -echo Style-Bert-VITS2\models.py -echo Style-Bert-VITS2\modules.py -echo Style-Bert-VITS2\re_matching.py -echo Style-Bert-VITS2\spec_gen.py -echo Style-Bert-VITS2\Style.bat -echo Style-Bert-VITS2\Train.bat -echo Style-Bert-VITS2\transforms.py -echo Style-Bert-VITS2\update_status.py -echo Style-Bert-VITS2\utils.py -echo Style-Bert-VITS2\webui_dataset.py -echo Style-Bert-VITS2\webui_merge.py -echo Style-Bert-VITS2\webui_style_vectors.py -echo Style-Bert-VITS2\webui_train.py -echo Style-Bert-VITS2\webui.py -echo. -set /p delConfirm=以上のフォルダファイルを削除しますか？ (y/n): -if /I "%delConfirm%"=="Y" goto proceed -if /I "%delConfirm%"=="y" goto proceed -if "%delConfirm%"=="" goto proceed -goto end - -:proceed -rd /s /q "Style-Bert-VITS2\common" -rd /s /q "Style-Bert-VITS2\monotonic_align" -rd /s /q "Style-Bert-VITS2\text" -rd /s /q "Style-Bert-VITS2\tools" -del /q "Style-Bert-VITS2\attentions.py" -del /q "Style-Bert-VITS2\commons.py" -del /q "Style-Bert-VITS2\Dataset.bat" -del /q "Style-Bert-VITS2\infer.py" -del /q "Style-Bert-VITS2\Merge.bat" -del /q "Style-Bert-VITS2\models_jp_extra.py" -del /q "Style-Bert-VITS2\models.py" -del /q "Style-Bert-VITS2\modules.py" -del /q "Style-Bert-VITS2\re_matching.py" -del /q "Style-Bert-VITS2\spec_gen.py" -del /q "Style-Bert-VITS2\Style.bat" -del /q "Style-Bert-VITS2\Train.bat" -del /q "Style-Bert-VITS2\transforms.py" -del /q "Style-Bert-VITS2\update_status.py" -del /q "Style-Bert-VITS2\utils.py" -del /q "Style-Bert-VITS2\webui_dataset.py" -del /q "Style-Bert-VITS2\webui_merge.py" -del /q "Style-Bert-VITS2\webui_style_vectors.py" -del /q "Style-Bert-VITS2\webui_train.py" -del /q "Style-Bert-VITS2\webui.py" -echo 完了しました。 -pause - -:end -endlocal diff --git a/scripts/Install-Style-Bert-VITS2-CPU.bat b/scripts/Install-Style-Bert-VITS2-CPU.bat index aca6f50..6822658 100644 --- a/scripts/Install-Style-Bert-VITS2-CPU.bat +++ b/scripts/Install-Style-Bert-VITS2-CPU.bat @@ -1,46 +1,60 @@ chcp 65001 > NUL @echo off +setlocal -@REM https://github.com/Zuntan03/EasyBertVits2 より引用・改変 +set PS_CMD=PowerShell -NoProfile -NoLogo -ExecutionPolicy Bypass +set DL_URL=https://github.com/git-for-windows/git/releases/download/v2.44.0.windows.1/MinGit-2.44.0-64-bit.zip +set DL_DST=MinGit-2.44.0-64-bit.zip + +set REPO_URL=https://github.com/litagin02/Style-Bert-VITS2 + +@REM カレントディレクトリをbatファイルのディレクトリに変更 pushd %~dp0 -set PS_CMD=PowerShell -Version 5.1 -ExecutionPolicy Bypass - -set CURL_CMD=C:\Windows\System32\curl.exe -if not exist %CURL_CMD% ( - echo [ERROR] %CURL_CMD% が見つかりません。 - pause & popd & exit /b 1 -) @REM lib フォルダがなければ作成 if not exist lib\ ( mkdir lib ) -@REM Style-Bert-VITS2.zip をGitHubのmasterの最新のものをダウンロード -%CURL_CMD% -Lo Style-Bert-VITS2.zip^ - https://github.com/litagin02/Style-Bert-VITS2/archive/refs/heads/master.zip +echo -------------------------------------------------- +echo Downloading MinGit... +echo -------------------------------------------------- +curl -L %DL_URL% -o "%DL_DST%" if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) -@REM Style-Bert-VITS2.zip を解凍（フォルダ名前がBert-VITS2-masterになる） -%PS_CMD% Expand-Archive -Path Style-Bert-VITS2.zip -DestinationPath . -Force +@REM lib\MinGitフォルダに解凍 +echo -------------------------------------------------- +echo Extracting MinGit... +echo -------------------------------------------------- +%PS_CMD% "Expand-Archive -LiteralPath %DL_DST% -DestinationPath .\lib\MinGit -Force" if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) -@REM 元のzipを削除 -del Style-Bert-VITS2.zip +del %DL_DST% + +@REM Gitコマンドのパスを設定 +set PATH=%~dp0lib\MinGit\cmd;%PATH% + +echo -------------------------------------------------- +echo Checking Git Installation... +echo -------------------------------------------------- +git --version if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) -@REM Bert-VITS2-masterの中身をStyle-Bert-VITS2に上書き移動 -xcopy /QSY .\Style-Bert-VITS2-master\ .\Style-Bert-VITS2\ -rmdir /s /q Style-Bert-VITS2-master +echo -------------------------------------------------- +echo Cloning repository... +echo -------------------------------------------------- +git clone %REPO_URL% +if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) -echo ---------------------------------------- -echo Setup Python and Virtual Environment -echo ---------------------------------------- +echo -------------------------------------------------- +echo Setting up Python environment... +echo -------------------------------------------------- -@REM Pythonと仮想環境のセットアップを呼び出す（仮想環境が有効化されて戻ってくる） call Style-Bert-VITS2\scripts\Setup-Python.bat ..\..\lib\python ..\venv if %errorlevel% neq 0 ( popd & exit /b %errorlevel% ) -@REM 依存関係インストール +echo -------------------------------------------------- +echo Installing dependencies... +echo -------------------------------------------------- pip install -r Style-Bert-VITS2\requirements.txt if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) @@ -60,10 +74,10 @@ echo ---------------------------------------- @REM エディターの起動 python server_editor.py --inbrowser - pause popd popd +endlocal \ No newline at end of file diff --git a/scripts/Install-Style-Bert-VITS2.bat b/scripts/Install-Style-Bert-VITS2.bat index d674a9e..6179ea9 100644 --- a/scripts/Install-Style-Bert-VITS2.bat +++ b/scripts/Install-Style-Bert-VITS2.bat @@ -1,50 +1,66 @@ chcp 65001 > NUL @echo off +setlocal -@REM https://github.com/Zuntan03/EasyBertVits2 より引用・改変 +set PS_CMD=PowerShell -NoProfile -NoLogo -ExecutionPolicy Bypass +set DL_URL=https://github.com/git-for-windows/git/releases/download/v2.44.0.windows.1/MinGit-2.44.0-64-bit.zip +set DL_DST=MinGit-2.44.0-64-bit.zip + +set REPO_URL=https://github.com/litagin02/Style-Bert-VITS2 + +@REM カレントディレクトリをbatファイルのディレクトリに変更 pushd %~dp0 -set PS_CMD=PowerShell -Version 5.1 -ExecutionPolicy Bypass - -set CURL_CMD=C:\Windows\System32\curl.exe -if not exist %CURL_CMD% ( - echo [ERROR] %CURL_CMD% が見つかりません。 - pause & popd & exit /b 1 -) @REM lib フォルダがなければ作成 if not exist lib\ ( mkdir lib ) -@REM Style-Bert-VITS2.zip をGitHubのmasterの最新のものをダウンロード -%CURL_CMD% -Lo Style-Bert-VITS2.zip^ - https://github.com/litagin02/Style-Bert-VITS2/archive/refs/heads/master.zip +echo -------------------------------------------------- +echo Downloading MinGit... +echo -------------------------------------------------- +curl -L %DL_URL% -o "%DL_DST%" if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) -@REM Style-Bert-VITS2.zip を解凍（フォルダ名前がBert-VITS2-masterになる） -%PS_CMD% Expand-Archive -Path Style-Bert-VITS2.zip -DestinationPath . -Force +@REM lib\MinGitフォルダに解凍 +echo -------------------------------------------------- +echo Extracting MinGit... +echo -------------------------------------------------- +%PS_CMD% "Expand-Archive -LiteralPath %DL_DST% -DestinationPath .\lib\MinGit -Force" if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) -@REM 元のzipを削除 -del Style-Bert-VITS2.zip +del %DL_DST% + +@REM Gitコマンドのパスを設定 +set PATH=%~dp0lib\MinGit\cmd;%PATH% + +echo -------------------------------------------------- +echo Checking Git Installation... +echo -------------------------------------------------- +git --version if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) -@REM Bert-VITS2-masterの中身をStyle-Bert-VITS2に上書き移動 -xcopy /QSY .\Style-Bert-VITS2-master\ .\Style-Bert-VITS2\ -rmdir /s /q Style-Bert-VITS2-master +echo -------------------------------------------------- +echo Cloning repository... +echo -------------------------------------------------- +git clone %REPO_URL% +if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) -echo ---------------------------------------- -echo Setup Python and Virtual Environment -echo ---------------------------------------- +echo -------------------------------------------------- +echo Setting up Python environment... +echo -------------------------------------------------- -@REM Pythonと仮想環境のセットアップを呼び出す（仮想環境が有効化されて戻ってくる） call Style-Bert-VITS2\scripts\Setup-Python.bat ..\..\lib\python ..\venv if %errorlevel% neq 0 ( popd & exit /b %errorlevel% ) -@REM 依存関係インストール -pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 - +echo -------------------------------------------------- +echo Installing PyTorch... +echo -------------------------------------------------- +pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) +echo -------------------------------------------------- +echo Installing other dependencies... +echo -------------------------------------------------- pip install -r Style-Bert-VITS2\requirements.txt if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) @@ -64,10 +80,10 @@ echo ---------------------------------------- @REM エディターの起動 python server_editor.py --inbrowser - pause popd popd +endlocal diff --git a/scripts/Update-Style-Bert-VITS2.bat b/scripts/Update-Style-Bert-VITS2.bat index cf2733f..31542cd 100644 --- a/scripts/Update-Style-Bert-VITS2.bat +++ b/scripts/Update-Style-Bert-VITS2.bat @@ -2,51 +2,42 @@ chcp 65001 > NUL @echo off pushd %~dp0 -set PS_CMD=PowerShell -Version 5.1 -ExecutionPolicy Bypass -set CURL_CMD=C:\Windows\System32\curl.exe -if not exist %CURL_CMD% ( - echo [ERROR] %CURL_CMD% が見つかりません。 - pause & popd & exit /b 1 -) +set PATH=%~dp0lib\MinGit\cmd;%PATH% -@REM Style-Bert-VITS2.zip をGitHubのmasterの最新のものをダウンロード -%CURL_CMD% -Lo Style-Bert-VITS2.zip^ - https://github.com/litagin02/Style-Bert-VITS2/archive/refs/heads/master.zip +pushd Style-Bert-VITS2 + +echo -------------------------------------------------- +echo Checking Git Installation... +echo -------------------------------------------------- +git --version if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) -@REM Style-Bert-VITS2.zip を解凍（フォルダ名前がBert-VITS2-masterになる） -%PS_CMD% Expand-Archive -Path Style-Bert-VITS2.zip -DestinationPath . -Force -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) +pause -@REM 元のzipを削除 -del Style-Bert-VITS2.zip -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) - -@REM Bert-VITS2-masterの中身をStyle-Bert-VITS2に上書き移動 -xcopy /QSY .\Style-Bert-VITS2-master\ .\Style-Bert-VITS2\ -rmdir /s /q Style-Bert-VITS2-master +echo -------------------------------------------------- +echo Git pull... +echo -------------------------------------------------- +git pull if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) @REM 仮想環境のpip requirements.txtを更新 -echo call .\Style-Bert-VITS2\scripts\activate.bat -call .\Style-Bert-VITS2\venv\Scripts\activate.bat +echo -------------------------------------------------- +echo Updating dependencies... +echo -------------------------------------------------- + +@REM 仮想環境を有効化 +call .\venv\Scripts\activate.bat if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) -pip install -U -r Style-Bert-VITS2\requirements.txt +pip install -U -r requirements.txt if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) echo ---------------------------------------- -echo Update completed. Running Style-Bert-VITS2 Editor... +echo Update completed. echo ---------------------------------------- -@REM Style-Bert-VITS2フォルダに移動 -pushd Style-Bert-VITS2 - -@REM Style-Bert-VITS2 Editorを起動 -python server_editor.py --inbrowser - pause popd diff --git a/scripts/Update-to-Dict-Editor.bat b/scripts/Update-to-Dict-Editor.bat deleted file mode 100644 index 1eff1bd..0000000 --- a/scripts/Update-to-Dict-Editor.bat +++ /dev/null @@ -1,69 +0,0 @@ -chcp 65001 > NUL -@echo off - -pushd %~dp0 -set PS_CMD=PowerShell -Version 5.1 -ExecutionPolicy Bypass - -set CURL_CMD=C:\Windows\System32\curl.exe -if not exist %CURL_CMD% ( - echo [ERROR] %CURL_CMD% が見つかりません。 - pause & popd & exit /b 1 -) - -@REM Style-Bert-VITS2.zip をGitHubのmasterの最新のものをダウンロード -%CURL_CMD% -Lo Style-Bert-VITS2.zip^ - https://github.com/litagin02/Style-Bert-VITS2/archive/refs/heads/master.zip -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) - -@REM Style-Bert-VITS2.zip を解凍（フォルダ名前がBert-VITS2-masterになる） -%PS_CMD% Expand-Archive -Path Style-Bert-VITS2.zip -DestinationPath . -Force -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) - -@REM 元のzipを削除 -del Style-Bert-VITS2.zip -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) - -@REM Bert-VITS2-masterの中身をStyle-Bert-VITS2に上書き移動 -xcopy /QSY .\Style-Bert-VITS2-master\ .\Style-Bert-VITS2\ -rmdir /s /q Style-Bert-VITS2-master -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) - -@REM 仮想環境を有効化 - -echo call .\Style-Bert-VITS2\scripts\activate.bat -call .\Style-Bert-VITS2\venv\Scripts\activate.bat -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) - -@REM pyopenjtalk-prebuiltやpyopenjtalkが入っていたら削除 -echo python -m pip uninstall -y pyopenjtalk-prebuilt pyopenjtalk -python -m pip uninstall -y pyopenjtalk-prebuilt pyopenjtalk -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) - -@REM pyopenjtalk-dictをインストール -echo python -m pip install -U pyopenjtalk-dict -python -m pip install -U pyopenjtalk-dict - -@REM その他のrequirements.txtも一応更新 -python -m pip install -U -r Style-Bert-VITS2\requirements.txt -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) - -pushd Style-Bert-VITS2 - -@REM JP-Extra版以前からの場合のために一応initialize.pyを実行 - -echo python initialize.py -python initialize.py -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) - -echo ---------------------------------------- -echo Update completed. Running Style-Bert-VITS2 Editor... -echo ---------------------------------------- - -@REM Style-Bert-VITS2 Editorを起動 -python server_editor.py --inbrowser - -pause - -popd - -popd \ No newline at end of file