diff --git a/.github/workflows/unitest.yml b/.github/workflows/unitest.yml index 11f6555..85679ec 100644 --- a/.github/workflows/unitest.yml +++ b/.github/workflows/unitest.yml @@ -25,7 +25,7 @@ jobs: python -m pip install --upgrade setuptools python -m pip install --upgrade wheel pip install torch torchvision torchaudio - pip install -r requirements.txt + pip install -r requirements/requirements.txt rvcmd -notrs -w 1 -notui assets/all - name: Test step 1 & 2 run: | diff --git a/Dockerfile b/Dockerfile index 71eb4ff..daead36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 COPY . . -RUN python3 -m pip install --no-cache-dir -r requirements.txt +RUN python3 -m pip install --no-cache-dir -r requirements/requirements.txt RUN aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main/pretrained_v2/D40k.pth -d assets/pretrained_v2/ -o D40k.pth RUN aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main/pretrained_v2/G40k.pth -d assets/pretrained_v2/ -o G40k.pth diff --git a/README.md b/README.md index 8927d52..fcea540 100644 --- a/README.md +++ b/README.md @@ -85,19 +85,19 @@ sh ./run.sh 3. 根据自己的显卡安装对应依赖 - N卡 ```bash - pip install -r requirements.txt + pip install -r requirements/requirements.txt ``` - A卡/I卡 ```bash - pip install -r requirements-dml.txt + pip install -r requirements/requirements-dml.txt ``` - A卡ROCM(Linux) ```bash - pip install -r requirements-amd.txt + pip install -r requirements/requirements-amd.txt ``` - I卡IPEX(Linux) ```bash - pip install -r requirements-ipex.txt + pip install -r requirements/requirements-ipex.txt ``` ## 其他资源准备 diff --git a/docs/en/README.en.md b/docs/en/README.en.md index 127eb41..c2a66fd 100644 --- a/docs/en/README.en.md +++ b/docs/en/README.en.md @@ -85,19 +85,19 @@ sh ./run.sh 3. Install the corresponding dependencies according to your own graphics card. - Nvidia GPU ```bash - pip install -r requirements.txt + pip install -r requirements/requirements.txt ``` - AMD/Intel GPU ```bash - pip install -r requirements-dml.txt + pip install -r requirements/requirements-dml.txt ``` - AMD ROCM (Linux) ```bash - pip install -r requirements-amd.txt + pip install -r requirements/requirements-amd.txt ``` - Intel IPEX (Linux) ```bash - pip install -r requirements-ipex.txt + pip install -r requirements/requirements-ipex.txt ``` ## Preparation of Other Files diff --git a/docs/fr/README.fr.md b/docs/fr/README.fr.md index 3b83398..1cbe3db 100644 --- a/docs/fr/README.fr.md +++ b/docs/fr/README.fr.md @@ -70,16 +70,16 @@ poetry install Ou vous pouvez utiliser pip pour installer les dépendances : ```bash # Cartes Nvidia : -pip install -r requirements.txt +pip install -r requirements/requirements.txt # Cartes AMD/Intel : -pip install -r requirements-dml.txt +pip install -r requirements/requirements-dml.txt # Cartes Intel avec IPEX -pip install -r requirements-ipex.txt +pip install -r requirements/requirements-ipex.txt # Cartes AMD sur Linux (ROCm) -pip install -r requirements-amd.txt +pip install -r requirements/requirements-amd.txt ``` ------ diff --git a/docs/jp/README.ja.md b/docs/jp/README.ja.md index e3889e0..dbb14c3 100644 --- a/docs/jp/README.ja.md +++ b/docs/jp/README.ja.md @@ -86,19 +86,19 @@ sh ./run.sh 3. 自分の GPU に対応する依存関係をインストールします。 - Nvidia GPU ```bash - pip install -r requirements.txt + pip install -r requirements/requirements.txt ``` - AMD/Intel GPU ```bash - pip install -r requirements-dml.txt + pip install -r requirements/requirements-dml.txt ``` - AMD ROCM (Linux) ```bash - pip install -r requirements-amd.txt + pip install -r requirements/requirements-amd.txt ``` - Intel IPEX (Linux) ```bash - pip install -r requirements-ipex.txt + pip install -r requirements/requirements-ipex.txt ``` ## その他のデータを準備 diff --git a/docs/kr/README.ko.han.md b/docs/kr/README.ko.han.md index 02ea29e..977a8d2 100644 --- a/docs/kr/README.ko.han.md +++ b/docs/kr/README.ko.han.md @@ -59,7 +59,7 @@ poetry install pip를 活用하여依存를 設置하여도 無妨합니다. ```bash -pip install -r requirements.txt +pip install -r requirements/requirements.txt ``` ## 其他預備모델準備 diff --git a/docs/kr/README.ko.md b/docs/kr/README.ko.md index a1249e5..7b3c49c 100644 --- a/docs/kr/README.ko.md +++ b/docs/kr/README.ko.md @@ -85,25 +85,25 @@ pip install torch torchvision torchaudio --index-url https://download.pytorch.or - N카드 ```bash -pip install -r requirements.txt +pip install -r requirements/requirements.txt ``` - A카드/I카드 ```bash -pip install -r requirements-dml.txt +pip install -r requirements/requirements-dml.txt ``` - A카드ROCM(Linux) ```bash -pip install -r requirements-amd.txt +pip install -r requirements/requirements-amd.txt ``` - I카드IPEX(Linux) ```bash -pip install -r requirements-ipex.txt +pip install -r requirements/requirements-ipex.txt ``` #### 2. poetry를 통한 의존성 설치 diff --git a/docs/pt/README.pt.md b/docs/pt/README.pt.md index a96ba5d..c6577d0 100644 --- a/docs/pt/README.pt.md +++ b/docs/pt/README.pt.md @@ -79,16 +79,16 @@ Você também pode usar pip para instalá-los: ```bash for Nvidia graphics cards - pip install -r requirements.txt + pip install -r requirements/requirements.txt for AMD/Intel graphics cards on Windows (DirectML): - pip install -r requirements-dml.txt + pip install -r requirements/requirements-dml.txt for Intel ARC graphics cards on Linux / WSL using Python 3.10: - pip install -r requirements-ipex.txt + pip install -r requirements/requirements-ipex.txt for AMD graphics cards on Linux (ROCm): - pip install -r requirements-amd.txt + pip install -r requirements/requirements-amd.txt ``` ------ diff --git a/docs/tr/README.tr.md b/docs/tr/README.tr.md index 4af7427..32911bc 100644 --- a/docs/tr/README.tr.md +++ b/docs/tr/README.tr.md @@ -71,13 +71,13 @@ Ayrıca bunları pip kullanarak da kurabilirsiniz: ```bash Nvidia grafik kartları için - pip install -r requirements.txt + pip install -r requirements/requirements.txt AMD/Intel grafik kartları için: - pip install -r requirements-dml.txt + pip install -r requirements/requirements-dml.txt Intel ARC grafik kartları için Linux / WSL ile Python 3.10 kullanarak: - pip install -r requirements-ipex.txt + pip install -r requirements/requirements-ipex.txt ``` diff --git a/requirements-amd.txt b/requirements/requirements-amd.txt similarity index 100% rename from requirements-amd.txt rename to requirements/requirements-amd.txt diff --git a/requirements-dml.txt b/requirements/requirements-dml.txt similarity index 100% rename from requirements-dml.txt rename to requirements/requirements-dml.txt diff --git a/requirements-gui-dml.txt b/requirements/requirements-gui-dml.txt similarity index 100% rename from requirements-gui-dml.txt rename to requirements/requirements-gui-dml.txt diff --git a/requirements-gui.txt b/requirements/requirements-gui.txt similarity index 100% rename from requirements-gui.txt rename to requirements/requirements-gui.txt diff --git a/requirements-ipex.txt b/requirements/requirements-ipex.txt similarity index 100% rename from requirements-ipex.txt rename to requirements/requirements-ipex.txt diff --git a/requirements-py311.txt b/requirements/requirements-py311.txt similarity index 100% rename from requirements-py311.txt rename to requirements/requirements-py311.txt diff --git a/requirements.txt b/requirements/requirements.txt similarity index 100% rename from requirements.txt rename to requirements/requirements.txt diff --git a/run.sh b/run.sh index acb70ed..4e1ceda 100755 --- a/run.sh +++ b/run.sh @@ -11,7 +11,7 @@ if [ -d ".venv" ]; then . .venv/bin/activate else echo "Create venv..." - requirements_file="requirements.txt" + requirements_file="requirements/requirements.txt" # Check if Python 3.8 is installed if ! (command -v python3.8 >/dev/null 2>&1 || pyenv versions --bare | grep -q "3.8"); then