diff --git a/.github/workflows/unitest.yml b/.github/workflows/unitest.yml index e693cfc..db6273e 100644 --- a/.github/workflows/unitest.yml +++ b/.github/workflows/unitest.yml @@ -70,15 +70,13 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - nvidia-smi - sudo apt update wget https://github.com/fumiama/RVC-Models-Downloader/releases/download/v0.2.11/rvcmd_linux_amd64.deb sudo apt -y install ./rvcmd_linux_amd64.deb pip install --force pip==24.0 # fix fairseq installing issue https://github.com/facebookresearch/fairseq/issues/5552 python -m pip install --upgrade setuptools python -m pip install --upgrade wheel pip install torch torchvision torchaudio - pip install -r requirements/main.txt + pip install -r requirements/cpu.txt rvcmd -notrs -w 1 -notui assets/rvc - name: Test step 1 & 2 run: | diff --git a/configs/config.py b/configs/config.py index 8a92f37..ef26272 100644 --- a/configs/config.py +++ b/configs/config.py @@ -4,6 +4,7 @@ import sys import json import shutil from multiprocessing import cpu_count +import importlib.util import torch @@ -46,7 +47,6 @@ class Config(metaclass=Singleton): self.global_link, self.noparallel, self.noautoopen, - self.dml, self.nocheck, self.update, ) = self.arg_parse() @@ -83,11 +83,6 @@ class Config(metaclass=Singleton): action="store_true", help="Do not open in browser automatically", ) - parser.add_argument( - "--dml", - action="store_true", - help="torch_dml", - ) parser.add_argument( "--nocheck", action="store_true", help="Run without checking assets" ) @@ -104,7 +99,6 @@ class Config(metaclass=Singleton): cmd_opts.global_link, cmd_opts.noparallel, cmd_opts.noautoopen, - cmd_opts.dml, cmd_opts.nocheck, cmd_opts.update, ) @@ -183,7 +177,7 @@ class Config(metaclass=Singleton): if self.has_xpu(): self.device = self.instead = "xpu:0" self.is_half = True - i_device = int(self.device.split(":")[-1]) + i_device = int(str(self.device).split(":")[-1]) self.gpu_name = torch.cuda.get_device_name(i_device) if ( ("16" in self.gpu_name and "V100" not in self.gpu_name.upper()) @@ -239,7 +233,7 @@ class Config(metaclass=Singleton): x_query = 5 x_center = 30 x_max = 32 - if self.dml: + if importlib.util.find_spec("torch_directml") is not None: logger.info("Use DirectML instead") import torch_directml diff --git a/requirements/amd.txt b/requirements/amd.txt index 2821e94..0f52b52 100644 --- a/requirements/amd.txt +++ b/requirements/amd.txt @@ -1,4 +1,3 @@ -tensorflow-rocm joblib>=1.1.0 numba numpy diff --git a/requirements/cpu.txt b/requirements/cpu.txt new file mode 100644 index 0000000..6bdaefb --- /dev/null +++ b/requirements/cpu.txt @@ -0,0 +1,49 @@ +joblib>=1.1.0 +numba +numpy +scipy +librosa>=0.10.2 +llvmlite +fairseq @ git+https://github.com/fumiama/fairseq.git +faiss-cpu +gradio +Cython +pydub>=0.25.1 +tensorboardX +Jinja2>=3.1.2 +json5 +Markdown +matplotlib>=3.7.0 +matplotlib-inline>=0.1.3 +praat-parselmouth>=0.4.2 +Pillow>=9.1.1 +resampy>=0.4.2 +scikit-learn +tensorboard +tqdm>=4.63.1 +tornado>=6.1 +Werkzeug>=2.2.3 +uc-micro-py>=1.0.1 +sympy>=1.11.1 +tabulate>=0.8.10 +PyYAML>=6.0 +pyasn1>=0.4.8 +pyasn1-modules>=0.2.8 +fsspec>=2022.11.0 +absl-py>=1.2.0 +audioread +uvicorn>=0.21.1 +colorama>=0.4.5 +pyworld==0.3.2 +httpx +onnxruntime; sys_platform == 'darwin' +torchcrepe>=0.0.23 +fastapi +torchfcpe +python-dotenv>=1.0.0 +av +pybase16384 +--extra-index-url https://download.pytorch.org/whl/cpu +torch +torchvision +torchaudio