Skip to content

Commit 71cc31a

Browse files
committed
fix: make ci happy
1 parent e71b6c4 commit 71cc31a

4 files changed

Lines changed: 53 additions & 13 deletions

File tree

.github/workflows/unitest.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,13 @@ jobs:
7070
python-version: ${{ matrix.python-version }}
7171
- name: Install dependencies
7272
run: |
73-
nvidia-smi
74-
sudo apt update
7573
wget https://github.com/fumiama/RVC-Models-Downloader/releases/download/v0.2.11/rvcmd_linux_amd64.deb
7674
sudo apt -y install ./rvcmd_linux_amd64.deb
7775
pip install --force pip==24.0 # fix fairseq installing issue https://github.com/facebookresearch/fairseq/issues/5552
7876
python -m pip install --upgrade setuptools
7977
python -m pip install --upgrade wheel
8078
pip install torch torchvision torchaudio
81-
pip install -r requirements/main.txt
79+
pip install -r requirements/cpu.txt
8280
rvcmd -notrs -w 1 -notui assets/rvc
8381
- name: Test step 1 & 2
8482
run: |

configs/config.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import json
55
import shutil
66
from multiprocessing import cpu_count
7+
import importlib.util
78

89
import torch
910

@@ -46,7 +47,6 @@ def __init__(self):
4647
self.global_link,
4748
self.noparallel,
4849
self.noautoopen,
49-
self.dml,
5050
self.nocheck,
5151
self.update,
5252
) = self.arg_parse()
@@ -83,11 +83,6 @@ def arg_parse() -> tuple:
8383
action="store_true",
8484
help="Do not open in browser automatically",
8585
)
86-
parser.add_argument(
87-
"--dml",
88-
action="store_true",
89-
help="torch_dml",
90-
)
9186
parser.add_argument(
9287
"--nocheck", action="store_true", help="Run without checking assets"
9388
)
@@ -104,7 +99,6 @@ def arg_parse() -> tuple:
10499
cmd_opts.global_link,
105100
cmd_opts.noparallel,
106101
cmd_opts.noautoopen,
107-
cmd_opts.dml,
108102
cmd_opts.nocheck,
109103
cmd_opts.update,
110104
)
@@ -183,7 +177,7 @@ def device_config(self):
183177
if self.has_xpu():
184178
self.device = self.instead = "xpu:0"
185179
self.is_half = True
186-
i_device = int(self.device.split(":")[-1])
180+
i_device = int(str(self.device).split(":")[-1])
187181
self.gpu_name = torch.cuda.get_device_name(i_device)
188182
if (
189183
("16" in self.gpu_name and "V100" not in self.gpu_name.upper())
@@ -239,7 +233,7 @@ def device_config(self):
239233
x_query = 5
240234
x_center = 30
241235
x_max = 32
242-
if self.dml:
236+
if importlib.util.find_spec("torch_directml") is not None:
243237
logger.info("Use DirectML instead")
244238
import torch_directml
245239

requirements/amd.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
tensorflow-rocm
21
joblib>=1.1.0
32
numba
43
numpy

requirements/cpu.txt

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
joblib>=1.1.0
2+
numba
3+
numpy
4+
scipy
5+
librosa>=0.10.2
6+
llvmlite
7+
fairseq @ git+https://github.com/fumiama/fairseq.git
8+
faiss-cpu
9+
gradio
10+
Cython
11+
pydub>=0.25.1
12+
tensorboardX
13+
Jinja2>=3.1.2
14+
json5
15+
Markdown
16+
matplotlib>=3.7.0
17+
matplotlib-inline>=0.1.3
18+
praat-parselmouth>=0.4.2
19+
Pillow>=9.1.1
20+
resampy>=0.4.2
21+
scikit-learn
22+
tensorboard
23+
tqdm>=4.63.1
24+
tornado>=6.1
25+
Werkzeug>=2.2.3
26+
uc-micro-py>=1.0.1
27+
sympy>=1.11.1
28+
tabulate>=0.8.10
29+
PyYAML>=6.0
30+
pyasn1>=0.4.8
31+
pyasn1-modules>=0.2.8
32+
fsspec>=2022.11.0
33+
absl-py>=1.2.0
34+
audioread
35+
uvicorn>=0.21.1
36+
colorama>=0.4.5
37+
pyworld==0.3.2
38+
httpx
39+
onnxruntime; sys_platform == 'darwin'
40+
torchcrepe>=0.0.23
41+
fastapi
42+
torchfcpe
43+
python-dotenv>=1.0.0
44+
av
45+
pybase16384
46+
--extra-index-url https://download.pytorch.org/whl/cpu
47+
torch
48+
torchvision
49+
torchaudio

0 commit comments

Comments
 (0)