diff --git a/test_tipc/config/GeneralRecognition/GeneralRecognition_PPLCNet_x2_5_KL_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt b/test_tipc/config/PP-ShiTu/PPShiTu_general_rec_KL_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt similarity index 100% rename from test_tipc/config/GeneralRecognition/GeneralRecognition_PPLCNet_x2_5_KL_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt rename to test_tipc/config/PP-ShiTu/PPShiTu_general_rec_KL_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt diff --git a/test_tipc/config/GeneralRecognition/GeneralRecognition_PPLCNet_x2_5_KL_linux_gpu_normal_normal_serving_cpp_linux_gpu_cpu.txt b/test_tipc/config/PP-ShiTu/PPShiTu_general_rec_KL_linux_gpu_normal_normal_serving_cpp_linux_gpu_cpu.txt similarity index 100% rename from test_tipc/config/GeneralRecognition/GeneralRecognition_PPLCNet_x2_5_KL_linux_gpu_normal_normal_serving_cpp_linux_gpu_cpu.txt rename to test_tipc/config/PP-ShiTu/PPShiTu_general_rec_KL_linux_gpu_normal_normal_serving_cpp_linux_gpu_cpu.txt diff --git a/test_tipc/config/GeneralRecognition/GeneralRecognition_PPLCNet_x2_5_KL_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt b/test_tipc/config/PP-ShiTu/PPShiTu_general_rec_KL_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt similarity index 100% rename from test_tipc/config/GeneralRecognition/GeneralRecognition_PPLCNet_x2_5_KL_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt rename to test_tipc/config/PP-ShiTu/PPShiTu_general_rec_KL_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt diff --git a/test_tipc/prepare.sh b/test_tipc/prepare.sh index 0d12e18d99662dab2d4a0634280dce71416a63ea..9b78c0ff1e6a726b1d329bfa13e1cdd6cd86842f 100644 --- a/test_tipc/prepare.sh +++ b/test_tipc/prepare.sh @@ -208,7 +208,7 @@ fi if [[ ${MODE} = "serving_infer" ]]; then # prepare serving env python_name=$(func_parser_value "${lines[2]}") - if [[ ${model_name} =~ "ShiTu" ]]; then + if [[ ${model_name} = "PPShiTu" ]]; then cls_inference_model_url=$(func_parser_value "${lines[3]}") cls_tar_name=$(func_get_url_file_name "${cls_inference_model_url}") det_inference_model_url=$(func_parser_value "${lines[4]}") diff --git a/test_tipc/test_inference_cpp.sh b/test_tipc/test_inference_cpp.sh index abba66503f0ceede4cc17f0d3fb93811a4f50a11..6f67f479cf2fad49eeb85badea64f4d90e2a3964 100644 --- a/test_tipc/test_inference_cpp.sh +++ b/test_tipc/test_inference_cpp.sh @@ -237,14 +237,14 @@ echo "################### build PaddleClas demo finished ###################" # set cuda device -# GPUID=$2 -# if [ ${#GPUID} -le 0 ];then -# env="export CUDA_VISIBLE_DEVICES=0" -# else -# env="export CUDA_VISIBLE_DEVICES=${GPUID}" -# fi -# set CUDA_VISIBLE_DEVICES -# eval $env +GPUID=$3 +if [ ${#GPUID} -le 0 ];then + env="export CUDA_VISIBLE_DEVICES=0" +else + env="export CUDA_VISIBLE_DEVICES=${GPUID}" +fi +set CUDA_VISIBLE_DEVICES +eval $env echo "################### run test ###################" diff --git a/test_tipc/test_serving_infer_python.sh b/test_tipc/test_serving_infer_python.sh index 6141e11086008215903a2f87ba8ca1d69fd518b3..356d03216ddbe90f5d30e90afb591cf476b84e2c 100644 --- a/test_tipc/test_serving_infer_python.sh +++ b/test_tipc/test_serving_infer_python.sh @@ -310,7 +310,7 @@ echo "################### run test ###################" export Count=0 IFS="|" -if [[ ${model_name} =~ "ShiTu" ]]; then +if [[ ${model_name} = "PPShiTu" ]]; then func_serving_rec else func_serving_cls