From fabc932d11c0774decf7c97c3a3606c7ac46fd85 Mon Sep 17 00:00:00 2001 From: tink2123 Date: Thu, 14 Oct 2021 04:16:52 +0000 Subject: [PATCH 1/4] serving test --- tests/test_serving.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/test_serving.sh b/tests/test_serving.sh index 8998ee7ee..4684a49e0 100644 --- a/tests/test_serving.sh +++ b/tests/test_serving.sh @@ -129,3 +129,7 @@ eval $env echo "################### run test ###################" + +export Count=0 +IFS="|" +func_serving "${web_service_cmd}" \ No newline at end of file From 97f6aeaa759ba584e90302d1af788163fd42042b Mon Sep 17 00:00:00 2001 From: tink2123 Date: Thu, 14 Oct 2021 11:26:17 +0000 Subject: [PATCH 2/4] add test_serving shell --- tests/configs/ppocr_rec_mobile_params.txt | 5 ++- tests/test_serving.sh | 53 ++++++++++++----------- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/tests/configs/ppocr_rec_mobile_params.txt b/tests/configs/ppocr_rec_mobile_params.txt index f9c407897..23c753b83 100644 --- a/tests/configs/ppocr_rec_mobile_params.txt +++ b/tests/configs/ppocr_rec_mobile_params.txt @@ -65,6 +65,8 @@ inference:./deploy/cpp_infer/build/ppocr rec null:null --benchmark:True ===========================serving_params=========================== +model_name:ocr_rec +python:python3.7 trans_model:-m paddle_serving_client.convert --dirname:./inference/ch_ppocr_mobile_v2.0_rec_infer/ --model_filename:inference.pdmodel @@ -78,4 +80,5 @@ op.rec.local_service_conf.use_mkldnn:True|False op.rec.local_service_conf.thread_num:1|6 op.rec.local_service_conf.use_trt:False|True op.rec.local_service_conf.precision:fp32|fp16|int8 -pipline:pipeline_http_client.py --image_dir=../../doc/imgs_words_en \ No newline at end of file +pipline:pipeline_http_client.py --image_dir=../../doc/imgs_words_en +python:python3.7 \ No newline at end of file diff --git a/tests/test_serving.sh b/tests/test_serving.sh index 4684a49e0..c80d9c09a 100644 --- a/tests/test_serving.sh +++ b/tests/test_serving.sh @@ -2,38 +2,39 @@ source tests/common_func.sh FILENAME=$1 -dataline=$(awk 'NR==67, NR==81{print}' $FILENAME) +dataline=$(awk 'NR==67, NR==83{print}' $FILENAME) # parser params IFS=$'\n' lines=(${dataline}) # parser serving -trans_model_py=$(func_parser_value "${lines[1]}") -infer_model_dir_key=$(func_parser_key "${lines[2]}") -infer_model_dir_value=$(func_parser_value "${lines[2]}") -model_filename_key=$(func_parser_key "${lines[3]}") -model_filename_value=$(func_parser_value "${lines[3]}") -params_filename_key=$(func_parser_key "${lines[4]}") -params_filename_value=$(func_parser_value "${lines[4]}") -serving_server_key=$(func_parser_key "${lines[5]}") -serving_server_value=$(func_parser_value "${lines[5]}") -serving_client_key=$(func_parser_key "${lines[6]}") -serving_client_value=$(func_parser_value "${lines[6]}") -serving_dir_value=$(func_parser_value "${lines[7]}") -web_service_py=$(func_parser_value "${lines[8]}") -web_use_gpu_key=$(func_parser_key "${lines[9]}") -web_use_gpu_list=$(func_parser_value "${lines[9]}") -web_use_mkldnn_key=$(func_parser_key "${lines[10]}") -web_use_mkldnn_list=$(func_parser_value "${lines[10]}") -web_cpu_threads_key=$(func_parser_key "${lines[11]}") -web_cpu_threads_list=$(func_parser_value "${lines[11]}") -web_use_trt_key=$(func_parser_key "${lines[12]}") -web_use_trt_list=$(func_parser_value "${lines[12]}") -web_precision_key=$(func_parser_key "${lines[13]}") -web_precision_list=$(func_parser_value "${lines[13]}") -pipeline_py=$(func_parser_value "${lines[14]}") - +model_name=$(func_parser_value "${lines[1]}") +python=$(func_parser_value "${lines[2]}") +trans_model_py=$(func_parser_value "${lines[3]}") +infer_model_dir_key=$(func_parser_key "${lines[4]}") +infer_model_dir_value=$(func_parser_value "${lines[4]}") +model_filename_key=$(func_parser_key "${lines[5]}") +model_filename_value=$(func_parser_value "${lines[5]}") +params_filename_key=$(func_parser_key "${lines[6]}") +params_filename_value=$(func_parser_value "${lines[6]}") +serving_server_key=$(func_parser_key "${lines[7]}") +serving_server_value=$(func_parser_value "${lines[7]}") +serving_client_key=$(func_parser_key "${lines[8]}") +serving_client_value=$(func_parser_value "${lines[8]}") +serving_dir_value=$(func_parser_value "${lines[9]}") +web_service_py=$(func_parser_value "${lines[10]}") +web_use_gpu_key=$(func_parser_key "${lines[11]}") +web_use_gpu_list=$(func_parser_value "${lines[11]}") +web_use_mkldnn_key=$(func_parser_key "${lines[12]}") +web_use_mkldnn_list=$(func_parser_value "${lines[12]}") +web_cpu_threads_key=$(func_parser_key "${lines[13]}") +web_cpu_threads_list=$(func_parser_value "${lines[13]}") +web_use_trt_key=$(func_parser_key "${lines[14]}") +web_use_trt_list=$(func_parser_value "${lines[14]}") +web_precision_key=$(func_parser_key "${lines[15]}") +web_precision_list=$(func_parser_value "${lines[15]}") +pipeline_py=$(func_parser_value "${lines[16]}") LOG_PATH="./tests/output" mkdir -p ${LOG_PATH} From e23a66228638888158c512b6bb01f7949aacf214 Mon Sep 17 00:00:00 2001 From: tink2123 Date: Mon, 18 Oct 2021 11:25:06 +0800 Subject: [PATCH 3/4] rename serving log --- tests/test_serving.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/test_serving.sh b/tests/test_serving.sh index c80d9c09a..7662defe4 100644 --- a/tests/test_serving.sh +++ b/tests/test_serving.sh @@ -40,7 +40,6 @@ LOG_PATH="./tests/output" mkdir -p ${LOG_PATH} status_log="${LOG_PATH}/results_serving.log" - function func_serving(){ IFS='|' _python=$1 @@ -66,7 +65,7 @@ function func_serving(){ continue fi for threads in ${web_cpu_threads_list[*]}; do - _save_log_path="${_log_path}/server_cpu_usemkldnn_${use_mkldnn}_threads_${threads}_batchsize_1.log" + _save_log_path="${LOG_PATH}/server_infer_cpu_usemkldnn_${use_mkldnn}_threads_${threads}_batchsize_1.log" set_cpu_threads=$(func_set_params "${web_cpu_threads_key}" "${threads}") web_service_cmd="${python} ${web_service_py} ${web_use_gpu_key}=${use_gpu} ${web_use_mkldnn_key}=${use_mkldnn} ${set_cpu_threads} &>${_save_log_path} &" eval $web_service_cmd @@ -94,7 +93,7 @@ function func_serving(){ if [[ ${use_trt} = "False" || ${precision} =~ "int8" ]] && [[ ${_flag_quant} = "True" ]]; then continue fi - _save_log_path="${_log_path}/infer_gpu_usetrt_${use_trt}_precision_${precision}_batchsize_1.log" + _save_log_path="${LOG_PATH}/server_infer_gpu_usetrt_${use_trt}_precision_${precision}_batchsize_1.log" set_tensorrt=$(func_set_params "${web_use_trt_key}" "${use_trt}") set_precision=$(func_set_params "${web_precision_key}" "${precision}") web_service_cmd="${python} ${web_service_py} ${web_use_gpu_key}=${use_gpu} ${set_tensorrt} ${set_precision} &>${_save_log_path} & " From ae12e0d5805dd2eb3cc846b6f748e5e7880e2750 Mon Sep 17 00:00:00 2001 From: tink2123 Date: Mon, 18 Oct 2021 05:47:18 +0000 Subject: [PATCH 4/4] fix serving test --- tests/configs/ppocr_det_mobile_params.txt | 4 ++- tests/configs/ppocr_det_server_params.txt | 33 ++++++++++++++++++++++- tests/configs/ppocr_rec_mobile_params.txt | 1 - tests/configs/ppocr_rec_server_params.txt | 8 +++--- tests/prepare.sh | 2 +- tests/test_serving.sh | 14 +++++----- 6 files changed, 48 insertions(+), 14 deletions(-) diff --git a/tests/configs/ppocr_det_mobile_params.txt b/tests/configs/ppocr_det_mobile_params.txt index 5edb14cdb..2f003025c 100644 --- a/tests/configs/ppocr_det_mobile_params.txt +++ b/tests/configs/ppocr_det_mobile_params.txt @@ -65,6 +65,8 @@ inference:./deploy/cpp_infer/build/ppocr det null:null --benchmark:True ===========================serving_params=========================== +model_name:ocr_det +python:python3.7 trans_model:-m paddle_serving_client.convert --dirname:./inference/ch_ppocr_mobile_v2.0_det_infer/ --model_filename:inference.pdmodel @@ -95,4 +97,4 @@ inference:tools/infer/predict_det.py null:null --benchmark:True null:null -null:null \ No newline at end of file +null:null diff --git a/tests/configs/ppocr_det_server_params.txt b/tests/configs/ppocr_det_server_params.txt index b3df1735e..bba4ef44f 100644 --- a/tests/configs/ppocr_det_server_params.txt +++ b/tests/configs/ppocr_det_server_params.txt @@ -49,4 +49,35 @@ inference:tools/infer/predict_det.py --save_log_path:null --benchmark:True null:null - +===========================cpp_infer_params=========================== +use_opencv:True +infer_model:./inference/ch_ppocr_server_v2.0_det_infer/ +infer_quant:False +inference:./deploy/cpp_infer/build/ppocr det +--use_gpu:True|False +--enable_mkldnn:True|False +--cpu_threads:1|6 +--rec_batch_num:1 +--use_tensorrt:False|True +--precision:fp32|fp16 +--det_model_dir: +--image_dir:./inference/ch_det_data_50/all-sum-510/ +null:null +--benchmark:True +===========================serving_params=========================== +model_name:ocr_det_server +python:python3.7 +trans_model:-m paddle_serving_client.convert +--dirname:./inference/ch_ppocr_server_v2.0_det_infer/ +--model_filename:inference.pdmodel +--params_filename:inference.pdiparams +--serving_server:./deploy/pdserving/ppocr_det_mobile_2.0_serving/ +--serving_client:./deploy/pdserving/ppocr_det_mobile_2.0_client/ +serving_dir:./deploy/pdserving +web_service:web_service_det.py --config=config.yml --opt op.det.concurrency=1 +op.det.local_service_conf.devices:null|0 +op.det.local_service_conf.use_mkldnn:True|False +op.det.local_service_conf.thread_num:1|6 +op.det.local_service_conf.use_trt:False|True +op.det.local_service_conf.precision:fp32|fp16|int8 +pipline:pipeline_http_client.py --image_dir=../../doc/imgs diff --git a/tests/configs/ppocr_rec_mobile_params.txt b/tests/configs/ppocr_rec_mobile_params.txt index 23c753b83..f3f3a54e1 100644 --- a/tests/configs/ppocr_rec_mobile_params.txt +++ b/tests/configs/ppocr_rec_mobile_params.txt @@ -81,4 +81,3 @@ op.rec.local_service_conf.thread_num:1|6 op.rec.local_service_conf.use_trt:False|True op.rec.local_service_conf.precision:fp32|fp16|int8 pipline:pipeline_http_client.py --image_dir=../../doc/imgs_words_en -python:python3.7 \ No newline at end of file diff --git a/tests/configs/ppocr_rec_server_params.txt b/tests/configs/ppocr_rec_server_params.txt index 7d151fcf0..77961e8e6 100644 --- a/tests/configs/ppocr_rec_server_params.txt +++ b/tests/configs/ppocr_rec_server_params.txt @@ -65,12 +65,14 @@ inference:./deploy/cpp_infer/build/ppocr rec null:null --benchmark:True ===========================serving_params=========================== +model_name:ocr_server_rec +python:python3.7 trans_model:-m paddle_serving_client.convert --dirname:./inference/ch_ppocr_server_v2.0_rec_infer/ --model_filename:inference.pdmodel --params_filename:inference.pdiparams ---serving_server:./deploy/pdserving/ppocr_rec_server_2.0_serving/ ---serving_client:./deploy/pdserving/ppocr_rec_server_2.0_client/ +--serving_server:./deploy/pdserving/ppocr_rec_mobile_2.0_serving/ +--serving_client:./deploy/pdserving/ppocr_rec_mobile_2.0_client/ serving_dir:./deploy/pdserving web_service:web_service_rec.py --config=config.yml --opt op.rec.concurrency=1 op.rec.local_service_conf.devices:null|0 @@ -78,4 +80,4 @@ op.rec.local_service_conf.use_mkldnn:True|False op.rec.local_service_conf.thread_num:1|6 op.rec.local_service_conf.use_trt:False|True op.rec.local_service_conf.precision:fp32|fp16|int8 -pipline:pipeline_http_client.py --image_dir=../../doc/imgs_words_en \ No newline at end of file +pipline:pipeline_http_client.py --image_dir=../../doc/imgs_words_en diff --git a/tests/prepare.sh b/tests/prepare.sh index abb84c881..d842f4f57 100644 --- a/tests/prepare.sh +++ b/tests/prepare.sh @@ -134,5 +134,5 @@ if [ ${MODE} = "serving_infer" ];then wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_mobile_v2.0_rec_infer.tar wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_server_v2.0_det_infer.tar wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_server_v2.0_rec_infer.tar - cd ./inference && tar xf ch_ppocr_mobile_v2.0_det_infer.tar && tar xf ch_ppocr_mobile_v2.0_rec_infer.tar && tar xf ch_ppocr_server_v2.0_rec_infer.tar && tar xf ch_ppocr_server_v2.0_det_infer.tar cd ../ + cd ./inference && tar xf ch_ppocr_mobile_v2.0_det_infer.tar && tar xf ch_ppocr_mobile_v2.0_rec_infer.tar && tar xf ch_ppocr_server_v2.0_rec_infer.tar && tar xf ch_ppocr_server_v2.0_det_infer.tar && cd ../ fi diff --git a/tests/test_serving.sh b/tests/test_serving.sh index 7662defe4..ec79a46c9 100644 --- a/tests/test_serving.sh +++ b/tests/test_serving.sh @@ -36,8 +36,8 @@ web_precision_key=$(func_parser_key "${lines[15]}") web_precision_list=$(func_parser_value "${lines[15]}") pipeline_py=$(func_parser_value "${lines[16]}") -LOG_PATH="./tests/output" -mkdir -p ${LOG_PATH} +LOG_PATH="../../tests/output" +mkdir -p ./tests/output status_log="${LOG_PATH}/results_serving.log" function func_serving(){ @@ -67,10 +67,10 @@ function func_serving(){ for threads in ${web_cpu_threads_list[*]}; do _save_log_path="${LOG_PATH}/server_infer_cpu_usemkldnn_${use_mkldnn}_threads_${threads}_batchsize_1.log" set_cpu_threads=$(func_set_params "${web_cpu_threads_key}" "${threads}") - web_service_cmd="${python} ${web_service_py} ${web_use_gpu_key}=${use_gpu} ${web_use_mkldnn_key}=${use_mkldnn} ${set_cpu_threads} &>${_save_log_path} &" + web_service_cmd="${python} ${web_service_py} ${web_use_gpu_key}=${use_gpu} ${web_use_mkldnn_key}=${use_mkldnn} ${set_cpu_threads} &" eval $web_service_cmd sleep 2s - pipeline_cmd="${python} ${pipeline_py}" + pipeline_cmd="${python} ${pipeline_py} > ${_save_log_path} 2>&1 " eval $pipeline_cmd last_status=${PIPESTATUS[0]} eval "cat ${_save_log_path}" @@ -96,10 +96,10 @@ function func_serving(){ _save_log_path="${LOG_PATH}/server_infer_gpu_usetrt_${use_trt}_precision_${precision}_batchsize_1.log" set_tensorrt=$(func_set_params "${web_use_trt_key}" "${use_trt}") set_precision=$(func_set_params "${web_precision_key}" "${precision}") - web_service_cmd="${python} ${web_service_py} ${web_use_gpu_key}=${use_gpu} ${set_tensorrt} ${set_precision} &>${_save_log_path} & " + web_service_cmd="${python} ${web_service_py} ${web_use_gpu_key}=${use_gpu} ${set_tensorrt} ${set_precision} & " eval $web_service_cmd sleep 2s - pipeline_cmd="${python} ${pipeline_py}" + pipeline_cmd="${python} ${pipeline_py} > ${_save_log_path} 2>&1" eval $pipeline_cmd last_status=${PIPESTATUS[0]} eval "cat ${_save_log_path}" @@ -132,4 +132,4 @@ echo "################### run test ###################" export Count=0 IFS="|" -func_serving "${web_service_cmd}" \ No newline at end of file +func_serving "${web_service_cmd}"