Merge pull request #6462 from andyjpaddle/cpp_infer_tipc

[TIPC] update_tipc_cpp_infer

test_tipc/configs/ch_PP-OCRv2/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt

@@ -3,7 +3,7 @@ model_name:ch_PP-OCRv2
 use_opencv:True
 infer_model:./inference/ch_PP-OCRv2_det_infer/
 infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr --rec_char_dict_path=./ppocr/utils/ppocr_keys_v1.txt
+inference:./deploy/cpp_infer/build/ppocr --rec_char_dict_path=./ppocr/utils/ppocr_keys_v1.txt --rec_img_h=32
 --use_gpu:True|False
 --enable_mkldnn:False
 --cpu_threads:6

test_tipc/configs/ch_PP-OCRv2_rec/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt

@@ -3,7 +3,7 @@ model_name:ch_PP-OCRv2_rec
 use_opencv:True
 infer_model:./inference/ch_PP-OCRv2_rec_infer/
 infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr --rec_char_dict_path=./ppocr/utils/ppocr_keys_v1.txt
+inference:./deploy/cpp_infer/build/ppocr --rec_char_dict_path=./ppocr/utils/ppocr_keys_v1.txt --rec_img_h=32
 --use_gpu:True|False
 --enable_mkldnn:False
 --cpu_threads:6

test_tipc/configs/ch_ppocr_mobile_v2.0/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt

@@ -3,7 +3,7 @@ model_name:ch_ppocr_mobile_v2.0
 use_opencv:True
 infer_model:./inference/ch_ppocr_mobile_v2.0_det_infer/
 infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr --rec_char_dict_path=./ppocr/utils/ppocr_keys_v1.txt
+inference:./deploy/cpp_infer/build/ppocr --rec_char_dict_path=./ppocr/utils/ppocr_keys_v1.txt --rec_img_h=32
 --use_gpu:True|False
 --enable_mkldnn:False
 --cpu_threads:6

test_tipc/configs/ch_ppocr_mobile_v2.0_rec/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt

@@ -3,7 +3,7 @@ model_name:ch_ppocr_mobile_v2.0_rec
 use_opencv:True
 infer_model:./inference/ch_ppocr_mobile_v2.0_rec_infer/
 infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr --rec_char_dict_path=./ppocr/utils/ppocr_keys_v1.txt
+inference:./deploy/cpp_infer/build/ppocr --rec_char_dict_path=./ppocr/utils/ppocr_keys_v1.txt --rec_img_h=32
 --use_gpu:True|False
 --enable_mkldnn:False
 --cpu_threads:6

test_tipc/configs/ch_ppocr_server_v2.0/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt

@@ -3,7 +3,7 @@ model_name:ch_ppocr_server_v2.0
 use_opencv:True
 infer_model:./inference/ch_ppocr_server_v2.0_det_infer/
 infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr --rec_char_dict_path=./ppocr/utils/ppocr_keys_v1.txt
+inference:./deploy/cpp_infer/build/ppocr --rec_char_dict_path=./ppocr/utils/ppocr_keys_v1.txt --rec_img_h=32
 --use_gpu:True|False
 --enable_mkldnn:False
 --cpu_threads:6

test_tipc/configs/ch_ppocr_server_v2.0_rec/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt

@@ -3,7 +3,7 @@ model_name:ch_ppocr_server_v2.0_rec
 use_opencv:True
 infer_model:./inference/ch_ppocr_server_v2.0_rec_infer/
 infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr --rec_char_dict_path=./ppocr/utils/ppocr_keys_v1.txt
+inference:./deploy/cpp_infer/build/ppocr --rec_char_dict_path=./ppocr/utils/ppocr_keys_v1.txt --rec_img_h=32
 --use_gpu:True|False
 --enable_mkldnn:False
 --cpu_threads:6

test_tipc/prepare.sh

@@ -328,7 +328,6 @@ if [ ${MODE} = "klquant_whole_infer" ]; then
         cd ./inference && tar xf rec_inference.tar && tar xf ch_PP-OCRv2_rec_infer.tar && cd ../
     fi
     if [ ${model_name} = "ch_PP-OCRv3_rec_KL" ]; then
-        # TODO check model link
         wget -nc -P ./inference https://paddleocr.bj.bcebos.com/PP-OCRv3/chinese/ch_PP-OCRv3_rec_infer.tar  --no-check-certificate
         wget -nc -P ./inference/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/rec_inference.tar  --no-check-certificate
         wget -nc -P ./train_data/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/ic15_data.tar --no-check-certificate
@@ -341,7 +340,6 @@ if [ ${MODE} = "klquant_whole_infer" ]; then
         cd ./inference && tar xf ch_PP-OCRv2_det_infer.tar && tar xf ch_det_data_50.tar && cd ../
     fi 
     if [ ${model_name} = "ch_PP-OCRv3_det_KL" ]; then
-        # TODO check model link
         wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/ch_det_data_50.tar  --no-check-certificate
         wget -nc -P ./inference https://paddleocr.bj.bcebos.com/PP-OCRv3/chinese/ch_PP-OCRv3_det_infer.tar  --no-check-certificate
         cd ./inference && tar xf ch_PP-OCRv3_det_infer.tar && tar xf ch_det_data_50.tar && cd ../
@@ -417,9 +415,9 @@ if [ ${MODE} = "serving_infer" ];then
     IFS='|'
     array=(${python_name_list})
     python_name=${array[0]}
-    # ${python_name} -m pip install paddle-serving-server-gpu==0.8.3.post101
-    # ${python_name} -m pip install paddle_serving_client==0.8.3
-    # ${python_name} -m pip install paddle-serving-app==0.8.3
+    ${python_name} -m pip install paddle-serving-server-gpu
+    ${python_name} -m pip install paddle_serving_client
+    ${python_name} -m pip install paddle-serving-app
     # wget model
     if [[ ${model_name} =~ "ch_ppocr_mobile_v2.0" ]]; then
         wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_mobile_v2.0_det_infer.tar --no-check-certificate
@@ -447,7 +445,7 @@ if [ ${MODE} = "paddle2onnx_infer" ];then
     # prepare serving env
     python_name=$(func_parser_value "${lines[2]}")
     ${python_name} -m pip install paddle2onnx
-    ${python_name} -m pip install onnxruntime==1.4.0
+    ${python_name} -m pip install onnxruntime
     # wget model
     if [[ ${model_name} =~ "ch_ppocr_mobile_v2.0" ]]; then
         wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_mobile_v2.0_det_infer.tar --no-check-certificate

test_tipc/test_inference_cpp.sh

@@ -189,6 +189,9 @@ else
         wget -nc $PADDLEInfer --no-check-certificate
     fi
     tar zxf paddle_inference.tgz
+    if [ ! -d "paddle_inference" ]; then
+        ln -s paddle_inference_install_dir paddle_inference
+    fi
     echo "################### download paddle inference finished ###################"
 fi
 LIB_DIR=$(pwd)/paddle_inference/
@@ -218,11 +221,10 @@ echo "################### build PaddleOCR demo finished ###################"
 # set cuda device
 GPUID=$2
 if [ ${#GPUID} -le 0 ];then
-    env=" "
+    env="export CUDA_VISIBLE_DEVICES=0"
 else
     env="export CUDA_VISIBLE_DEVICES=${GPUID}"
 fi
-set CUDA_VISIBLE_DEVICES
 eval $env