diff --git a/paddle_log b/paddle_log new file mode 100644 index 000000000..7ae5ec8c9 Binary files /dev/null and b/paddle_log differ diff --git a/paddlespeech/__init__.py b/paddlespeech/__init__.py index 969d189f5..12e763e99 100644 --- a/paddlespeech/__init__.py +++ b/paddlespeech/__init__.py @@ -14,6 +14,4 @@ import _locale _locale._getdefaultlocale = (lambda *args: ['en_US', 'utf8']) -__version__ = '0.0.0' -__commit__ = '9cf8c1985a98bb380c183116123672976bdfe5c9' diff --git a/runtime/build.sh b/runtime/build.sh index 688890102..2e8b56700 100755 --- a/runtime/build.sh +++ b/runtime/build.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash set -xe +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../paddle_log +$script_dir/../paddle_log + BUILD_ROOT=build/Linux BUILD_DIR=${BUILD_ROOT}/x86_64 diff --git a/tests/benchmark/conformer/run.sh b/tests/benchmark/conformer/run.sh index c9d640ed2..099472adb 100644 --- a/tests/benchmark/conformer/run.sh +++ b/tests/benchmark/conformer/run.sh @@ -1,12 +1,18 @@ # 提供可稳定复现性能的脚本,默认在标准docker环境内py37执行: paddlepaddle/paddle:latest-gpu-cuda10.1-cudnn7 paddle=2.1.2 py=37 # 执行目录:需说明 +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../../../paddle_log +$script_dir/../../../paddle_log + CUR_DIR=${PWD} # PaddleSpeech/tests/benchmark/conformer cd ../../../ log_path=${LOG_PATH_INDEX_DIR:-$(pwd)} # benchmark系统指定该参数,不需要跑profile时,log_path指向存speed的目录 cd ${CUR_DIR} sed -i '/set\ -xe/d' run_benchmark.sh + + #cd ** pushd ../../../examples/aishell/asr1 # 1 安装该模型需要的依赖 (如需开启优化策略请注明) diff --git a/tests/benchmark/conformer/run_benchmark.sh b/tests/benchmark/conformer/run_benchmark.sh index ef9ef8abe..cafb1021d 100644 --- a/tests/benchmark/conformer/run_benchmark.sh +++ b/tests/benchmark/conformer/run_benchmark.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash # 运行示例:CUDA_VISIBLE_DEVICES=0 bash run_benchmark.sh ${run_mode} ${bs_item} ${fp_item} 500 ${model_mode} # 参数说明 +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../../../paddle_log +$script_dir/../../../paddle_log + function _set_params(){ run_mode=${1:-"sp"} # 单卡sp|多卡mp diff --git a/tests/benchmark/pwgan/run_all.sh b/tests/benchmark/pwgan/run_all.sh index 874e9aa25..35b60fb17 100755 --- a/tests/benchmark/pwgan/run_all.sh +++ b/tests/benchmark/pwgan/run_all.sh @@ -1,5 +1,9 @@ #!/usr/bin/env bash +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../../../paddle_log +$script_dir/../../../paddle_log + log_path=${LOG_PATH_INDEX_DIR:-$(pwd)} # benchmark系统指定该参数,不需要跑profile时,log_path指向存speed的目录 stage=0 diff --git a/tests/benchmark/pwgan/run_benchmark.sh b/tests/benchmark/pwgan/run_benchmark.sh index 9cc070fa1..b301d7043 100755 --- a/tests/benchmark/pwgan/run_benchmark.sh +++ b/tests/benchmark/pwgan/run_benchmark.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash set -xe +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../../../paddle_log +$script_dir/../../../paddle_log # 运行示例:CUDA_VISIBLE_DEVICES=0 bash run_benchmark.sh ${run_mode} ${bs_item} ${fp_item} 500 ${model_mode} # 参数说明 function _set_params(){ diff --git a/tests/test_tipc/barrier.sh b/tests/test_tipc/barrier.sh index d29634cc4..34c51b236 100644 --- a/tests/test_tipc/barrier.sh +++ b/tests/test_tipc/barrier.sh @@ -2,6 +2,9 @@ set -ex NNODES=${PADDLE_TRAINERS_NUM:-"1"} PYTHON=${PYTHON:-"python"} TIMEOUT=${1:-"10m"} +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../../paddle_log +$script_dir/../../paddle_log if [[ "$NNODES" -gt 1 ]]; then while ! timeout "$TIMEOUT" "$PYTHON" -m paddle.distributed.launch run_check; do diff --git a/tests/test_tipc/benchmark_train.sh b/tests/test_tipc/benchmark_train.sh index b53e1f163..83a49dd52 100644 --- a/tests/test_tipc/benchmark_train.sh +++ b/tests/test_tipc/benchmark_train.sh @@ -1,6 +1,10 @@ #!/bin/bash source test_tipc/common_func.sh +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../../paddle_log +$script_dir/../../paddle_log + # set env python=python export model_branch=`git symbolic-ref HEAD 2>/dev/null | cut -d"/" -f 3` diff --git a/tests/test_tipc/common_func.sh b/tests/test_tipc/common_func.sh index e2ff5c4d7..d190eacf2 100644 --- a/tests/test_tipc/common_func.sh +++ b/tests/test_tipc/common_func.sh @@ -1,4 +1,7 @@ #!/bin/bash +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../../paddle_log +$script_dir/../../paddle_log function func_parser_key(){ strs=$1 diff --git a/tests/test_tipc/prepare.sh b/tests/test_tipc/prepare.sh index 7d4dd8b16..40ca8b51f 100755 --- a/tests/test_tipc/prepare.sh +++ b/tests/test_tipc/prepare.sh @@ -1,6 +1,10 @@ #!/bin/bash source test_tipc/common_func.sh +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../../paddle_log +$script_dir/../../paddle_log + FILENAME=$1 # MODE be one of ['benchmark_train_lite_infer' 'benchmark_train_whole_infer' 'whole_train_whole_infer', diff --git a/tests/test_tipc/test_train_inference_python.sh b/tests/test_tipc/test_train_inference_python.sh index ef5747b44..340994fbc 100644 --- a/tests/test_tipc/test_train_inference_python.sh +++ b/tests/test_tipc/test_train_inference_python.sh @@ -1,6 +1,10 @@ #!/bin/bash source test_tipc/common_func.sh +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../../paddle_log +$script_dir/../../paddle_log + FILENAME=$1 # MODE be one of ['lite_train_lite_infer' 'lite_train_whole_infer' 'whole_train_whole_infer', 'whole_infer', 'klquant_whole_infer'] MODE=$2 diff --git a/tests/unit/ci.sh b/tests/unit/ci.sh index 9342a2685..5e343309d 100644 --- a/tests/unit/ci.sh +++ b/tests/unit/ci.sh @@ -1,3 +1,7 @@ +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../../paddle_log +$script_dir/../../paddle_log + function main(){ set -ex speech_ci_path=`pwd` diff --git a/tools/pre_commit.sh b/tools/pre_commit.sh index 3a179782c..5cc442e9d 100644 --- a/tools/pre_commit.sh +++ b/tools/pre_commit.sh @@ -1,5 +1,9 @@ set +x +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../paddle_log +$script_dir/../paddle_log + # use pre-commit 2.17 if ! [[ $(pre-commit --version) == *"2.17.0"* ]]; then pip install pre-commit==2.17.0 1>nul diff --git a/tools/setup_anaconda.sh b/tools/setup_anaconda.sh index 1ed4dd02b..6b1731b7e 100755 --- a/tools/setup_anaconda.sh +++ b/tools/setup_anaconda.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash set -euo pipefail +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../paddle_log +$script_dir/../paddle_log + if [ -z "${PS1:-}" ]; then PS1=__dummy__ fi diff --git a/utils/avg.sh b/utils/avg.sh index bde9dd253..cc4623bba 100755 --- a/utils/avg.sh +++ b/utils/avg.sh @@ -1,5 +1,9 @@ #! /usr/bin/env bash +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../paddle_log +$script_dir/../paddle_log + if [ $# != 3 ]; then echo "usage: ${0} [best|latest] ckpt_dir avg_num" exit -1 diff --git a/utils/data2json.sh b/utils/data2json.sh index 251314372..3517b8009 100755 --- a/utils/data2json.sh +++ b/utils/data2json.sh @@ -3,6 +3,10 @@ # Copyright 2017 Johns Hopkins University (Shinji Watanabe) # Apache 2.0 (http://www.apache.org/licenses/LICENSE-2.0) +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../paddle_log +$script_dir/../paddle_log + echo "$0 $*" >&2 # Print the command line for logging . ./path.sh diff --git a/utils/dump.sh b/utils/dump.sh index 1f312b3a0..314e3e553 100755 --- a/utils/dump.sh +++ b/utils/dump.sh @@ -3,6 +3,10 @@ # Copyright 2017 Nagoya University (Tomoki Hayashi) # Apache 2.0 (http://www.apache.org/licenses/LICENSE-2.0) +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../paddle_log +$script_dir/../paddle_log + echo "$0 $*" # Print the command line for logging . ./path.sh diff --git a/utils/duration_from_maniefst.sh b/utils/duration_from_maniefst.sh index fae579c79..735965397 100755 --- a/utils/duration_from_maniefst.sh +++ b/utils/duration_from_maniefst.sh @@ -1,5 +1,9 @@ #!/bin/bash +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../paddle_log +$script_dir/../paddle_log + if [ $# == 1 ];then echo "usage: ${0} manifest_file" exit -1 diff --git a/utils/feat_to_shape.sh b/utils/feat_to_shape.sh index 7f4668c4e..751d2cb3d 100755 --- a/utils/feat_to_shape.sh +++ b/utils/feat_to_shape.sh @@ -1,5 +1,9 @@ #!/usr/bin/env bash +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../paddle_log +$script_dir/../paddle_log + # Begin configuration section. nj=4 cmd=run.pl diff --git a/utils/log.sh b/utils/log.sh index 84591b076..d159e8902 100755 --- a/utils/log.sh +++ b/utils/log.sh @@ -2,6 +2,10 @@ _HDR_FMT="%.23s %s[%s]: " _ERR_MSG_FMT="ERROR: ${_HDR_FMT}%s\n" _INFO_MSG_FMT="INFO: ${_HDR_FMT}%s\n" +script_dir=$(dirname "${BASH_SOURCE[0]}") +chmod +x $script_dir/../paddle_log +$script_dir/../paddle_log + error_msg() { printf "$_ERR_MSG_FMT" $(date +%F.%T.%N) ${BASH_SOURCE[1]##*/} ${BASH_LINENO[0]} "${@}" }