Merge pull request #4799 from tink2123/del_fp16

del fp16 in rec_model

ppocr/modeling/transforms/tps_spatial_transformer.py

@@ -53,7 +53,7 @@ def compute_partial_repr(input_points, control_points):
                                                                          1]
     repr_matrix = 0.5 * pairwise_dist * paddle.log(pairwise_dist)
     # fix numerical error for 0 * log(0), substitute all nan with 0
-    mask = repr_matrix != repr_matrix
+    mask = np.array(repr_matrix != repr_matrix)
     repr_matrix[mask] = 0
     return repr_matrix
 

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

@@ -37,13 +37,13 @@ export2:null
 infer_model:null
 infer_export:tools/export_model.py -c test_tipc/configs/ch_ppocr_server_v2.0_rec/rec_icdar15_train.yml -o
 infer_quant:False
-inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dict.txt --rec_image_shape="3,32,100"
+inference:tools/infer/predict_rec.py
 --use_gpu:True|False
 --enable_mkldnn:True|False
 --cpu_threads:1|6
 --rec_batch_num:1|6
 --use_tensorrt:True|False
---precision:fp32|fp16|int8
+--precision:fp32|int8
 --rec_model_dir:
 --image_dir:./inference/rec_inference
 --save_log_path:./test/output/

test_tipc/configs/rec_mv3_none_bilstm_ctc_v2.0/train_infer_python.txt

@@ -43,7 +43,7 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --cpu_threads:1|6
 --rec_batch_num:1|6
 --use_tensorrt:True|False
---precision:fp32|fp16|int8
+--precision:fp32|int8
 --rec_model_dir:
 --image_dir:./inference/rec_inference
 --save_log_path:./test/output/

test_tipc/configs/rec_mv3_none_none_ctc_v2.0/train_infer_python.txt

@@ -43,7 +43,7 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --cpu_threads:1|6
 --rec_batch_num:1|6
 --use_tensorrt:True|False
---precision:fp32|fp16|int8
+--precision:fp32|int8
 --rec_model_dir:
 --image_dir:./inference/rec_inference
 --save_log_path:./test/output/

test_tipc/configs/rec_mv3_tps_bilstm_ctc_v2.0/train_infer_python.txt

@@ -43,7 +43,7 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --cpu_threads:1|6
 --rec_batch_num:1|6
 --use_tensorrt:True|False
---precision:fp32|fp16|int8
+--precision:fp32|int8
 --rec_model_dir:
 --image_dir:./inference/rec_inference
 --save_log_path:./test/output/

test_tipc/configs/rec_r34_vd_none_bilstm_ctc_v2.0/train_infer_python.txt

@@ -43,7 +43,7 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --cpu_threads:1|6
 --rec_batch_num:1|6
 --use_tensorrt:True|False
---precision:fp32|fp16|int8
+--precision:fp32|int8
 --rec_model_dir:
 --image_dir:./inference/rec_inference
 --save_log_path:./test/output/

test_tipc/configs/rec_r34_vd_none_none_ctc_v2.0/train_infer_python.txt

@@ -43,7 +43,7 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --cpu_threads:1|6
 --rec_batch_num:1|6
 --use_tensorrt:True|False
---precision:fp32|fp16|int8
+--precision:fp32|int8
 --rec_model_dir:
 --image_dir:./inference/rec_inference
 --save_log_path:./test/output/

test_tipc/configs/rec_r34_vd_tps_bilstm_ctc_v2.0/train_infer_python.txt

@@ -43,7 +43,7 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --cpu_threads:1|6
 --rec_batch_num:1|6
 --use_tensorrt:True|False
---precision:fp32|fp16|int8
+--precision:fp32|int8
 --rec_model_dir:
 --image_dir:./inference/rec_inference
 --save_log_path:./test/output/

test_tipc/prepare.sh

@@ -141,11 +141,6 @@ elif [ ${MODE} = "whole_infer" ];then
         wget -nc -P ./inference/ https://paddleocr.bj.bcebos.com/PP-OCRv2/chinese/ch_PP-OCRv2_det_infer.tar --no-check-certificate
         cd ./inference && tar xf ${eval_model_name}.tar && tar xf ch_det_data_50.tar && cd ../
     fi
-    if [ ${model_name} = "ch_PPOCRv2_det" ]; then
-        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/dygraph_v2.0/pgnet/e2e_server_pgnetA_infer.tar --no-check-certificate
-         cd ./inference && tar xf e2e_server_pgnetA_infer.tar && tar xf ch_det_data_50.tar && cd ../ 
-    fi
     if [ ${model_name} == "en_server_pgnetA" ]; then
         wget -nc -P ./inference/  https://paddleocr.bj.bcebos.com/dygraph_v2.0/pgnet/en_server_pgnetA.tar  --no-check-certificate
         cd ./inference && tar xf en_server_pgnetA.tar && cd ../