diff --git a/.github/workflows/test_cli.yml b/.github/workflows/test_cli.yml index c43eab3..784350d 100644 --- a/.github/workflows/test_cli.yml +++ b/.github/workflows/test_cli.yml @@ -27,20 +27,15 @@ jobs: - name: Установка зависимостей run: | - pip install --upgrade pip==23.1 + pip install --upgrade pip==24.0 pip install --no-cache-dir -r requirements.txt - - - name: Установка ffmpeg - run: | - sudo apt-get update - sudo apt-get install -y ffmpeg + pip uninstall torch torchvision torchaudio -y + pip install --no-cache-dir torch==2.4.0 torchvision==0.19.0 torchaudio==2.4.0 --index-url https://download.pytorch.org/whl/cu121 - name: Установка необходимых моделей run: | python download_models.py - mkdir -p models/Tsoi - wget https://huggingface.co/Politrees/Victor_Tsoi/resolve/main/model.index -O models/Tsoi/model.index - wget https://huggingface.co/Politrees/Victor_Tsoi/resolve/main/model.pth -O models/Tsoi/model.pth + python3 -m rvc.modules.model_manager "https://huggingface.co/Politrees/Victor_Tsoi/resolve/main/Victor_Tsoi.zip?download=true" "Tsoi" - name: Установка аудио для теста run: | @@ -69,20 +64,15 @@ jobs: - name: Установка зависимостей run: | - pip install --upgrade pip==23.1 + pip install --upgrade pip==24.0 pip install --no-cache-dir -r requirements.txt - - - name: Установка ffmpeg - run: | - sudo apt-get update - sudo apt-get install -y ffmpeg + pip uninstall torch torchvision torchaudio -y + pip install --no-cache-dir torch==2.4.0 torchvision==0.19.0 torchaudio==2.4.0 --index-url https://download.pytorch.org/whl/cu121 - name: Установка необходимых моделей run: | python download_models.py - mkdir -p models/Tsoi - wget https://huggingface.co/Politrees/Victor_Tsoi/resolve/main/model.index -O models/Tsoi/model.index - wget https://huggingface.co/Politrees/Victor_Tsoi/resolve/main/model.pth -O models/Tsoi/model.pth + python3 -m rvc.modules.model_manager "https://huggingface.co/Politrees/Victor_Tsoi/resolve/main/Victor_Tsoi.zip?download=true" "Tsoi" - name: Запуск скрипта tts_cli run: | diff --git a/PolGen.exe b/PolGen.exe new file mode 100644 index 0000000..f513226 Binary files /dev/null and b/PolGen.exe differ diff --git a/install-run.bat b/install-run.bat deleted file mode 100644 index ad58dae..0000000 --- a/install-run.bat +++ /dev/null @@ -1,64 +0,0 @@ -@echo off -setlocal -title PolGen -set "principal=%cd%" -set "CONDA_ROOT_PREFIX=%UserProfile%\Miniconda3" -set "INSTALL_ENV_DIR=%principal%\env" -set "MINICONDA_DOWNLOAD_URL=https://repo.anaconda.com/miniconda/Miniconda3-py39_23.9.0-0-Windows-x86_64.exe" -set "CONDA_EXECUTABLE=%CONDA_ROOT_PREFIX%\Scripts\conda.exe" -if not exist env ( - if not exist "%CONDA_EXECUTABLE%" ( - echo Miniconda not found. Starting download and installation... - echo Downloading Miniconda... - powershell -Command "& {Invoke-WebRequest -Uri '%MINICONDA_DOWNLOAD_URL%' -OutFile 'miniconda.exe'}" - if not exist "miniconda.exe" ( - echo Download failed. Please check your internet connection and try again. - goto :error - ) - - echo Installing Miniconda... - start /wait "" miniconda.exe /InstallationType=JustMe /RegisterPython=0 /S /D=%CONDA_ROOT_PREFIX% - if errorlevel 1 ( - echo Miniconda installation failed. - goto :error - ) - del miniconda.exe - echo Miniconda installation complete. - ) else ( - echo Miniconda already installed. Skipping installation. - ) - echo. - - echo Creating Conda environment... - call "%CONDA_ROOT_PREFIX%\_conda.exe" create --no-shortcuts -y -k --prefix "%INSTALL_ENV_DIR%" python=3.9 - if errorlevel 1 goto :error - echo Conda environment created successfully. - echo. - - if exist "%INSTALL_ENV_DIR%\python.exe" ( - echo Installing specific pip version... - "%INSTALL_ENV_DIR%\python.exe" -m pip install --no-warn-script-location "pip<24.1" - if errorlevel 1 goto :error - echo Pip installation complete. - echo. - ) - - echo Installing dependencies... - "%INSTALL_ENV_DIR%\python.exe" -m pip install --no-warn-script-location -r requirements.txt - if errorlevel 1 goto :error - cls - echo Dependencies installed successfully. - echo. -) - -env\python download_models.py - -env\python app.py --open -if errorlevel 1 goto :error - -goto :eof - -:error -echo An error occurred. Exiting... -pause -exit /b 1 diff --git a/install-run.sh b/install-run.sh index 2a8c594..ad13f65 100644 --- a/install-run.sh +++ b/install-run.sh @@ -57,6 +57,8 @@ if [ ! -d "env" ]; then conda activate "$INSTALL_ENV_DIR" || exit 1 pip install --upgrade setuptools || exit 1 pip install -r "$principal/requirements.txt" || exit 1 + pip uninstall torch torchvision torchaudio -y + pip install torch==2.4.0 torchvision==0.19.0 torchaudio==2.4.0 --index-url https://download.pytorch.org/whl/cu121 || exit 1 conda deactivate echo "Dependencies installation complete." echo diff --git a/requirements-win.txt b/requirements-win.txt new file mode 100644 index 0000000..eb78b27 --- /dev/null +++ b/requirements-win.txt @@ -0,0 +1,121 @@ +PySocks==1.7.1 +aiofiles==23.2.1 +aiohappyeyeballs==2.4.0 +aiohttp==3.10.5 +aiosignal==1.3.1 +annotated-types==0.7.0 +antlr4-python3-runtime==4.8 +anyio==4.4.0 +async-timeout==4.0.3 +attrs==24.2.0 +audioread==3.0.1 +beautifulsoup4==4.12.3 +bitarray==2.9.2 +certifi==2024.8.30 +cffi==1.17.1 +charset-normalizer==3.3.2 +click==8.1.7 +colorama==0.4.6 +contourpy==1.3.0 +cycler==0.12.1 +cython==3.0.11 +decorator==5.1.1 +edge-tts==6.1.12 +einops==0.8.0 +exceptiongroup==1.2.2 +fairseq==0.12.2 +faiss-cpu==1.7.3 +fastapi==0.112.4 +ffmpeg-python==0.2.0 +ffmpy==0.4.0 +filelock==3.16.0 +fonttools==4.53.1 +frozenlist==1.4.1 +fsspec==2024.9.0 +future==1.0.0 +gdown==5.2.0 +gradio==4.43.0 +gradio-client==1.3.0 +h11==0.14.0 +httpcore==1.0.5 +httpx==0.27.2 +huggingface-hub==0.24.6 +hydra-core==1.0.7 +idna==3.8 +importlib-resources==6.4.5 +jinja2==3.1.4 +joblib==1.4.2 +kiwisolver==1.4.7 +lazy-loader==0.4 +librosa==0.10.2.post1 +llvmlite==0.43.0 +local-attention==1.9.15 +lxml==5.3.0 +markdown-it-py==3.0.0 +markupsafe==2.1.5 +matplotlib==3.9.2 +mdurl==0.1.2 +mega.py==1.0.8 +mpmath==1.3.0 +msgpack==1.1.0 +multidict==6.1.0 +networkx==3.2.1 +numba==0.60.0 +numpy==1.23.5 +omegaconf==2.0.6 +orjson==3.10.7 +packaging==24.1 +pandas==2.2.2 +pedalboard==0.9.14 +pillow==10.4.0 +platformdirs==4.3.2 +pooch==1.8.2 +portalocker==2.10.1 +praat-parselmouth==0.4.4 +protobuf==5.28.0 +pycparser==2.22 +pycryptodome==3.20.0 +pydantic==2.9.1 +pydantic-core==2.23.3 +pydub==0.25.1 +pygments==2.18.0 +pyparsing==3.1.4 +python-dateutil==2.9.0.post0 +python-multipart==0.0.9 +pytz==2024.1 +pywin32==306 +pyworld==0.3.4 +pyyaml==6.0.2 +regex==2024.7.24 +requests==2.32.3 +resampy==0.4.3 +rich==13.8.1 +ruff==0.6.4 +sacrebleu==2.4.3 +scikit-learn==1.5.1 +scipy==1.13.1 +semantic-version==2.10.0 +shellingham==1.5.4 +six==1.16.0 +sniffio==1.3.1 +soundfile==0.12.1 +soupsieve==2.6 +soxr==0.5.0.post1 +starlette==0.38.5 +sympy==1.13.2 +tabulate==0.9.0 +tenacity==5.1.5 +tensorboardX==2.6.2.2 +threadpoolctl==3.5.0 +tomlkit==0.12.0 +torchcrepe==0.0.23 +tqdm==4.66.5 +typer==0.12.5 +typing-extensions==4.12.2 +tzdata==2024.1 +urllib3==2.2.2 +uvicorn==0.30.6 +websockets==12.0 +wget==3.2 +yarl==1.11.1 +zipp==3.20.1