From d72784a0f8ef246b2624622f77e8f0d72cb13594 Mon Sep 17 00:00:00 2001 From: wataru Date: Thu, 9 Feb 2023 21:43:02 +0900 Subject: [PATCH] WIP: docker support v1.5.x trial 3 --- docker_trainer/Dockerfile | 6 +++++- docker_trainer/start_trainer.sh | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docker_trainer/Dockerfile b/docker_trainer/Dockerfile index 44b717e4..cebd39a2 100644 --- a/docker_trainer/Dockerfile +++ b/docker_trainer/Dockerfile @@ -26,10 +26,14 @@ RUN pip install matplotlib==3.6.3 ADD /warmup.py / RUN python3 warmup.py +ADD dummy / + RUN git clone --depth 1 -b v1.5.0.0_SiFiGAN https://github.com/isletennos/MMVC_Trainer.git WORKDIR /MMVC_Trainer/ -RUN git checkout 1109f1201e1ee9008ee61dc221d620eb1c93d7d0 +#RUN git checkout 1109f1201e1ee9008ee61dc221d620eb1c93d7d0 +RUN git checkout f28a1514b6731c36bd68989c600bff0a3b217d75 + ADD /model/D_v15_best.pth /MMVC_Trainer/fine_model/ ADD /model/G_v15_best.pth /MMVC_Trainer/fine_model/ diff --git a/docker_trainer/start_trainer.sh b/docker_trainer/start_trainer.sh index 83fb00e8..c7093906 100644 --- a/docker_trainer/start_trainer.sh +++ b/docker_trainer/start_trainer.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eu -DOCKER_IMAGE=dannadori/trainer:20230205_131656 +DOCKER_IMAGE=dannadori/trainer:20230209_214044 # DOCKER_IMAGE=trainer docker run --gpus all --rm -ti \ diff --git a/package.json b/package.json index 7916ab7f..02c03318 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "build:docker": "date +%Y%m%d%H%M%S > docker/dummy && DOCKER_BUILDKIT=1 docker build -f docker/Dockerfile docker/ -t voice-changer", "build:docker:onnx": "DOCKER_BUILDKIT=1 docker build -f docker_onnx/Dockerfile docker/ -t onnx-converter", - "build:docker:trainer": "DOCKER_BUILDKIT=1 docker build -f docker_trainer/Dockerfile docker_trainer/ -t trainer", + "build:docker:trainer": "date +%Y%m%d%H%M%S > docker_trainer/dummy && DOCKER_BUILDKIT=1 docker build -f docker_trainer/Dockerfile docker_trainer/ -t trainer", "copy:frontend": "docker run -v `pwd`/frontend/dist:/frontend/dist --entrypoint /bin/bash -ti voice-changer -c \"cp -r /voice-changer-internal/frontend/dist/* /frontend/dist\"", "copy:backend": "docker run -v `pwd`/demo:/demo --entrypoint /bin/bash -ti voice-changer -c \"cp -r /voice-changer-internal/voice-change-service/* /demo/ && rm -rf /demo/MMVC_Trainer/.git && rm -rf /demo/MMVC_Trainer/.gitignore \"", "create:demo": "run-p copy:frontend copy:backend",