Fix infer req and not to use virtualenv

This commit is contained in:
litagin02
2024-06-01 14:08:56 +09:00
parent 3994089e3c
commit f80846b223
3 changed files with 12 additions and 19 deletions

View File

@@ -17,7 +17,7 @@
- 英語の音声合成の速度向上([gordon0414](https://github.com/gordon0414)さんによる[PR](https://github.com/litagin02/Style-Bert-VITS2/pull/124)です、ありがとうございます!) - 英語の音声合成の速度向上([gordon0414](https://github.com/gordon0414)さんによる[PR](https://github.com/litagin02/Style-Bert-VITS2/pull/124)です、ありがとうございます!)
- エディターの各種機能改善(多くが[kamexy](https://github.com/kamexy)様による[エディターリポジトリ](https://github.com/litagin02/Style-Bert-VITS2-Editor)へのプルリク群です、ありがとうございます!) - エディターの各種機能改善(多くが[kamexy](https://github.com/kamexy)様による[エディターリポジトリ](https://github.com/litagin02/Style-Bert-VITS2-Editor)へのプルリク群です、ありがとうございます!)
- 選択した行の下に新規の行を作成できるように - 選択した行の下に新規の行を作成できるように
- 日本語変換のエンターで音声合成が走るバグの修正 - Mac使用時に日本語変換のエンターで音声合成が走るバグの修正
- ペースト時に改行を含まない場合は通常のペーストの振る舞いになるように修正 - ペースト時に改行を含まない場合は通常のペーストの振る舞いになるように修正

View File

@@ -11,7 +11,7 @@ num2words
# protobuf==4.25 # protobuf==4.25
psutil psutil
# punctuators # punctuators
# pyannote.audio>=3.1.0 pyannote.audio>=3.1.0
# pyloudnorm # pyloudnorm
pyopenjtalk-dict pyopenjtalk-dict
pypinyin pypinyin
@@ -20,4 +20,4 @@ pyworld-prebuilt
# tensorboard # tensorboard
torch torch
transformers transformers
# umap-learn umap-learn

View File

@@ -78,31 +78,24 @@ if not exist "%PYTHON_DIR%"\ (
echo Executing: "%PYTHON_CMD%" "%PYTHON_DIR%\get-pip.py" --no-warn-script-location echo Executing: "%PYTHON_CMD%" "%PYTHON_DIR%\get-pip.py" --no-warn-script-location
"%PYTHON_CMD%" "%PYTHON_DIR%\get-pip.py" --no-warn-script-location "%PYTHON_CMD%" "%PYTHON_DIR%\get-pip.py" --no-warn-script-location
if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) if !errorlevel! neq 0 ( pause & exit /b !errorlevel! )
echo --------------------------------------------------
echo Installing virtualenv...
echo --------------------------------------------------
echo Executing: "%PYTHON_CMD%" -m pip install virtualenv --no-warn-script-location
"%PYTHON_CMD%" -m pip install virtualenv --no-warn-script-location
if !errorlevel! neq 0 ( pause & exit /b !errorlevel! )
) )
if not exist %VENV_DIR%\ ( if not exist %VENV_DIR%\ (
echo --------------------------------------------------
echo Installing uv...
echo --------------------------------------------------
echo Executing: "%PYTHON_CMD%" -m pip install uv
"%PYTHON_CMD%" -m pip install uv
if !errorlevel! neq 0 ( pause & exit /b !errorlevel! )
echo -------------------------------------------------- echo --------------------------------------------------
echo Creating virtual environment... echo Creating virtual environment...
echo -------------------------------------------------- echo --------------------------------------------------
echo Executing: "%PYTHON_CMD%" -m virtualenv --copies "%VENV_DIR%" echo Executing: "%PYTHON_CMD%" -m uv venv "%VENV_DIR%"
"%PYTHON_CMD%" -m virtualenv --copies "%VENV_DIR%" "%PYTHON_CMD%" -m uv venv "%VENV_DIR%"
if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) if !errorlevel! neq 0 ( pause & exit /b !errorlevel! )
) )
echo --------------------------------------------------
echo Activating virtual environment...
echo --------------------------------------------------
echo Executing: call "%VENV_DIR%\Scripts\activate.bat"
call "%VENV_DIR%\Scripts\activate.bat"
if !errorlevel! neq 0 ( pause & exit /b !errorlevel! )
echo -------------------------------------------------- echo --------------------------------------------------
echo Completed. echo Completed.
echo -------------------------------------------------- echo --------------------------------------------------