提交 07e687df 编写于 作者: L LDOUBLEV

fix confilct

上级 76c23cf0
===========================ch_ppocr_mobile_v2.0=========================== ===========================ch_ppocr_mobile_v2.0===========================
model_name:ch_PP-OCRv2 model_name:ch_PP-OCRv2
python:python3.7 python:python3.7
null:null
null:null
infer_model:./inference/ch_PP-OCRv2_det_infer/ infer_model:./inference/ch_PP-OCRv2_det_infer/
infer_export:null infer_export:null
infer_quant:True infer_quant:False
inference:tools/infer/predict_system.py inference:tools/infer/predict_system.py
--use_gpu:False|True --use_gpu:False|True
--enable_mkldnn:False|True --enable_mkldnn:False|True
......
===========================ch_ppocr_mobile_v2.0=========================== ===========================ch_ppocr_mobile_v2.0===========================
model_name:ch_ppocr_mobile_v2.0 model_name:ch_ppocr_mobile_v2.0
python:python3.7 python:python3.7
null:null
null:null
infer_model:./inference/ch_ppocr_mobile_v2.0_det_infer/ infer_model:./inference/ch_ppocr_mobile_v2.0_det_infer/
infer_export:null infer_export:null
infer_quant:True infer_quant:False
inference:tools/infer/predict_system.py inference:tools/infer/predict_system.py
--use_gpu:False|True --use_gpu:False|True
--enable_mkldnn:False|True --enable_mkldnn:False|True
......
...@@ -89,7 +89,7 @@ infer_key1=$(func_parser_key "${lines[50]}") ...@@ -89,7 +89,7 @@ infer_key1=$(func_parser_key "${lines[50]}")
infer_value1=$(func_parser_value "${lines[50]}") infer_value1=$(func_parser_value "${lines[50]}")
# parser klquant_infer # parser klquant_infer
if [ ${MODE} = "klquant_whole_infer" ]; then if [ ${MODE} = "klquant_whole_infer" ] || [ ${MODE} = "system_infer" ] ; then
dataline=$(awk 'NR==1, NR==17{print}' $FILENAME) dataline=$(awk 'NR==1, NR==17{print}' $FILENAME)
lines=(${dataline}) lines=(${dataline})
model_name=$(func_parser_value "${lines[1]}") model_name=$(func_parser_value "${lines[1]}")
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册