From 127672e57132e2a6bbc50fd26d2ae6ad1ee8e91e Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 26 Apr 2023 05:53:26 -0400 Subject: [PATCH 1/5] Attempting to fix svc to work with k8s --- voice_conversion/so-vits-svc-paul/Dockerfile | 34 ++++++- .../requirements-without-poetry.txt | 89 +++++++++++++++++++ .../src/so_vits_svc_fork/fakeyou_infer.py | 5 ++ 3 files changed, 124 insertions(+), 4 deletions(-) create mode 100644 voice_conversion/so-vits-svc-paul/requirements-without-poetry.txt diff --git a/voice_conversion/so-vits-svc-paul/Dockerfile b/voice_conversion/so-vits-svc-paul/Dockerfile index 7f6c48d..b6b0758 100644 --- a/voice_conversion/so-vits-svc-paul/Dockerfile +++ b/voice_conversion/so-vits-svc-paul/Dockerfile @@ -20,10 +20,36 @@ RUN apt-get update && apt-get install -y \ && apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/{apt,dpkg,cache,log}/ +RUN mkdir /install +WORKDIR /install +RUN curl -sSL https://install.python-poetry.org | python3 - + +#WORKDIR / + +#RUN find . | grep poetry + +COPY pyproject.toml . +COPY poetry.lock . +COPY requirements.txt . +COPY requirements-without-poetry.txt . + +#RUN python3 -m venv python \ +# && source python/bin/activate +# && pip install -r requirements.xt + +RUN pip install -r requirements-without-poetry.txt + +#COPY . . + +#RUN pip install +#RUN $HOME/.poetry/bin/poetry install +#RUN /root/.local/bin/poetry install -e . +#RUN pip install -e . + +WORKDIR / COPY . /models/voice_conversion/so-vits-svc - -WORKDIR /models/voice_conversion/so-vits-svc -RUN pip install -e . -WORKDIR / +#WORKDIR /models/voice_conversion/so-vits-svc +#RUN pip install -e . +#WORKDIR / diff --git a/voice_conversion/so-vits-svc-paul/requirements-without-poetry.txt b/voice_conversion/so-vits-svc-paul/requirements-without-poetry.txt new file mode 100644 index 0000000..5f1ffd4 --- /dev/null +++ b/voice_conversion/so-vits-svc-paul/requirements-without-poetry.txt @@ -0,0 +1,89 @@ +# This was obtained by building the original docker image, +# exec'ing in, then dumping pip requirements. + +absl-py==1.4.0 +antlr4-python3-runtime==4.8 +attrs==22.2.0 +audioread==3.0.0 +bitarray==2.7.3 +cachetools==5.3.0 +certifi==2022.12.7 +cffi==1.15.1 +charset-normalizer==3.1.0 +click==8.1.3 +cm-time==0.1.2 +colorama==0.4.6 +contourpy==1.0.7 +cycler==0.11.0 +Cython==0.29.34 +decorator==5.1.1 +fairseq==0.12.2 +fonttools==4.39.3 +google-auth==2.17.3 +google-auth-oauthlib==0.4.6 +grpcio==1.54.0 +hydra-core==1.0.7 +idna==3.4 +joblib==1.2.0 +kiwisolver==1.4.4 +librosa==0.8.1 +llvmlite==0.39.1 +lxml==4.9.2 +Markdown==3.4.3 +markdown-it-py==2.2.0 +MarkupSafe==2.1.2 +matplotlib==3.7.1 +mdurl==0.1.2 +numba==0.56.4 +numpy==1.23.5 +nvidia-cublas-cu11==11.10.3.66 +nvidia-cuda-nvrtc-cu11==11.7.99 +nvidia-cuda-runtime-cu11==11.7.99 +nvidia-cudnn-cu11==8.5.0.96 +oauthlib==3.2.2 +omegaconf==2.0.6 +onnx==1.13.1 +onnxoptimizer==0.3.10 +onnxsim==0.4.19 +packaging==23.1 +Pillow==9.5.0 +platformdirs==3.3.0 +pooch==1.7.0 +portalocker==2.7.0 +protobuf==3.20.3 +pyasn1==0.5.0 +pyasn1-modules==0.3.0 +pycparser==2.21 +Pygments==2.15.1 +PyInputPlus==0.2.12 +pyparsing==3.0.9 +PySimpleValidate==0.2.12 +python-dateutil==2.8.2 +pyworld==0.2.12 +PyYAML==6.0 +regex==2023.3.23 +requests==2.28.2 +requests-oauthlib==1.3.1 +resampy==0.4.2 +rich==13.3.4 +rsa==4.9 +sacrebleu==2.3.1 +scikit-learn==1.2.2 +scipy==1.8.0 +six==1.16.0 +# Editable install with no version control (so-vits-svc-fork==1.2.3) +# NB(bt): Commented out following line - +# -e /models/voice_conversion/so-vits-svc +soundfile==0.12.1 +stdiomask==0.0.6 +tabulate==0.9.0 +tensorboard==2.12.0 +tensorboard-data-server==0.7.0 +tensorboard-plugin-wit==1.8.1 +threadpoolctl==3.1.0 +torch==1.13.1 +torchaudio==0.13.1 +tqdm==4.65.0 +typing_extensions==4.5.0 +urllib3==1.26.15 +Werkzeug==2.3.0 diff --git a/voice_conversion/so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py b/voice_conversion/so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py index 3d4f105..608b5c3 100644 --- a/voice_conversion/so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py +++ b/voice_conversion/so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py @@ -1,5 +1,9 @@ from __future__ import annotations +import sys +#sys.path.append(".") +sys.path.append("/models/voice_conversion/so-vits-svc/src/so_vits_svc_fork") + import os from logging import ( DEBUG, @@ -194,6 +198,7 @@ def infer( ): """Inference""" from .inference_main import infer + #from inference_main import infer if not auto_predict_f0: LOG.warning( From 373557665420e8ebe3698bbaa2b05d1d1be4c774 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 26 Apr 2023 06:44:45 -0400 Subject: [PATCH 2/5] can call using python -m "module as script" invocation --- .../so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voice_conversion/so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py b/voice_conversion/so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py index 608b5c3..2568c12 100644 --- a/voice_conversion/so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py +++ b/voice_conversion/so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py @@ -2,7 +2,7 @@ from __future__ import annotations import sys #sys.path.append(".") -sys.path.append("/models/voice_conversion/so-vits-svc/src/so_vits_svc_fork") +#sys.path.append("/models/voice_conversion/so-vits-svc/src/so_vits_svc_fork") import os from logging import ( From d4a963413a45231aba9c7adc81a05c0fa0b06e5b Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 26 Apr 2023 07:41:21 -0400 Subject: [PATCH 3/5] report env vars --- .../so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/voice_conversion/so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py b/voice_conversion/so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py index 2568c12..9acf6fc 100644 --- a/voice_conversion/so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py +++ b/voice_conversion/so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py @@ -22,6 +22,8 @@ import pyinputplus as pyip import torch from rich.logging import RichHandler +print("Env vars:") +print(os.environ) def init_logger() -> None: IN_COLAB = os.getenv("COLAB_RELEASE_TAG") From 280c694783a8598b8e7363bd3bdade9de1c71252 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 26 Apr 2023 08:09:49 -0400 Subject: [PATCH 4/5] also install venv --- voice_conversion/so-vits-svc-paul/Dockerfile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/voice_conversion/so-vits-svc-paul/Dockerfile b/voice_conversion/so-vits-svc-paul/Dockerfile index b6b0758..c296818 100644 --- a/voice_conversion/so-vits-svc-paul/Dockerfile +++ b/voice_conversion/so-vits-svc-paul/Dockerfile @@ -34,18 +34,11 @@ COPY poetry.lock . COPY requirements.txt . COPY requirements-without-poetry.txt . -#RUN python3 -m venv python \ -# && source python/bin/activate -# && pip install -r requirements.xt - RUN pip install -r requirements-without-poetry.txt -#COPY . . - -#RUN pip install -#RUN $HOME/.poetry/bin/poetry install -#RUN /root/.local/bin/poetry install -e . -#RUN pip install -e . +RUN python3 -m venv python \ + && . python/bin/activate \ + && pip install -r requirements-without-poetry.txt WORKDIR / From 80a3d86205d79b7c4244ad65d81fc389b50f477b Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 26 Apr 2023 08:10:46 -0400 Subject: [PATCH 5/5] cleanup --- voice_conversion/so-vits-svc-paul/Dockerfile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/voice_conversion/so-vits-svc-paul/Dockerfile b/voice_conversion/so-vits-svc-paul/Dockerfile index c296818..b4370e3 100644 --- a/voice_conversion/so-vits-svc-paul/Dockerfile +++ b/voice_conversion/so-vits-svc-paul/Dockerfile @@ -23,18 +23,14 @@ RUN apt-get update && apt-get install -y \ RUN mkdir /install WORKDIR /install -RUN curl -sSL https://install.python-poetry.org | python3 - +#RUN curl -sSL https://install.python-poetry.org | python3 - -#WORKDIR / - -#RUN find . | grep poetry - -COPY pyproject.toml . -COPY poetry.lock . -COPY requirements.txt . +#COPY pyproject.toml . +#COPY poetry.lock . +#COPY requirements.txt . COPY requirements-without-poetry.txt . -RUN pip install -r requirements-without-poetry.txt +#RUN pip install -r requirements-without-poetry.txt RUN python3 -m venv python \ && . python/bin/activate \