This commit is contained in:
wataru 2022-11-04 04:10:47 +09:00
parent 6b32d3b50b
commit 62e56e7c7b
2 changed files with 15 additions and 24 deletions

View File

@ -11,12 +11,12 @@ PARAMS=${@:2:($#-1)}
### DEFAULT VAR ### ### DEFAULT VAR ###
DEFAULT_EX_PORT=18888 DEFAULT_EX_PORT=18888
DEFAULT_USE_GPU=on # on|off DEFAULT_USE_GPU=on # on|off
DEFAULT_VERBOSE=off # on|off # DEFAULT_VERBOSE=off # on|off
### ENV VAR ### ### ENV VAR ###
EX_PORT=${EX_PORT:-${DEFAULT_EX_PORT}} EX_PORT=${EX_PORT:-${DEFAULT_EX_PORT}}
USE_GPU=${USE_GPU:-${DEFAULT_USE_GPU}} USE_GPU=${USE_GPU:-${DEFAULT_USE_GPU}}
VERBOSE=${VERBOSE:-${DEFAULT_VERBOSE}} # VERBOSE=${VERBOSE:-${DEFAULT_VERBOSE}}
#echo $EX_PORT $USE_GPU $VERBOSE #echo $EX_PORT $USE_GPU $VERBOSE
@ -51,7 +51,7 @@ elif [ "${MODE}" = "MMVC" ]; then
-e LOCAL_GID=$(id -g $USER) \ -e LOCAL_GID=$(id -g $USER) \
-e EX_IP="`hostname -I`" \ -e EX_IP="`hostname -I`" \
-e EX_PORT=${EX_PORT} \ -e EX_PORT=${EX_PORT} \
-e VERBOSE=${VERBOSE} \ # -e VERBOSE=${VERBOSE} \
-p ${EX_PORT}:8080 $DOCKER_IMAGE "$@" -p ${EX_PORT}:8080 $DOCKER_IMAGE "$@"
else else
echo "MMVCを起動します(only cpu)" echo "MMVCを起動します(only cpu)"
@ -61,19 +61,8 @@ elif [ "${MODE}" = "MMVC" ]; then
-e LOCAL_GID=$(id -g $USER) \ -e LOCAL_GID=$(id -g $USER) \
-e EX_IP="`hostname -I`" \ -e EX_IP="`hostname -I`" \
-e EX_PORT=${EX_PORT} \ -e EX_PORT=${EX_PORT} \
-e VERBOSE=${VERBOSE} \
-p ${EX_PORT}:8080 $DOCKER_IMAGE "$@"
# docker run -it --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} \ # -e VERBOSE=${VERBOSE} \
# --entrypoint="" \ -p ${EX_PORT}:8080 $DOCKER_IMAGE "$@"
# -p ${EX_PORT}:8080 $DOCKER_IMAGE /bin/bash
fi fi
else else
echo " echo "

View File

@ -12,7 +12,7 @@ PARAMS=${@:2:($#-1)}
echo "------" echo "------"
echo "$MODE" echo "$MODE"
echo "PARAMS: $PARAMS" echo "PARAMS: $PARAMS"
echo "VERBOSE: $VERBOSE" # echo "VERBOSE: $VERBOSE"
echo "------" echo "------"
@ -31,14 +31,16 @@ if [ "${MODE}" = "MMVC" ] ; then
find /resources/ -type f -name "config.json" | xargs -I{} sh -c 'echo "config.jsonをコピーします。" && cp {} ./' 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 {} ./' find /resources/ -type f -name "*.pth" | xargs -I{} sh -c 'echo "`basename {}`をコピーします。" && cp {} ./'
if [ "${VERBOSE}" = "on" ]; then # if [ "${VERBOSE}" = "on" ]; then
echo "MMVCを起動します(verbose)" # echo "MMVCを起動します(verbose)"
python3 MMVCServerSIO.py $PARAMS # python3 MMVCServerSIO.py $PARAMS
else # else
echo "MMVCを起動します" # echo "MMVCを起動します"
python3 MMVCServerSIO.py $PARAMS 2>stderr.txt # python3 MMVCServerSIO.py $PARAMS 2>stderr.txt
fi # fi
echo "MMVCを起動します"
python3 MMVCServerSIO.py $PARAMS 2>stderr.txt
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
# date_tag=`date +%Y%m%d%H%M%S` # date_tag=`date +%Y%m%d%H%M%S`