This commit is contained in:
wataru 2022-11-03 19:22:33 +09:00
parent 5ea920433e
commit 5f540cd162
6 changed files with 13 additions and 4990 deletions

View File

@ -161,6 +161,10 @@ if __name__ == thisFilename or args.colab == True:
sio, sio,
other_asgi_app=app_fastapi, other_asgi_app=app_fastapi,
static_files={ static_files={
'/assets/icons/github.svg': {
'filename':'../frontend/dist/assets/icons/github.svg',
'content_type':'image/svg+xml'
},
'': '../frontend/dist', '': '../frontend/dist',
'/': '../frontend/dist/index.html', '/': '../frontend/dist/index.html',
} }

View File

@ -1,13 +1 @@
<!DOCTYPE html> <!doctype html><html lang="ja" style="width:100%;height:100%;overflow:hidden"><head><meta charset="utf-8"/><title>voice recorder</title><script defer="defer" src="index.js"></script></head><body style="width:100%;height:100%;margin:0"><div id="app" style="width:100%;height:100%"></div><noscript><strong>javascriptを有効にしてください</strong></noscript></body></html>
<html lang="ja" style="width: 100%; height: 100%; overflow: hidden">
<head>
<meta charset="utf-8" />
<title>voice recorder</title>
<script defer src="index.js"></script></head>
<body style="width: 100%; height: 100%; margin: 0px">
<div id="app" style="width: 100%; height: 100%"></div>
<noscript>
<strong>javascriptを有効にしてください</strong>
</noscript>
</body>
</html>

4940
frontend/dist/index.js vendored

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -eu set -eu
DOCKER_IMAGE=dannadori/voice-changer:20221029_233016 DOCKER_IMAGE=dannadori/voice-changer:20221103_180651
#DOCKER_IMAGE=voice-changer #DOCKER_IMAGE=voice-changer
@ -75,28 +75,11 @@ elif [ "${MODE}" = "MMVC" ]; then
# -p ${EX_PORT}:8080 $DOCKER_IMAGE /bin/bash # -p ${EX_PORT}:8080 $DOCKER_IMAGE /bin/bash
fi fi
elif [ "${MODE}" = "SOFT_VC" ]; then
if [ "${USE_GPU}" = "on" ]; then
echo "Start Soft-vc"
docker run -it --gpus all --shm-size=128M \
-v `pwd`/vc_resources:/resources \
-e LOCAL_UID=$(id -u $USER) \
-e LOCAL_GID=$(id -g $USER) \
-e EX_IP="`hostname -I`" \
-e EX_PORT=${EX_PORT} \
-e VERBOSE=${VERBOSE} \
-p ${EX_PORT}:8080 $DOCKER_IMAGE "$@"
else
echo "Start Soft-vc withou GPU is not supported"
fi
else else
echo " echo "
usage: usage:
$0 <MODE> <params...> $0 <MODE> <params...>
MODE: select one of ['MMVC_TRAIN', 'MMVC', 'SOFT_VC'] MODE: select one of ['MMVC_TRAIN', 'MMVC']
" >&2 " >&2
fi fi

View File

@ -1,4 +1,4 @@
FROM dannadori/voice-changer-internal:20221103_041401 as front FROM dannadori/voice-changer-internal:20221103_180551 as front
FROM debian:bullseye-slim as base FROM debian:bullseye-slim as base
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive

View File

@ -17,23 +17,7 @@ echo "------"
# 起動 # 起動
if [ "${MODE}" = "SOFT_VC" ] ; then if [ "${MODE}" = "MMVC" ] ; then
cd /voice-changer-internal/voice-change-service
cp -r /resources/* .
if [[ -e ./setting.json ]]; then
cp ./setting.json ../frontend/dist/assets/setting.json
else
cp ../frontend/dist/assets/setting_softvc.json ../frontend/dist/assets/setting.json
fi
if [ "${VERBOSE}" = "on" ]; then
echo "SOFT_VCを起動します(verbose)"
python3 SoftVcServerSIO.py $PARAMS
else
echo "SOFT_VCを起動します"
python3 SoftVcServerSIO.py $PARAMS 2>stderr.txt
fi
elif [ "${MODE}" = "MMVC" ] ; then
cd /voice-changer-internal/voice-change-service cd /voice-changer-internal/voice-change-service
cp -r /resources/* . cp -r /resources/* .
@ -45,10 +29,10 @@ elif [ "${MODE}" = "MMVC" ] ; then
if [ "${VERBOSE}" = "on" ]; then if [ "${VERBOSE}" = "on" ]; then
echo "MMVCを起動します(verbose)" echo "MMVCを起動します(verbose)"
python3 serverSIO.py $PARAMS python3 MMVCServerSIO.py $PARAMS
else else
echo "MMVCを起動します" echo "MMVCを起動します"
python3 serverSIO.py $PARAMS 2>stderr.txt python3 MMVCServerSIO.py $PARAMS $PARAMS 2>stderr.txt
fi fi
elif [ "${MODE}" = "MMVC_TRAIN" ] ; then elif [ "${MODE}" = "MMVC_TRAIN" ] ; then
python3 create_dataset_jtalk.py -f train_config -s 24000 -m dataset/multi_speaker_correspondence.txt python3 create_dataset_jtalk.py -f train_config -s 24000 -m dataset/multi_speaker_correspondence.txt