diff --git a/docker_vcclient/Dockerfile b/docker_vcclient/Dockerfile index c93d0e24..67b0457e 100644 --- a/docker_vcclient/Dockerfile +++ b/docker_vcclient/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update \ WORKDIR / ADD dummy / -RUN git clone https://github.com/w-okada/voice-changer.git -b v.1.5.3.6 +RUN git clone https://github.com/w-okada/voice-changer.git -b v.1.5.3.9a @@ -17,20 +17,20 @@ RUN chmod 0777 /voice-changer/server WORKDIR /voice-changer/server RUN pip install -r requirements.txt -RUN git clone https://github.com/isletennos/MMVC_Client.git MMVC_Client_v13 -RUN cd MMVC_Client_v13 && git checkout 04f3fec4fd82dea6657026ec4e1cd80fb29a415c && cd - +# RUN git clone https://github.com/isletennos/MMVC_Client.git MMVC_Client_v13 +# RUN cd MMVC_Client_v13 && git checkout 04f3fec4fd82dea6657026ec4e1cd80fb29a415c && cd - -RUN git clone https://github.com/isletennos/MMVC_Client.git MMVC_Client_v15 -RUN cd MMVC_Client_v15 && git checkout 461cb231b57cbb17243110eaac8435d9cca24a26 && cd - +# RUN git clone https://github.com/isletennos/MMVC_Client.git MMVC_Client_v15 +# RUN cd MMVC_Client_v15 && git checkout 461cb231b57cbb17243110eaac8435d9cca24a26 && cd - -RUN git clone https://github.com/StarStringStudio/so-vits-svc.git so-vits-svc-40 -RUN cd so-vits-svc-40 && git checkout 293fe0bc03a583df17846c715c179152745c1b8d && cd - -RUN git clone https://github.com/StarStringStudio/so-vits-svc.git so-vits-svc-40v2 -RUN cd so-vits-svc-40v2 && git checkout 08c70ff3d2f7958820b715db2a2180f4b7f92f8d && cd - -RUN git clone https://github.com/yxlllc/DDSP-SVC.git DDSP-SVC -RUN cd DDSP-SVC && git checkout e716efb14aee747492bc6ac1deb07506c26ed550 && cd - -RUN git clone https://github.com/liujing04/Retrieval-based-Voice-Conversion-WebUI.git RVC -RUN cd RVC && git checkout 563c64ded9925085f547b13ecafb8eb9c182952b && cd - +# RUN git clone https://github.com/StarStringStudio/so-vits-svc.git so-vits-svc-40 +# RUN cd so-vits-svc-40 && git checkout 293fe0bc03a583df17846c715c179152745c1b8d && cd - +# RUN git clone https://github.com/StarStringStudio/so-vits-svc.git so-vits-svc-40v2 +# RUN cd so-vits-svc-40v2 && git checkout 08c70ff3d2f7958820b715db2a2180f4b7f92f8d && cd - +# RUN git clone https://github.com/yxlllc/DDSP-SVC.git DDSP-SVC +# RUN cd DDSP-SVC && git checkout e716efb14aee747492bc6ac1deb07506c26ed550 && cd - +# RUN git clone https://github.com/liujing04/Retrieval-based-Voice-Conversion-WebUI.git RVC +# RUN cd RVC && git checkout 563c64ded9925085f547b13ecafb8eb9c182952b && cd - ADD /setup.sh /voice-changer/server ADD /exec.sh /voice-changer/server diff --git a/start_docker.sh b/start_docker.sh index 1c10b6da..6287e634 100644 --- a/start_docker.sh +++ b/start_docker.sh @@ -27,11 +27,16 @@ if [ "${USE_GPU}" = "on" ]; then -p ${EX_PORT}:18888 \ $DOCKER_IMAGE -p 18888 --https true \ --content_vec_500 pretrain/checkpoint_best_legacy_500.pt \ + --content_vec_500_onnx pretrain/content_vec_500.onnx \ + --content_vec_500_onnx_on true \ --hubert_base pretrain/hubert_base.pt \ + --hubert_base_jp pretrain/rinna_hubert_base_jp.pt \ --hubert_soft pretrain/hubert/hubert-soft-0d54a1f4.pt \ --nsf_hifigan pretrain/nsf_hifigan/model \ - --hubert_base_jp pretrain/rinna_hubert_base_jp.pt \ - --model_dir model_dir + --crepe_onnx_full pretrain/crepe_onnx_full.onnx \ + --crepe_onnx_tiny pretrain/crepe_onnx_tiny.onnx \ + --model_dir model_dir \ + --samples samples.json else echo "VC Client start...(cpu)" docker run -it --rm --shm-size=1024M \ @@ -42,11 +47,16 @@ else -p ${EX_PORT}:18888 \ $DOCKER_IMAGE -p 18888 --https true \ --content_vec_500 pretrain/checkpoint_best_legacy_500.pt \ + --content_vec_500_onnx pretrain/content_vec_500.onnx \ + --content_vec_500_onnx_on true \ --hubert_base pretrain/hubert_base.pt \ + --hubert_base_jp pretrain/rinna_hubert_base_jp.pt \ --hubert_soft pretrain/hubert/hubert-soft-0d54a1f4.pt \ --nsf_hifigan pretrain/nsf_hifigan/model \ - --hubert_base_jp pretrain/rinna_hubert_base_jp.pt \ - --model_dir model_dir + --crepe_onnx_full pretrain/crepe_onnx_full.onnx \ + --crepe_onnx_tiny pretrain/crepe_onnx_tiny.onnx \ + --model_dir model_dir \ + --samples samples.json fi