From 10fc4d9678bdcaa420ecb2c4f8aa3d55ec882d2c Mon Sep 17 00:00:00 2001 From: wataru Date: Sat, 12 Nov 2022 10:27:34 +0900 Subject: [PATCH 01/10] update --- demo/MMVCServerSIO.py | 366 ++++++++++++++++++++------------------ demo/mods/VoiceChanger.py | 2 +- demo/setup.sh | 58 ++++-- docker/Dockerfile | 2 +- start2.sh | 7 +- 5 files changed, 244 insertions(+), 191 deletions(-) diff --git a/demo/MMVCServerSIO.py b/demo/MMVCServerSIO.py index 1d090b94..ed224f02 100755 --- a/demo/MMVCServerSIO.py +++ b/demo/MMVCServerSIO.py @@ -1,61 +1,65 @@ -import sys, os, struct, argparse, logging, shutil, base64, traceback +import sys, os, struct, argparse, logging, shutil, base64, traceback from dataclasses import dataclass +from datetime import datetime +from distutils.util import strtobool + +import numpy as np +from scipy.io.wavfile import write, read + sys.path.append("/MMVC_Trainer") sys.path.append("/MMVC_Trainer/text") -import uvicorn -from fastapi import FastAPI, UploadFile, File, Form -from fastapi.middleware.cors import CORSMiddleware -from fastapi.responses import JSONResponse -from fastapi.encoders import jsonable_encoder -from fastapi import FastAPI, HTTPException +from fastapi.routing import APIRoute +from fastapi import HTTPException, Request, Response, FastAPI, UploadFile, File, Form from fastapi.staticfiles import StaticFiles +from fastapi.encoders import jsonable_encoder +from fastapi.responses import JSONResponse +from fastapi.middleware.cors import CORSMiddleware +import uvicorn +import socketio from pydantic import BaseModel -from scipy.io.wavfile import write, read +from typing import Callable -import socketio -from distutils.util import strtobool -from datetime import datetime - -import torch -import numpy as np - - -from mods.ssl import create_self_signed_cert +from mods.Trainer_Speakers import mod_get_speakers +from mods.Trainer_Training import mod_post_pre_training, mod_post_start_training, mod_post_stop_training, mod_get_related_files, mod_get_tail_training_log +from mods.Trainer_Model import mod_get_model, mod_delete_model +from mods.Trainer_Models import mod_get_models +from mods.Trainer_MultiSpeakerSetting import mod_get_multi_speaker_setting, mod_post_multi_speaker_setting +from mods.Trainer_Speaker_Voice import mod_get_speaker_voice +from mods.Trainer_Speaker_Voices import mod_get_speaker_voices +from mods.Trainer_Speaker import mod_delete_speaker +from mods.FileUploader import upload_file, concat_file_chunks from mods.VoiceChanger import VoiceChanger +from mods.ssl import create_self_signed_cert + # File Uploader -from mods.FileUploader import upload_file, concat_file_chunks -# Trainer Rest Internal -from mods.Trainer_Speakers import mod_get_speakers -from mods.Trainer_Speaker import mod_delete_speaker -from mods.Trainer_Speaker_Voices import mod_get_speaker_voices -from mods.Trainer_Speaker_Voice import mod_get_speaker_voice -from mods.Trainer_MultiSpeakerSetting import mod_get_multi_speaker_setting, mod_post_multi_speaker_setting -from mods.Trainer_Models import mod_get_models -from mods.Trainer_Model import mod_get_model, mod_delete_model -from mods.Trainer_Training import mod_post_pre_training, mod_post_start_training, mod_post_stop_training, mod_get_related_files, mod_get_tail_training_log +# Trainer Rest Internal + class UvicornSuppressFilter(logging.Filter): def filter(self, record): return False + logger = logging.getLogger("uvicorn.error") logger.addFilter(UvicornSuppressFilter()) # logger.propagate = False logger = logging.getLogger("multipart.multipart") logger.propagate = False + @dataclass class ExApplicationInfo(): - external_tensorboard_port:int + external_tensorboard_port: int exApplitionInfo = ExApplicationInfo(external_tensorboard_port=0) + class VoiceModel(BaseModel): gpu: int srcId: int @@ -65,7 +69,7 @@ class VoiceModel(BaseModel): buffer: str -class MyCustomNamespace(socketio.AsyncNamespace): +class MyCustomNamespace(socketio.AsyncNamespace): def __init__(self, namespace): super().__init__(namespace) @@ -88,19 +92,17 @@ class MyCustomNamespace(socketio.AsyncNamespace): print("Voice Change is not loaded. Did you load a correct model?") return np.zeros(1).astype(np.int16) - # def transcribe(self): # if hasattr(self, 'whisper') == True: # self.whisper.transcribe(0) # else: # print("whisper not found") - def on_connect(self, sid, environ): # print('[{}] connet sid : {}'.format(datetime.now().strftime('%Y-%m-%d %H:%M:%S') , sid)) pass - async def on_request_message(self, sid, msg): + async def on_request_message(self, sid, msg): # print("on_request_message", torch.cuda.memory_allocated()) gpu = int(msg[0]) srcId = int(msg[1]) @@ -109,29 +111,39 @@ class MyCustomNamespace(socketio.AsyncNamespace): prefixChunkSize = int(msg[4]) data = msg[5] # print(srcId, dstId, timestamp) - unpackedData = np.array(struct.unpack('<%sh'%(len(data) // struct.calcsize(' Callable: original_route_handler = super().get_route_handler() @@ -170,11 +180,13 @@ class ValidationErrorLoggingRoute(APIRoute): return custom_route_handler + if __name__ == thisFilename or args.colab == True: printMessage(f"PHASE3:{__name__}", level=2) + TYPE = args.t PORT = args.p CONFIG = args.c - MODEL = args.m + MODEL = args.m app_fastapi = FastAPI() app_fastapi.router.route_class = ValidationErrorLoggingRoute @@ -186,31 +198,33 @@ if __name__ == thisFilename or args.colab == True: allow_headers=["*"], ) - app_fastapi.mount("/front", StaticFiles(directory="../frontend/dist", html=True), name="static") + app_fastapi.mount( + "/front", StaticFiles(directory="../frontend/dist", html=True), name="static") - app_fastapi.mount("/trainer", StaticFiles(directory="../frontend/dist", html=True), name="static") + app_fastapi.mount( + "/trainer", StaticFiles(directory="../frontend/dist", html=True), name="static") - app_fastapi.mount("/recorder", StaticFiles(directory="../frontend/dist", html=True), name="static") + app_fastapi.mount( + "/recorder", StaticFiles(directory="../frontend/dist", html=True), name="static") sio = socketio.AsyncServer( async_mode='asgi', cors_allowed_origins='*' ) namespace = MyCustomNamespace('/test') - sio.register_namespace(namespace) + sio.register_namespace(namespace) if CONFIG and MODEL: namespace.loadModel(CONFIG, MODEL) # namespace.loadWhisperModel("base") - - + app_socketio = socketio.ASGIApp( - sio, + sio, other_asgi_app=app_fastapi, static_files={ '/assets/icons/github.svg': { - 'filename':'../frontend/dist/assets/icons/github.svg', - 'content_type':'image/svg+xml' - }, + 'filename': '../frontend/dist/assets/icons/github.svg', + 'content_type': 'image/svg+xml' + }, '': '../frontend/dist', '/': '../frontend/dist/index.html', } @@ -219,11 +233,10 @@ if __name__ == thisFilename or args.colab == True: @app_fastapi.get("/api/hello") async def index(): return {"result": "Index"} - ############ # File Uploder - # ########## + # ########## UPLOAD_DIR = "upload_dir" os.makedirs(UPLOAD_DIR, exist_ok=True) MODEL_DIR = "/MMVC_Trainer/logs" @@ -231,9 +244,9 @@ if __name__ == thisFilename or args.colab == True: @app_fastapi.post("/upload_file") async def post_upload_file( - file:UploadFile = File(...), + file: UploadFile = File(...), filename: str = Form(...) - ): + ): return upload_file(UPLOAD_DIR, file, filename) @app_fastapi.post("/load_model") @@ -241,9 +254,10 @@ if __name__ == thisFilename or args.colab == True: modelFilename: str = Form(...), modelFilenameChunkNum: int = Form(...), configFilename: str = Form(...) - ): + ): - modelFilePath = concat_file_chunks(UPLOAD_DIR, modelFilename, modelFilenameChunkNum,UPLOAD_DIR) + modelFilePath = concat_file_chunks( + UPLOAD_DIR, modelFilename, modelFilenameChunkNum, UPLOAD_DIR) print(f'File saved to: {modelFilePath}') configFilePath = os.path.join(UPLOAD_DIR, configFilename) @@ -256,30 +270,30 @@ if __name__ == thisFilename or args.colab == True: modelGFilenameChunkNum: int = Form(...), modelDFilename: str = Form(...), modelDFilenameChunkNum: int = Form(...), - ): + ): - - modelGFilePath = concat_file_chunks(UPLOAD_DIR, modelGFilename, modelGFilenameChunkNum, MODEL_DIR) - modelDFilePath = concat_file_chunks(UPLOAD_DIR, modelDFilename, modelDFilenameChunkNum,MODEL_DIR) + modelGFilePath = concat_file_chunks( + UPLOAD_DIR, modelGFilename, modelGFilenameChunkNum, MODEL_DIR) + modelDFilePath = concat_file_chunks( + UPLOAD_DIR, modelDFilename, modelDFilenameChunkNum, MODEL_DIR) return {"File saved": f"{modelGFilePath}, {modelDFilePath}"} - @app_fastapi.post("/extract_voices") async def post_load_model( zipFilename: str = Form(...), zipFileChunkNum: int = Form(...), - ): - zipFilePath = concat_file_chunks(UPLOAD_DIR, zipFilename, zipFileChunkNum, UPLOAD_DIR) + ): + zipFilePath = concat_file_chunks( + UPLOAD_DIR, zipFilename, zipFileChunkNum, UPLOAD_DIR) shutil.unpack_archive(zipFilePath, "/MMVC_Trainer/dataset/textful/") return {"Zip file unpacked": f"{zipFilePath}"} - - ############ # Voice Changer - # ########## + # ########## + @app_fastapi.post("/test") - async def post_test(voice:VoiceModel): + async def post_test(voice: VoiceModel): try: # print("POST REQUEST PROCESSING....") gpu = voice.gpu @@ -290,27 +304,30 @@ if __name__ == thisFilename or args.colab == True: buffer = voice.buffer wav = base64.b64decode(buffer) - if wav==0: - samplerate, data=read("dummy.wav") + if wav == 0: + samplerate, data = read("dummy.wav") unpackedData = data else: - unpackedData = np.array(struct.unpack('<%sh'%(len(wav) // struct.calcsize(':/ with your browser.", level=0) - else: - printMessage(f"open http://:/ with your browser.", level=0) - - if EX_PORT and EX_IP and args.https == 1: - printMessage(f"In many cases it is one of the following", level=1) - printMessage(f"https://localhost:{EX_PORT}/", level=1) - for ip in EX_IP.strip().split(" "): - printMessage(f"https://{ip}:{EX_PORT}/", level=1) - elif EX_PORT and EX_IP and args.https == 0: - printMessage(f"In many cases it is one of the following", level=1) - printMessage(f"http://localhost:{EX_PORT}/", level=1) + # アドレス表示 + if args.https == 1: + printMessage( + f"open https://:/ with your browser.", level=0) + else: + printMessage( + f"open http://:/ with your browser.", level=0) + if TYPE == "MMVC": + path = "" + else: + path = "trainer" + if EX_PORT and EX_IP and args.https == 1: + printMessage(f"In many cases it is one of the following", level=1) + printMessage(f"https://localhost:{EX_PORT}/{path}", level=1) + for ip in EX_IP.strip().split(" "): + printMessage(f"https://{ip}:{EX_PORT}/{path}", level=1) + elif EX_PORT and EX_IP and args.https == 0: + printMessage(f"In many cases it is one of the following", level=1) + printMessage(f"http://localhost:{EX_PORT}/{path}", level=1) # サーバ起動 if args.https: - # HTTPS サーバ起動 + # HTTPS サーバ起動 uvicorn.run( - f"{os.path.basename(__file__)[:-3]}:app_socketio", - host="0.0.0.0", - port=int(PORT), - reload=True, - ssl_keyfile = key_path, - ssl_certfile = cert_path, + f"{os.path.basename(__file__)[:-3]}:app_socketio", + host="0.0.0.0", + port=int(PORT), + reload=True, + ssl_keyfile=key_path, + ssl_certfile=cert_path, log_level="critical" ) else: # HTTP サーバ起動 if args.colab == True: - uvicorn.run( - f"{os.path.basename(__file__)[:-3]}:app_fastapi", - host="0.0.0.0", - port=int(PORT), - log_level="critical" - ) + uvicorn.run( + f"{os.path.basename(__file__)[:-3]}:app_fastapi", + host="0.0.0.0", + port=int(PORT), + log_level="critical" + ) else: - uvicorn.run( - f"{os.path.basename(__file__)[:-3]}:app_socketio", - host="0.0.0.0", - port=int(PORT), - reload=True, - log_level="critical" - ) - - + uvicorn.run( + f"{os.path.basename(__file__)[:-3]}:app_socketio", + host="0.0.0.0", + port=int(PORT), + reload=True, + log_level="critical" + ) diff --git a/demo/mods/VoiceChanger.py b/demo/mods/VoiceChanger.py index e54af851..0b6022f6 100755 --- a/demo/mods/VoiceChanger.py +++ b/demo/mods/VoiceChanger.py @@ -1,7 +1,7 @@ import torch from scipy.io.wavfile import write, read import numpy as np -import struct, traceback +import traceback import utils import commons diff --git a/demo/setup.sh b/demo/setup.sh index a68f9cf4..87188aec 100755 --- a/demo/setup.sh +++ b/demo/setup.sh @@ -1,28 +1,56 @@ #!/bin/bash -cp -r /resources/* . -TYPE=$1 -PARAMS=${@:2:($#-1)} +set -eu + +if [ $# = 0 ]; then + echo " + usage: + $0 -t + TYPE: select one of ['TRAIN', 'MMVC'] + " >&2 + exit 1 +fi + + +# TYPE=$1 +# PARAMS=${@:2:($#-1)} + +# echo $TYPE +# echo $PARAMS + + +if [ -e /resources ]; then + echo "/resources の中身をコピーします。" + cp -r /resources/* . +else + echo "/resourcesが存在しません。デフォルトの動作をします。" +fi -echo $TYPE -echo $PARAMS ## Config 設置 if [[ -e ./setting.json ]]; then echo "カスタムセッティングを使用" cp ./setting.json ../frontend/dist/assets/setting.json -else - cp ../frontend/dist/assets/setting_mmvc.json ../frontend/dist/assets/setting.json fi +echo "起動します" "$@" +python3 MMVCServerSIO.py "$@" -# 起動 -if [ "${TYPE}" = "MMVC" ] ; then - echo "MMVCを起動します" - python3 MMVCServerSIO.py $PARAMS 2>stderr.txt -elif [ "${TYPE}" = "MMVC_VERBOSE" ] ; then - echo "MMVCを起動します(verbose)" - python3 MMVCServerSIO.py $PARAMS -fi +### +# 起動パラメータ +# (1) トレーニングの場合 +# python3 MMVCServerSIO.py +# 環境変数: +# ※ Colabの場合：python3 MMVCServerSIO.py -t Train -p {PORT} --colab True +# (2) VCの場合 + + +# # 起動 +# if [ "${TYPE}" = "MMVC" ] ; then + +# elif [ "${TYPE}" = "MMVC_VERBOSE" ] ; then +# echo "MMVCを起動します(verbose)" +# python3 MMVCServerSIO.py $PARAMS +# fi diff --git a/docker/Dockerfile b/docker/Dockerfile index 5358bb06..3b760dc0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM dannadori/voice-changer-internal:20221112_092232 as front +FROM dannadori/voice-changer-internal:20221112_102341 as front FROM debian:bullseye-slim as base ARG DEBIAN_FRONTEND=noninteractive diff --git a/start2.sh b/start2.sh index 9e84ab70..cff38ca9 100644 --- a/start2.sh +++ b/start2.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eu -DOCKER_IMAGE=dannadori/voice-changer:20221112_092328 +DOCKER_IMAGE=dannadori/voice-changer:20221112_102442 # DOCKER_IMAGE=voice-changer if [ $# = 0 ]; then @@ -44,7 +44,7 @@ if [ "${MODE}" = "TRAIN" ]; then -e EX_PORT=${EX_PORT} -e EX_TB_PORT=${EX_TB_PORT} \ -e EX_IP="`hostname -I`" \ -p ${EX_PORT}:8080 -p ${EX_TB_PORT}:6006 \ - $DOCKER_IMAGE "$@" + $DOCKER_IMAGE -t TRAIN "$@" elif [ "${MODE}" = "MMVC" ]; then @@ -66,7 +66,8 @@ elif [ "${MODE}" = "MMVC" ]; then -e LOCAL_GID=$(id -g $USER) \ -e EX_IP="`hostname -I`" \ -e EX_PORT=${EX_PORT} \ - -p ${EX_PORT}:8080 $DOCKER_IMAGE "$@" + -p ${EX_PORT}:8080 \ + $DOCKER_IMAGE -t MMVC "$@" fi else echo " From be014c03a8384988ee44ad548e5a3c03aa441bd2 Mon Sep 17 00:00:00 2001 From: wataru Date: Sat, 12 Nov 2022 10:28:36 +0900 Subject: [PATCH 02/10] update --- start2.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/start2.sh b/start2.sh index cff38ca9..8856a1b2 100644 --- a/start2.sh +++ b/start2.sh @@ -57,7 +57,8 @@ elif [ "${MODE}" = "MMVC" ]; then -e LOCAL_GID=$(id -g $USER) \ -e EX_IP="`hostname -I`" \ -e EX_PORT=${EX_PORT} \ - -p ${EX_PORT}:8080 $DOCKER_IMAGE "$@" + -p ${EX_PORT}:8080 \ + $DOCKER_IMAGE -t MMVC "$@" else echo "MMVCを起動します(only cpu)" docker run -it --shm-size=128M \ @@ -67,7 +68,7 @@ elif [ "${MODE}" = "MMVC" ]; then -e EX_IP="`hostname -I`" \ -e EX_PORT=${EX_PORT} \ -p ${EX_PORT}:8080 \ - $DOCKER_IMAGE -t MMVC "$@" + $DOCKER_IMAGE -t MMVC "$@" fi else echo " From ff1a86f3daac8f4070236d7e9b3a7b8aceb4fca2 Mon Sep 17 00:00:00 2001 From: wataru Date: Sat, 12 Nov 2022 10:44:01 +0900 Subject: [PATCH 03/10] update --- docker/exec.sh | 28 +++------------------------- docker/setup.sh | 2 -- start2.sh | 9 ++++----- 3 files changed, 7 insertions(+), 32 deletions(-) diff --git a/docker/exec.sh b/docker/exec.sh index 67eed7da..12457060 100644 --- a/docker/exec.sh +++ b/docker/exec.sh @@ -1,8 +1,5 @@ #!/bin/bash -# 参考:https://programwiz.org/2022/03/22/how-to-write-shell-script-for-option-parsing/ - -#set -eux set -eu MODE=$1 @@ -31,32 +28,13 @@ if [ "${MODE}" = "MMVC" ] ; then find /resources/ -type f -name "config.json" | xargs -I{} sh -c 'echo "config.jsonをコピーします。" && cp {} ./' find /resources/ -type f -name "*.pth" | xargs -I{} sh -c 'echo "`basename {}`をコピーします。" && cp {} ./' - # if [ "${VERBOSE}" = "on" ]; then - # echo "MMVCを起動します(verbose)" - # python3 MMVCServerSIO.py $PARAMS - # else - # echo "MMVCを起動します" - # python3 MMVCServerSIO.py $PARAMS 2>stderr.txt - # fi echo "MMVCを起動します" - python3 MMVCServerSIO.py $PARAMS #2>stderr.txt + python3 MMVCServerSIO.py -t MMVC $PARAMS #2>stderr.txt -elif [ "${MODE}" = "MMVC_TRAIN" ] ; then +elif [ "${MODE}" = "TRAIN" ] ; then cd /voice-changer-internal/voice-change-service - # python3 create_dataset_jtalk.py -f train_config -s 24000 -m dataset/multi_speaker_correspondence.txt - # # date_tag=`date +%Y%m%d%H%M%S` - # sed -ie 's/80000/8000/' train_ms.py - # sed -ie "s/\"batch_size\": 10/\"batch_size\": $batch_size/" configs/train_config.json - # sed -ie "s/torch.cuda.device_count()/1/" train_ms.py python3 -m tensorboard.main --logdir /MMVC_Trainer/logs --port 6006 --host 0.0.0.0 & - python3 MMVCServerSIO.py $PARAMS - # if ${resume_flag}; then - # echo "トレーニング再開。バッチサイズ: ${batch_size}。" - # python3 train_ms.py -c configs/train_config.json -m vc - # else - # echo "トレーニング開始。バッチサイズ: ${batch_size}。" - # python3 train_ms.py -c configs/train_config.json -m vc -fg fine_model/G_180000.pth -fd fine_model/D_180000.pth - # fi + python3 MMVCServerSIO.py -t TRAIN $PARAMS fi diff --git a/docker/setup.sh b/docker/setup.sh index bfb1a877..5da2cef2 100644 --- a/docker/setup.sh +++ b/docker/setup.sh @@ -3,12 +3,10 @@ # 参考:https://programwiz.org/2022/03/22/how-to-write-shell-script-for-option-parsing/ set -eu -echo "1" # 実行ユーザ作成 USER_ID=${LOCAL_UID:-9001} GROUP_ID=${LOCAL_GID:-9001} -echo "2" echo "exec with [UID : $USER_ID, GID: $GROUP_ID]" useradd -u $USER_ID -o -m user groupmod -g $GROUP_ID user diff --git a/start2.sh b/start2.sh index 8856a1b2..c12f7214 100644 --- a/start2.sh +++ b/start2.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eu -DOCKER_IMAGE=dannadori/voice-changer:20221112_102442 +DOCKER_IMAGE=dannadori/voice-changer:20221112_104247 # DOCKER_IMAGE=voice-changer if [ $# = 0 ]; then @@ -14,7 +14,6 @@ if [ $# = 0 ]; then fi MODE=$1 -PARAMS=${@:2:($#-1)} ### DEFAULT VAR ### DEFAULT_EX_PORT=18888 @@ -44,7 +43,7 @@ if [ "${MODE}" = "TRAIN" ]; then -e EX_PORT=${EX_PORT} -e EX_TB_PORT=${EX_TB_PORT} \ -e EX_IP="`hostname -I`" \ -p ${EX_PORT}:8080 -p ${EX_TB_PORT}:6006 \ - $DOCKER_IMAGE -t TRAIN "$@" + $DOCKER_IMAGE TRAIN "$@" elif [ "${MODE}" = "MMVC" ]; then @@ -58,7 +57,7 @@ elif [ "${MODE}" = "MMVC" ]; then -e EX_IP="`hostname -I`" \ -e EX_PORT=${EX_PORT} \ -p ${EX_PORT}:8080 \ - $DOCKER_IMAGE -t MMVC "$@" + $DOCKER_IMAGE MMVC "$@" else echo "MMVCを起動します(only cpu)" docker run -it --shm-size=128M \ @@ -68,7 +67,7 @@ elif [ "${MODE}" = "MMVC" ]; then -e EX_IP="`hostname -I`" \ -e EX_PORT=${EX_PORT} \ -p ${EX_PORT}:8080 \ - $DOCKER_IMAGE -t MMVC "$@" + $DOCKER_IMAGE MMVC "$@" fi else echo " From 028eaad7d96e82451734e3c6dcc16432cd7a3dfa Mon Sep 17 00:00:00 2001 From: wataru Date: Sat, 12 Nov 2022 10:47:08 +0900 Subject: [PATCH 04/10] update --- docker/exec.sh | 3 ++- start2.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/exec.sh b/docker/exec.sh index 12457060..f2c6bbc8 100644 --- a/docker/exec.sh +++ b/docker/exec.sh @@ -7,7 +7,8 @@ PARAMS=${@:2:($#-1)} echo "------" -echo "$MODE" +echo "$@" +echo "TYPE: $MODE" echo "PARAMS: $PARAMS" # echo "VERBOSE: $VERBOSE" echo "------" diff --git a/start2.sh b/start2.sh index c12f7214..1767f426 100644 --- a/start2.sh +++ b/start2.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eu -DOCKER_IMAGE=dannadori/voice-changer:20221112_104247 +DOCKER_IMAGE=dannadori/voice-changer:20221112_104623 # DOCKER_IMAGE=voice-changer if [ $# = 0 ]; then From 425e788f414dba546dcce5800da058fb528dac0a Mon Sep 17 00:00:00 2001 From: wataru Date: Sat, 12 Nov 2022 10:48:13 +0900 Subject: [PATCH 05/10] update --- start2.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/start2.sh b/start2.sh index 1767f426..4833b2a5 100644 --- a/start2.sh +++ b/start2.sh @@ -43,7 +43,7 @@ if [ "${MODE}" = "TRAIN" ]; then -e EX_PORT=${EX_PORT} -e EX_TB_PORT=${EX_TB_PORT} \ -e EX_IP="`hostname -I`" \ -p ${EX_PORT}:8080 -p ${EX_TB_PORT}:6006 \ - $DOCKER_IMAGE TRAIN "$@" + $DOCKER_IMAGE "$@" elif [ "${MODE}" = "MMVC" ]; then @@ -57,7 +57,7 @@ elif [ "${MODE}" = "MMVC" ]; then -e EX_IP="`hostname -I`" \ -e EX_PORT=${EX_PORT} \ -p ${EX_PORT}:8080 \ - $DOCKER_IMAGE MMVC "$@" + $DOCKER_IMAGE "$@" else echo "MMVCを起動します(only cpu)" docker run -it --shm-size=128M \ @@ -67,7 +67,7 @@ elif [ "${MODE}" = "MMVC" ]; then -e EX_IP="`hostname -I`" \ -e EX_PORT=${EX_PORT} \ -p ${EX_PORT}:8080 \ - $DOCKER_IMAGE MMVC "$@" + $DOCKER_IMAGE "$@" fi else echo " From e6cd237f5662d67f651805dc743a4a557bd026f7 Mon Sep 17 00:00:00 2001 From: wataru Date: Sat, 12 Nov 2022 10:56:53 +0900 Subject: [PATCH 06/10] update --- docker/Dockerfile | 2 +- start2.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3b760dc0..85b2a63f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM dannadori/voice-changer-internal:20221112_102341 as front +FROM dannadori/voice-changer-internal:20221112_105408 as front FROM debian:bullseye-slim as base ARG DEBIAN_FRONTEND=noninteractive diff --git a/start2.sh b/start2.sh index 4833b2a5..97920164 100644 --- a/start2.sh +++ b/start2.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eu -DOCKER_IMAGE=dannadori/voice-changer:20221112_104623 +DOCKER_IMAGE=dannadori/voice-changer:20221112_105616 # DOCKER_IMAGE=voice-changer if [ $# = 0 ]; then From 88c7768ddb2323588024d186c761ac985e0716cc Mon Sep 17 00:00:00 2001 From: wataru Date: Sat, 12 Nov 2022 11:23:01 +0900 Subject: [PATCH 07/10] update --- demo/MMVCServerSIO.py | 4 ++-- demo/setup.sh | 4 ++-- demo/trainer_mods/files.py | 7 ++++++- docker/Dockerfile | 2 +- start2.sh | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/demo/MMVCServerSIO.py b/demo/MMVCServerSIO.py index ed224f02..800a90cf 100755 --- a/demo/MMVCServerSIO.py +++ b/demo/MMVCServerSIO.py @@ -429,8 +429,8 @@ if __name__ == '__main__': if os.getenv("EX_TB_PORT"): EX_TB_PORT = os.environ["EX_TB_PORT"] - exApplitionInfo = int(EX_TB_PORT) - printMessage(f"External_TeonsorBord_Port:{EX_PORT}", level=1) + exApplitionInfo.external_tensorboard_port = int(EX_TB_PORT) + printMessage(f"External_TeonsorBord_Port:{EX_TB_PORT}", level=1) if os.getenv("EX_IP"): EX_IP = os.environ["EX_IP"] diff --git a/demo/setup.sh b/demo/setup.sh index 87188aec..0ad02684 100755 --- a/demo/setup.sh +++ b/demo/setup.sh @@ -39,8 +39,8 @@ python3 MMVCServerSIO.py "$@" ### # 起動パラメータ # (1) トレーニングの場合 -# python3 MMVCServerSIO.py -# 環境変数: +# python3 MMVCServerSIO.py -t [--https on|off, --httpsKey , --httpsCert , --httpsSelfSigned on|off] +# 環境変数: EX_PORT, EX_TB_PORT, EX_IP (EX_IPはEX_IP="`hostname -I`"で自動取得) # ※ Colabの場合：python3 MMVCServerSIO.py -t Train -p {PORT} --colab True # (2) VCの場合 diff --git a/demo/trainer_mods/files.py b/demo/trainer_mods/files.py index 6610b7cd..2aa1c147 100755 --- a/demo/trainer_mods/files.py +++ b/demo/trainer_mods/files.py @@ -13,7 +13,12 @@ def get_file_list(top_dir): def get_dir_list(top_dir): - return os.listdir(top_dir) + dirlist = [] + files = os.listdir(top_dir) + for filename in files: + if os.path.isdir(os.path.join(top_dir, filename)): + dirlist.append(filename) + return dirlist def get_file_list(top_dir): return glob.glob(top_dir) \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 85b2a63f..1d93d949 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM dannadori/voice-changer-internal:20221112_105408 as front +FROM dannadori/voice-changer-internal:20221112_111947 as front FROM debian:bullseye-slim as base ARG DEBIAN_FRONTEND=noninteractive diff --git a/start2.sh b/start2.sh index 97920164..b5b4e7fa 100644 --- a/start2.sh +++ b/start2.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eu -DOCKER_IMAGE=dannadori/voice-changer:20221112_105616 +DOCKER_IMAGE=dannadori/voice-changer:20221112_112216 # DOCKER_IMAGE=voice-changer if [ $# = 0 ]; then From 40efbe41e68e82ce2f143ad41f158d5aac7ef06f Mon Sep 17 00:00:00 2001 From: wataru Date: Sat, 12 Nov 2022 11:54:03 +0900 Subject: [PATCH 08/10] update --- demo/MMVCServerSIO.py | 7 ++++++- docker/Dockerfile | 2 +- start2.sh | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/demo/MMVCServerSIO.py b/demo/MMVCServerSIO.py index 800a90cf..bc4a3093 100755 --- a/demo/MMVCServerSIO.py +++ b/demo/MMVCServerSIO.py @@ -188,6 +188,11 @@ if __name__ == thisFilename or args.colab == True: CONFIG = args.c MODEL = args.m + if os.getenv("EX_TB_PORT"): + EX_TB_PORT = os.environ["EX_TB_PORT"] + exApplitionInfo.external_tensorboard_port = int(EX_TB_PORT) + + app_fastapi = FastAPI() app_fastapi.router.route_class = ValidationErrorLoggingRoute app_fastapi.add_middleware( @@ -397,6 +402,7 @@ if __name__ == thisFilename or args.colab == True: @app_fastapi.get("/get_ex_application_info") async def get_ex_application_info(): + print(">>>>>>>>>>>>>>",exApplitionInfo) json_compatible_item_data = jsonable_encoder(exApplitionInfo) return JSONResponse(content=json_compatible_item_data) @@ -429,7 +435,6 @@ if __name__ == '__main__': if os.getenv("EX_TB_PORT"): EX_TB_PORT = os.environ["EX_TB_PORT"] - exApplitionInfo.external_tensorboard_port = int(EX_TB_PORT) printMessage(f"External_TeonsorBord_Port:{EX_TB_PORT}", level=1) if os.getenv("EX_IP"): diff --git a/docker/Dockerfile b/docker/Dockerfile index 1d93d949..adbd7046 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM dannadori/voice-changer-internal:20221112_111947 as front +FROM dannadori/voice-changer-internal:20221112_114121 as front FROM debian:bullseye-slim as base ARG DEBIAN_FRONTEND=noninteractive diff --git a/start2.sh b/start2.sh index b5b4e7fa..19ee013c 100644 --- a/start2.sh +++ b/start2.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eu -DOCKER_IMAGE=dannadori/voice-changer:20221112_112216 +DOCKER_IMAGE=dannadori/voice-changer:20221112_114316 # DOCKER_IMAGE=voice-changer if [ $# = 0 ]; then From 12bc4ebc70fd4f7d76a0da94c65cefc845ccac22 Mon Sep 17 00:00:00 2001 From: wataru Date: Sat, 12 Nov 2022 12:00:06 +0900 Subject: [PATCH 09/10] update --- demo/MMVCServerSIO.py | 1 - docker/Dockerfile | 2 +- start2.sh | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/demo/MMVCServerSIO.py b/demo/MMVCServerSIO.py index bc4a3093..40815b63 100755 --- a/demo/MMVCServerSIO.py +++ b/demo/MMVCServerSIO.py @@ -402,7 +402,6 @@ if __name__ == thisFilename or args.colab == True: @app_fastapi.get("/get_ex_application_info") async def get_ex_application_info(): - print(">>>>>>>>>>>>>>",exApplitionInfo) json_compatible_item_data = jsonable_encoder(exApplitionInfo) return JSONResponse(content=json_compatible_item_data) diff --git a/docker/Dockerfile b/docker/Dockerfile index adbd7046..c719aea7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM dannadori/voice-changer-internal:20221112_114121 as front +FROM dannadori/voice-changer-internal:20221112_115723 as front FROM debian:bullseye-slim as base ARG DEBIAN_FRONTEND=noninteractive diff --git a/start2.sh b/start2.sh index 19ee013c..591543f1 100644 --- a/start2.sh +++ b/start2.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eu -DOCKER_IMAGE=dannadori/voice-changer:20221112_114316 +DOCKER_IMAGE=dannadori/voice-changer:20221112_115832 # DOCKER_IMAGE=voice-changer if [ $# = 0 ]; then From 6406bff7e00a8ac9d2ce3d3bedeb9b14909f62d0 Mon Sep 17 00:00:00 2001 From: wataru Date: Sat, 12 Nov 2022 12:11:11 +0900 Subject: [PATCH 10/10] update --- demo/MMVCServerSIO.py | 2 -- docker/Dockerfile | 2 +- docker/exec.sh | 3 --- start2.sh | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/demo/MMVCServerSIO.py b/demo/MMVCServerSIO.py index 40815b63..e3b14967 100755 --- a/demo/MMVCServerSIO.py +++ b/demo/MMVCServerSIO.py @@ -405,11 +405,9 @@ if __name__ == thisFilename or args.colab == True: json_compatible_item_data = jsonable_encoder(exApplitionInfo) return JSONResponse(content=json_compatible_item_data) - if __name__ == '__mp_main__': printMessage(f"PHASE2:{__name__}", level=2) - if __name__ == '__main__': printMessage(f"PHASE1:{__name__}", level=2) TYPE = args.t diff --git a/docker/Dockerfile b/docker/Dockerfile index c719aea7..03507551 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM dannadori/voice-changer-internal:20221112_115723 as front +FROM dannadori/voice-changer-internal:20221112_120908 as front FROM debian:bullseye-slim as base ARG DEBIAN_FRONTEND=noninteractive diff --git a/docker/exec.sh b/docker/exec.sh index f2c6bbc8..43d5a5e6 100644 --- a/docker/exec.sh +++ b/docker/exec.sh @@ -21,9 +21,6 @@ if [ "${MODE}" = "MMVC" ] ; then if [[ -e /resources/setting.json ]]; then echo "指定された設定(setting.json)を使用します。" cp /resources/setting.json ../frontend/dist/assets/setting.json - else - echo "デフォルトの設定(setting.json)を使用します。" - cp ../frontend/dist/assets/setting_mmvc.json ../frontend/dist/assets/setting.json fi find /resources/ -type f -name "config.json" | xargs -I{} sh -c 'echo "config.jsonをコピーします。" && cp {} ./' diff --git a/start2.sh b/start2.sh index 591543f1..5819d9b3 100644 --- a/start2.sh +++ b/start2.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eu -DOCKER_IMAGE=dannadori/voice-changer:20221112_115832 +DOCKER_IMAGE=dannadori/voice-changer:20221112_121031 # DOCKER_IMAGE=voice-changer if [ $# = 0 ]; then