From 18375aa19f2eaf3c091b95c4c4f64aa6884c7364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E9=80=B8=E8=B1=AA?= Date: Mon, 6 Mar 2023 07:58:03 +0000 Subject: [PATCH] demos/TTSArmLinux: all scripts use the paths defined in config.sh --- demos/TTSArmLinux/config.sh | 3 +-- demos/TTSArmLinux/download.sh | 12 +++++++----- demos/TTSArmLinux/run.sh | 8 ++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/demos/TTSArmLinux/config.sh b/demos/TTSArmLinux/config.sh index 9b895aa75..8053414d5 100644 --- a/demos/TTSArmLinux/config.sh +++ b/demos/TTSArmLinux/config.sh @@ -5,10 +5,9 @@ ARM_ABI=armv8 MODELS_DIR="${PWD}/models" LIBS_DIR="${PWD}/libs" +OUTPUT_DIR="${PWD}/output" -PADDLE_LITE_DOWNLOAD_URL="https://github.com/SwimmingTiger/Paddle-Lite/releases/download/68b66fd35/inference_lite_lib.armlinux.${ARM_ABI}.gcc.with_extra.with_cv.tar.gz" PADDLE_LITE_DIR="${LIBS_DIR}/inference_lite_lib.armlinux.${ARM_ABI}.gcc.with_extra.with_cv/cxx" -MODEL_DOWNLOAD_URL="https://paddlespeech.bj.bcebos.com/demos/TTSAndroid/fs2cnn_mbmelgan_cpu_v1.3.0.tar.gz" AM_MODEL_PATH="${MODELS_DIR}/cpu/fastspeech2_csmsc_arm.nb" VOC_MODEL_PATH="${MODELS_DIR}/cpu/mb_melgan_csmsc_arm.nb" diff --git a/demos/TTSArmLinux/download.sh b/demos/TTSArmLinux/download.sh index e362bb601..560374bc9 100755 --- a/demos/TTSArmLinux/download.sh +++ b/demos/TTSArmLinux/download.sh @@ -2,9 +2,11 @@ set -e cd "$(dirname "$(realpath "$0")")" -basedir="$PWD" -mkdir -p ./libs ./models +# load configure +. ./config.sh + +mkdir -p "$LIBS_DIR" "$MODELS_DIR" download() { file="$1" @@ -39,16 +41,16 @@ download() { download 'inference_lite_lib.armlinux.armv8.gcc.with_extra.with_cv.tar.gz' \ 'https://paddlespeech.bj.bcebos.com/demos/TTSArmLinux/inference_lite_lib.armlinux.armv8.gcc.with_extra.with_cv.tar.gz' \ '39e0c6604f97c70f5d13c573d7e709b9' \ - "$basedir/libs" + "$LIBS_DIR" download 'inference_lite_lib.armlinux.armv7hf.gcc.with_extra.with_cv.tar.gz' \ 'https://paddlespeech.bj.bcebos.com/demos/TTSArmLinux/inference_lite_lib.armlinux.armv7hf.gcc.with_extra.with_cv.tar.gz' \ 'f5ceb509f0b610dafb8379889c5f36f8' \ - "$basedir/libs" + "$LIBS_DIR" download 'fs2cnn_mbmelgan_cpu_v1.3.0.tar.gz' \ 'https://paddlespeech.bj.bcebos.com/demos/TTSAndroid/fs2cnn_mbmelgan_cpu_v1.3.0.tar.gz' \ '93ef17d44b498aff3bea93e2c5c09a1e' \ - "$basedir/models" + "$MODELS_DIR" echo "Done." diff --git a/demos/TTSArmLinux/run.sh b/demos/TTSArmLinux/run.sh index 69a9a1b22..efcb61b5b 100755 --- a/demos/TTSArmLinux/run.sh +++ b/demos/TTSArmLinux/run.sh @@ -7,12 +7,12 @@ cd "$(dirname "$(realpath "$0")")" . ./config.sh # create dir -rm -rf ./output -mkdir -p ./output +rm -rf "$OUTPUT_DIR" +mkdir -p "$OUTPUT_DIR" # run for i in {1..10}; do - (set -x; ./build/paddlespeech_tts_demo "$AM_MODEL_PATH" "$VOC_MODEL_PATH" $i ./output/$i.wav) + (set -x; ./build/paddlespeech_tts_demo "$AM_MODEL_PATH" "$VOC_MODEL_PATH" $i "$OUTPUT_DIR/$i.wav") done -ls -lh "$PWD"/output/*.wav +ls -lh "$OUTPUT_DIR"/*.wav