Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
wangsen
paddle_dbnet
Commits
ea83a067
Commit
ea83a067
authored
Nov 30, 2021
by
LDOUBLEV
Browse files
fix bug
parent
b555f7d2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
42 deletions
+31
-42
test_tipc/configs/ch_PP-OCRv2/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
...el_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
+1
-1
test_tipc/configs/ch_ppocr_mobile_v2.0/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
...el_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
+2
-2
test_tipc/configs/ch_ppocr_server_v2.0/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
...el_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
+1
-1
test_tipc/test_inference_python.sh
test_tipc/test_inference_python.sh
+27
-38
No files found.
test_tipc/configs/ch_PP-OCRv2/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
View file @
ea83a067
===========================ch_
ppocr_mobile_v2.0
===========================
===========================ch_
PP-OCRv2
===========================
model_name:ch_PP-OCRv2
model_name:ch_PP-OCRv2
python:python3.7
python:python3.7
null:null
null:null
...
...
test_tipc/configs/ch_ppocr_mobile_v2.0/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
View file @
ea83a067
...
@@ -15,7 +15,7 @@ inference:tools/infer/predict_system.py
...
@@ -15,7 +15,7 @@ inference:tools/infer/predict_system.py
--precision:fp32|fp16
--precision:fp32|fp16
--det_model_dir:
--det_model_dir:
--image_dir:./inference/ch_det_data_50/all-sum-510/
--image_dir:./inference/ch_det_data_50/all-sum-510/
null:null
--benchmark:True
--rec_model_dir:./inference/ch_ppocr_mobile_v2.0_rec_infer/
--rec_model_dir:./inference/ch_ppocr_mobile_v2.0_rec_infer/
--benchmark:True
null:null
null:null
null:null
test_tipc/configs/ch_ppocr_server_v2.0/model_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt
View file @
ea83a067
===========================ch_ppocr_
mobile
_v2.0===========================
===========================ch_ppocr_
server
_v2.0===========================
model_name:ch_ppocr_server_v2.0
model_name:ch_ppocr_server_v2.0
python:python3.7
python:python3.7
null:null
null:null
...
...
test_tipc/test_inference_python.sh
View file @
ea83a067
...
@@ -6,7 +6,7 @@ FILENAME=$1
...
@@ -6,7 +6,7 @@ FILENAME=$1
# MODE be one of ['whole_infer']
# MODE be one of ['whole_infer']
MODE
=
$2
MODE
=
$2
dataline
=
$(
awk
'NR==1, NR==
17
{print}'
$FILENAME
)
dataline
=
$(
awk
'NR==1, NR==
20
{print}'
$FILENAME
)
# parser params
# parser params
IFS
=
$'
\n
'
IFS
=
$'
\n
'
...
@@ -15,44 +15,40 @@ lines=(${dataline})
...
@@ -15,44 +15,40 @@ lines=(${dataline})
model_name
=
$(
func_parser_value
"
${
lines
[1]
}
"
)
model_name
=
$(
func_parser_value
"
${
lines
[1]
}
"
)
python
=
$(
func_parser_value
"
${
lines
[2]
}
"
)
python
=
$(
func_parser_value
"
${
lines
[2]
}
"
)
infer_model_dir_list
=
$(
func_parser_value
"
${
lines
[5]
}
"
)
infer_model_dir_list
=
$(
func_parser_value
"
${
lines
[3]
}
"
)
infer_export_list
=
$(
func_parser_value
"
${
lines
[6]
}
"
)
infer_export_list
=
$(
func_parser_value
"
${
lines
[4]
}
"
)
infer_is_quant
=
$(
func_parser_value
"
${
lines
[7]
}
"
)
infer_is_quant
=
$(
func_parser_value
"
${
lines
[5]
}
"
)
# parser inference
# parser inference
inference_py
=
$(
func_parser_value
"
${
lines
[6]
}
"
)
inference_py
=
$(
func_parser_value
"
${
lines
[8]
}
"
)
use_gpu_key
=
$(
func_parser_key
"
${
lines
[7]
}
"
)
use_gpu_key
=
$(
func_parser_key
"
${
lines
[9]
}
"
)
use_gpu_list
=
$(
func_parser_value
"
${
lines
[7]
}
"
)
use_gpu_list
=
$(
func_parser_value
"
${
lines
[9]
}
"
)
use_mkldnn_key
=
$(
func_parser_key
"
${
lines
[8]
}
"
)
use_mkldnn_key
=
$(
func_parser_key
"
${
lines
[10]
}
"
)
use_mkldnn_list
=
$(
func_parser_value
"
${
lines
[8]
}
"
)
use_mkldnn_list
=
$(
func_parser_value
"
${
lines
[10]
}
"
)
cpu_threads_key
=
$(
func_parser_key
"
${
lines
[9]
}
"
)
cpu_threads_key
=
$(
func_parser_key
"
${
lines
[11]
}
"
)
cpu_threads_list
=
$(
func_parser_value
"
${
lines
[9]
}
"
)
cpu_threads_list
=
$(
func_parser_value
"
${
lines
[11]
}
"
)
batch_size_key
=
$(
func_parser_key
"
${
lines
[10]
}
"
)
batch_size_key
=
$(
func_parser_key
"
${
lines
[12]
}
"
)
batch_size_list
=
$(
func_parser_value
"
${
lines
[10]
}
"
)
batch_size_list
=
$(
func_parser_value
"
${
lines
[12]
}
"
)
use_trt_key
=
$(
func_parser_key
"
${
lines
[11]
}
"
)
use_trt_key
=
$(
func_parser_key
"
${
lines
[13]
}
"
)
use_trt_list
=
$(
func_parser_value
"
${
lines
[11]
}
"
)
use_trt_list
=
$(
func_parser_value
"
${
lines
[13]
}
"
)
precision_key
=
$(
func_parser_key
"
${
lines
[12]
}
"
)
precision_key
=
$(
func_parser_key
"
${
lines
[14]
}
"
)
precision_list
=
$(
func_parser_value
"
${
lines
[12]
}
"
)
precision_list
=
$(
func_parser_value
"
${
lines
[14]
}
"
)
infer_model_key
=
$(
func_parser_key
"
${
lines
[13]
}
"
)
infer_model_key
=
$(
func_parser_key
"
${
lines
[15]
}
"
)
image_dir_key
=
$(
func_parser_key
"
${
lines
[14]
}
"
)
image_dir_key
=
$(
func_parser_key
"
${
lines
[16]
}
"
)
infer_img_dir
=
$(
func_parser_value
"
${
lines
[14]
}
"
)
infer_img_dir
=
$(
func_parser_value
"
${
lines
[16]
}
"
)
rec_model_key
=
$(
func_parser_key
"
${
lines
[15]
}
"
)
rec_model_key
=
$(
func_parser_key
"
${
lines
[17]
}
"
)
rec_model_value
=
$(
func_parser_value
"
${
lines
[15]
}
"
)
rec_model_value
=
$(
func_parser_value
"
${
lines
[17]
}
"
)
benchmark_key
=
$(
func_parser_key
"
${
lines
[16]
}
"
)
benchmark_key
=
$(
func_parser_key
"
${
lines
[18]
}
"
)
benchmark_value
=
$(
func_parser_value
"
${
lines
[16]
}
"
)
benchmark_value
=
$(
func_parser_value
"
${
lines
[18]
}
"
)
infer_key1
=
$(
func_parser_key
"
${
lines
[17]
}
"
)
infer_key1
=
$(
func_parser_key
"
${
lines
[19]
}
"
)
infer_value1
=
$(
func_parser_value
"
${
lines
[17]
}
"
)
infer_value1
=
$(
func_parser_value
"
${
lines
[19]
}
"
)
echo
"DEBUG"
echo
"
${
lines
[16]
}
"
echo
"line17"
${
lines
[17]
}
LOG_PATH
=
"./test_tipc/output"
LOG_PATH
=
"./test_tipc/output"
mkdir
-p
${
LOG_PATH
}
mkdir
-p
${
LOG_PATH
}
status_log
=
"
${
LOG_PATH
}
/results_python.log"
status_log
=
"
${
LOG_PATH
}
/results_python.log"
function
func_inference
(){
function
func_inference
(){
IFS
=
'|'
IFS
=
'|'
_python
=
$1
_python
=
$1
...
@@ -61,7 +57,6 @@ function func_inference(){
...
@@ -61,7 +57,6 @@ function func_inference(){
_log_path
=
$4
_log_path
=
$4
_img_dir
=
$5
_img_dir
=
$5
_flag_quant
=
$6
_flag_quant
=
$6
echo
"FUCNTION "
# inference
# inference
for
use_gpu
in
${
use_gpu_list
[*]
}
;
do
for
use_gpu
in
${
use_gpu_list
[*]
}
;
do
if
[
${
use_gpu
}
=
"False"
]
||
[
${
use_gpu
}
=
"cpu"
]
;
then
if
[
${
use_gpu
}
=
"False"
]
||
[
${
use_gpu
}
=
"cpu"
]
;
then
...
@@ -89,7 +84,6 @@ function func_inference(){
...
@@ -89,7 +84,6 @@ function func_inference(){
set_infer_params0
=
$(
func_set_params
"
${
rec_model_key
}
"
"
${
rec_model_value
}
"
)
set_infer_params0
=
$(
func_set_params
"
${
rec_model_key
}
"
"
${
rec_model_value
}
"
)
set_infer_params1
=
$(
func_set_params
"
${
infer_key1
}
"
"
${
infer_value1
}
"
)
set_infer_params1
=
$(
func_set_params
"
${
infer_key1
}
"
"
${
infer_value1
}
"
)
command
=
"
${
_python
}
${
_script
}
${
use_gpu_key
}
=
${
use_gpu
}
${
use_mkldnn_key
}
=
${
use_mkldnn
}
${
set_cpu_threads
}
${
set_model_dir
}
${
set_batchsize
}
${
set_infer_params0
}
${
set_infer_data
}
${
set_benchmark
}
${
set_precision
}
${
set_infer_params1
}
>
${
_save_log_path
}
2>&1 "
command
=
"
${
_python
}
${
_script
}
${
use_gpu_key
}
=
${
use_gpu
}
${
use_mkldnn_key
}
=
${
use_mkldnn
}
${
set_cpu_threads
}
${
set_model_dir
}
${
set_batchsize
}
${
set_infer_params0
}
${
set_infer_data
}
${
set_benchmark
}
${
set_precision
}
${
set_infer_params1
}
>
${
_save_log_path
}
2>&1 "
echo
"before cpu command"
echo
$command
echo
$command
eval
$command
eval
$command
last_status
=
${
PIPESTATUS
[0]
}
last_status
=
${
PIPESTATUS
[0]
}
...
@@ -122,7 +116,6 @@ function func_inference(){
...
@@ -122,7 +116,6 @@ function func_inference(){
set_infer_params0
=
$(
func_set_params
"
${
save_log_key
}
"
"
${
save_log_value
}
"
)
set_infer_params0
=
$(
func_set_params
"
${
save_log_key
}
"
"
${
save_log_value
}
"
)
set_infer_params1
=
$(
func_set_params
"
${
infer_key1
}
"
"
${
infer_value1
}
"
)
set_infer_params1
=
$(
func_set_params
"
${
infer_key1
}
"
"
${
infer_value1
}
"
)
command
=
"
${
_python
}
${
_script
}
${
use_gpu_key
}
=
${
use_gpu
}
${
set_tensorrt
}
${
set_precision
}
${
set_model_dir
}
${
set_batchsize
}
${
set_infer_data
}
${
set_benchmark
}
${
set_infer_params1
}
${
set_infer_params0
}
>
${
_save_log_path
}
2>&1 "
command
=
"
${
_python
}
${
_script
}
${
use_gpu_key
}
=
${
use_gpu
}
${
set_tensorrt
}
${
set_precision
}
${
set_model_dir
}
${
set_batchsize
}
${
set_infer_data
}
${
set_benchmark
}
${
set_infer_params1
}
${
set_infer_params0
}
>
${
_save_log_path
}
2>&1 "
echo
"before gpu command"
eval
$command
eval
$command
last_status
=
${
PIPESTATUS
[0]
}
last_status
=
${
PIPESTATUS
[0]
}
eval
"cat
${
_save_log_path
}
"
eval
"cat
${
_save_log_path
}
"
...
@@ -150,9 +143,7 @@ if [ ${MODE} = "whole_infer" ]; then
...
@@ -150,9 +143,7 @@ if [ ${MODE} = "whole_infer" ]; then
IFS
=
"|"
IFS
=
"|"
infer_run_exports
=(
${
infer_export_list
}
)
infer_run_exports
=(
${
infer_export_list
}
)
infer_quant_flag
=(
${
infer_is_quant
}
)
infer_quant_flag
=(
${
infer_is_quant
}
)
echo
"DEBUG2"
for
infer_model
in
${
infer_model_dir_list
[*]
}
;
do
for
infer_model
in
${
infer_model_dir_list
[*]
}
;
do
echo
"DEBUG#"
# run export
# run export
if
[
${
infer_run_exports
[Count]
}
!=
"null"
]
;
then
if
[
${
infer_run_exports
[Count]
}
!=
"null"
]
;
then
save_infer_dir
=
$(
dirname
$infer_model
)
save_infer_dir
=
$(
dirname
$infer_model
)
...
@@ -160,14 +151,12 @@ if [ ${MODE} = "whole_infer" ]; then
...
@@ -160,14 +151,12 @@ if [ ${MODE} = "whole_infer" ]; then
set_save_infer_key
=
$(
func_set_params
"
${
save_infer_key
}
"
"
${
save_infer_dir
}
"
)
set_save_infer_key
=
$(
func_set_params
"
${
save_infer_key
}
"
"
${
save_infer_dir
}
"
)
export_cmd
=
"
${
python
}
${
infer_run_exports
[Count]
}
${
set_export_weight
}
${
set_save_infer_key
}
"
export_cmd
=
"
${
python
}
${
infer_run_exports
[Count]
}
${
set_export_weight
}
${
set_save_infer_key
}
"
echo
${
infer_run_exports
[Count]
}
echo
${
infer_run_exports
[Count]
}
echo
$export_cmd
eval
$export_cmd
eval
$export_cmd
status_export
=
$?
status_export
=
$?
status_check
$status_export
"
${
export_cmd
}
"
"
${
status_log
}
"
status_check
$status_export
"
${
export_cmd
}
"
"
${
status_log
}
"
else
else
save_infer_dir
=
${
infer_model
}
save_infer_dir
=
${
infer_model
}
fi
fi
echo
"FUCK@"
#run inference
#run inference
is_quant
=
${
infer_quant_flag
[Count]
}
is_quant
=
${
infer_quant_flag
[Count]
}
if
[
${
MODE
}
=
"klquant_infer"
]
;
then
if
[
${
MODE
}
=
"klquant_infer"
]
;
then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment