This commit is contained in:
wataru 2022-11-12 09:26:28 +09:00
parent 9b4bbca678
commit b2ab11db23
5 changed files with 24 additions and 11 deletions

View File

@ -1,4 +1,5 @@
import sys, os, struct, argparse, logging, shutil, base64, traceback import sys, os, struct, argparse, logging, shutil, base64, traceback
from dataclasses import dataclass
sys.path.append("/MMVC_Trainer") sys.path.append("/MMVC_Trainer")
sys.path.append("/MMVC_Trainer/text") sys.path.append("/MMVC_Trainer/text")
@ -48,8 +49,13 @@ logger.addFilter(UvicornSuppressFilter())
logger = logging.getLogger("multipart.multipart") logger = logging.getLogger("multipart.multipart")
logger.propagate = False logger.propagate = False
@dataclass
class ExApplicationInfo():
external_tensorboard_port:int
exApplitionInfo = ExApplicationInfo(external_tensorboard_port=0)
class VoiceModel(BaseModel): class VoiceModel(BaseModel):
gpu: int gpu: int
srcId: int srcId: int
@ -268,6 +274,7 @@ if __name__ == thisFilename or args.colab == True:
return {"Zip file unpacked": f"{zipFilePath}"} return {"Zip file unpacked": f"{zipFilePath}"}
############ ############
# Voice Changer # Voice Changer
# ########## # ##########
@ -373,6 +380,11 @@ if __name__ == thisFilename or args.colab == True:
async def get_tail_training_log(num:int): async def get_tail_training_log(num:int):
return mod_get_tail_training_log(num) return mod_get_tail_training_log(num)
@app_fastapi.get("/get_ex_application_info")
async def get_ex_application_info():
json_compatible_item_data = jsonable_encoder(exApplitionInfo)
return JSONResponse(content=json_compatible_item_data)
if __name__ == '__mp_main__': if __name__ == '__mp_main__':
printMessage(f"PHASE2:{__name__}", level=2) printMessage(f"PHASE2:{__name__}", level=2)
@ -395,6 +407,11 @@ if __name__ == '__main__':
else: else:
printMessage(f"Internal_Port:{PORT}", level=1) printMessage(f"Internal_Port:{PORT}", level=1)
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)
if os.getenv("EX_IP"): if os.getenv("EX_IP"):
EX_IP = os.environ["EX_IP"] EX_IP = os.environ["EX_IP"]
printMessage(f"External_IP:{EX_IP}", level=1) printMessage(f"External_IP:{EX_IP}", level=1)

View File

@ -1,4 +1,4 @@
FROM dannadori/voice-changer-internal:20221109_051139 as front FROM dannadori/voice-changer-internal:20221112_092232 as front
FROM debian:bullseye-slim as base FROM debian:bullseye-slim as base
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
set -eu set -eu
#DOCKER_IMAGE=dannadori/voice-changer:20221108_105937 DOCKER_IMAGE=dannadori/voice-changer:20221112_092328
DOCKER_IMAGE=voice-changer # DOCKER_IMAGE=voice-changer
MODE=$1 MODE=$1
PARAMS=${@:2:($#-1)} PARAMS=${@:2:($#-1)}
@ -21,13 +21,9 @@ USE_GPU=${USE_GPU:-${DEFAULT_USE_GPU}}
#echo $EX_PORT $USE_GPU $VERBOSE #echo $EX_PORT $USE_GPU $VERBOSE
### INTERNAL SETTING ###
TENSORBOARD_PORT=6006
SIO_PORT=8080
### ###
if [ "${MODE}" = "MMVC_TRAIN" ]; then if [ "${MODE}" = "TRAIN" ]; then
echo "トレーニングを開始します" echo "トレーニングを開始します"
docker run -it --gpus all --shm-size=128M \ docker run -it --gpus all --shm-size=128M \
@ -67,7 +63,7 @@ else
echo " echo "
usage: usage:
$0 <MODE> <params...> $0 <MODE> <params...>
MODE: select one of ['MMVC_TRAIN', 'MMVC'] MODE: select one of ['TRAIN', 'MMVC']
" >&2 " >&2
fi fi