diff --git a/examples/csmsc/tts2/run.sh b/examples/csmsc/tts2/run.sh index 766aa882bcac5134953268f4c0ea3b2022ecf707..1d67a5c9101ee88d6d181837d601bed287c4e62f 100755 --- a/examples/csmsc/tts2/run.sh +++ b/examples/csmsc/tts2/run.sh @@ -46,8 +46,8 @@ fi if [ ${stage} -le 5 ] && [ ${stop_stage} -ge 5 ]; then # install paddle2onnx version=$(echo `pip list |grep "paddle2onnx"` |awk -F" " '{print $2}') - if [[ -z "$version" || ${version} != '0.9.4' ]]; then - pip install paddle2onnx==0.9.4 + if [[ -z "$version" || ${version} != '0.9.5' ]]; then + pip install paddle2onnx==0.9.5 fi ./local/paddle2onnx.sh ${train_output_path} inference inference_onnx speedyspeech_csmsc ./local/paddle2onnx.sh ${train_output_path} inference inference_onnx hifigan_csmsc diff --git a/examples/csmsc/tts3/run.sh b/examples/csmsc/tts3/run.sh index b617d53527d16abd536a65226c93e7ae24592bc3..f0afcc8958cf8cef7df5901c7b9fb935d74290f2 100755 --- a/examples/csmsc/tts3/run.sh +++ b/examples/csmsc/tts3/run.sh @@ -46,8 +46,8 @@ fi if [ ${stage} -le 5 ] && [ ${stop_stage} -ge 5 ]; then # install paddle2onnx version=$(echo `pip list |grep "paddle2onnx"` |awk -F" " '{print $2}') - if [[ -z "$version" || ${version} != '0.9.4' ]]; then - pip install paddle2onnx==0.9.4 + if [[ -z "$version" || ${version} != '0.9.5' ]]; then + pip install paddle2onnx==0.9.5 fi ./local/paddle2onnx.sh ${train_output_path} inference inference_onnx fastspeech2_csmsc ./local/paddle2onnx.sh ${train_output_path} inference inference_onnx hifigan_csmsc @@ -56,10 +56,5 @@ fi # inference with onnxruntime, use fastspeech2 + hifigan by default if [ ${stage} -le 6 ] && [ ${stop_stage} -ge 6 ]; then - # install onnxruntime - version=$(echo `pip list |grep "onnxruntime"` |awk -F" " '{print $2}') - if [[ -z "$version" || ${version} != '1.10.0' ]]; then - pip install onnxruntime==1.10.0 - fi ./local/ort_predict.sh ${train_output_path} fi diff --git a/examples/csmsc/tts3/run_cnndecoder.sh b/examples/csmsc/tts3/run_cnndecoder.sh index 61cd02a932016387639426fc0c1efafc2f4c135a..c8dd8545b4cd48915990f6c5c5a7fb9ebcd866bf 100755 --- a/examples/csmsc/tts3/run_cnndecoder.sh +++ b/examples/csmsc/tts3/run_cnndecoder.sh @@ -59,22 +59,16 @@ fi if [ ${stage} -le 7 ] && [ ${stop_stage} -ge 7 ]; then # install paddle2onnx version=$(echo `pip list |grep "paddle2onnx"` |awk -F" " '{print $2}') - if [[ -z "$version" || ${version} != '0.9.4' ]]; then - pip install paddle2onnx==0.9.4 + if [[ -z "$version" || ${version} != '0.9.5' ]]; then + pip install paddle2onnx==0.9.5 fi ./local/paddle2onnx.sh ${train_output_path} inference inference_onnx fastspeech2_csmsc ./local/paddle2onnx.sh ${train_output_path} inference inference_onnx hifigan_csmsc fi - # onnxruntime non streaming # inference with onnxruntime, use fastspeech2 + hifigan by default if [ ${stage} -le 8 ] && [ ${stop_stage} -ge 8 ]; then - # install onnxruntime - version=$(echo `pip list |grep "onnxruntime"` |awk -F" " '{print $2}') - if [[ -z "$version" || ${version} != '1.10.0' ]]; then - pip install onnxruntime==1.10.0 - fi ./local/ort_predict.sh ${train_output_path} fi @@ -82,8 +76,8 @@ fi if [ ${stage} -le 9 ] && [ ${stop_stage} -ge 9 ]; then # install paddle2onnx version=$(echo `pip list |grep "paddle2onnx"` |awk -F" " '{print $2}') - if [[ -z "$version" || ${version} != '0.9.4' ]]; then - pip install paddle2onnx==0.9.4 + if [[ -z "$version" || ${version} != '0.9.5' ]]; then + pip install paddle2onnx==0.9.5 fi # streaming acoustic model ./local/paddle2onnx.sh ${train_output_path} inference_streaming inference_onnx_streaming fastspeech2_csmsc_am_encoder_infer @@ -95,11 +89,6 @@ fi # onnxruntime streaming if [ ${stage} -le 10 ] && [ ${stop_stage} -ge 10 ]; then - # install onnxruntime - version=$(echo `pip list |grep "onnxruntime"` |awk -F" " '{print $2}') - if [[ -z "$version" || ${version} != '1.10.0' ]]; then - pip install onnxruntime==1.10.0 - fi ./local/ort_predict_streaming.sh ${train_output_path} fi