From 07e687df3e15bc8c993615437cf41db1ee958fed Mon Sep 17 00:00:00 2001
From: LDOUBLEV <liuvv0203@outlook.com>
Date: Fri, 26 Nov 2021 14:05:42 +0800
Subject: [PATCH] fix confilct

---
 ...del_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt | 4 +++-
 ...del_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt | 4 +++-
 test_tipc/test_train_inference_python.sh                      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/test_tipc/configs/ch_PP-OCRv2/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt b/test_tipc/configs/ch_PP-OCRv2/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
index cf4d3fde..243b2f15 100644
--- a/test_tipc/configs/ch_PP-OCRv2/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
+++ b/test_tipc/configs/ch_PP-OCRv2/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
@@ -1,9 +1,11 @@
 ===========================ch_ppocr_mobile_v2.0===========================
 model_name:ch_PP-OCRv2
 python:python3.7
+null:null
+null:null
 infer_model:./inference/ch_PP-OCRv2_det_infer/
 infer_export:null
-infer_quant:True
+infer_quant:False
 inference:tools/infer/predict_system.py
 --use_gpu:False|True
 --enable_mkldnn:False|True
diff --git a/test_tipc/configs/ch_ppocr_mobile_v2.0/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
index 6a023951..abe5e80e 100644
--- a/test_tipc/configs/ch_ppocr_mobile_v2.0/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
+++ b/test_tipc/configs/ch_ppocr_mobile_v2.0/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
@@ -1,9 +1,11 @@
 ===========================ch_ppocr_mobile_v2.0===========================
 model_name:ch_ppocr_mobile_v2.0
 python:python3.7
+null:null
+null:null
 infer_model:./inference/ch_ppocr_mobile_v2.0_det_infer/
 infer_export:null
-infer_quant:True
+infer_quant:False
 inference:tools/infer/predict_system.py
 --use_gpu:False|True
 --enable_mkldnn:False|True
diff --git a/test_tipc/test_train_inference_python.sh b/test_tipc/test_train_inference_python.sh
index 7d70de1e..e55068e6 100644
--- a/test_tipc/test_train_inference_python.sh
+++ b/test_tipc/test_train_inference_python.sh
@@ -89,7 +89,7 @@ infer_key1=$(func_parser_key "${lines[50]}")
 infer_value1=$(func_parser_value "${lines[50]}")
 
 # 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)
     lines=(${dataline})
     model_name=$(func_parser_value "${lines[1]}")
-- 
GitLab