Skip to content

[Bug Fix] Fix bugs in publish task scripts #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jiangjiajun merged 13 commits into from
Nov 24, 2022
Merged

[Bug Fix] Fix bugs in publish task scripts #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6ce23e2
Fix release_task cpp_run.sh
felixhjh Nov 10, 2022
85db044
Add option for infer_ppyoloe.cc
felixhjh Nov 10, 2022
bd5e567
Fix bug in release task scripts
felixhjh Nov 10, 2022
0d1e8a9
Merge branch 'develop' into publish_task
felixhjh Nov 10, 2022
e53420d
Merge branch 'PaddlePaddle:develop' into publish_task
felixhjh Nov 14, 2022
804ca38
Add error check function
Nov 14, 2022
87634eb
Format code
felixhjh Nov 14, 2022
ddb0590
Merge branch 'develop' into publish_task
felixhjh Nov 14, 2022
dc480ea
Add new download dir for release version
felixhjh Nov 17, 2022
12b1165
Merge branch 'PaddlePaddle:develop' into publish_task
felixhjh Nov 17, 2022
380dfb3
Merge branch 'publish_task' of https://github.com/felixhjh/FastDeploy…
felixhjh Nov 17, 2022
5c1e1f0
Fix precision diff for osx-arm64
felixhjh Nov 23, 2022
d883ae4
Merge branch 'develop' into publish_task
felixhjh Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions tests/release_task/compare_with_gt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@

diff_score_threshold = {
"linux-x64": {
"label_diff": 1e-02,
"label_diff": 0,
"score_diff": 1e-4,
"boxes_diff_ratio": 1e-4,
"boxes_diff": 1e-3
},
"linux-aarch64": {
"label_diff": 1e-02,
"label_diff": 0,
"score_diff": 1e-4,
"boxes_diff_ratio": 1e-4,
"boxes_diff": 1e-3
},
"osx-x86_64": {
"label_diff": 1e-02,
"label_diff": 0,
"score_diff": 1e-4,
"boxes_diff_ratio": 2e-4,
"boxes_diff": 1e-3
},
"osx-arm64": {
"label_diff": 1e-02,
"score_diff": 1e-4,
"boxes_diff_ratio": 2e-4,
"label_diff": 0,
"score_diff": 1e-3,
"boxes_diff_ratio": 5e-4,
"boxes_diff": 1e-3
},
"win-x64": {
"label_diff": 1e-02,
"label_diff": 0,
"score_diff": 5e-4,
"boxes_diff_ratio": 1e-3,
"boxes_diff": 1e-3
Expand Down Expand Up @@ -133,7 +133,7 @@ def check_result(gt_result, infer_result, args):
is_diff = True
boxes_diff_bool_file = args.platform + "_" + backend + "_" + "boxes_diff_bool.txt"
boxes_diff_ratio_file = args.platform + "_" + backend + "_" + "boxes_diff_ratio.txt"
boxes_diff_ratio_bool_file = args.platform + "_" + backend + "_" + "boxes_diff_ratio_bool"
boxes_diff_ratio_bool_file = args.platform + "_" + backend + "_" + "boxes_diff_ratio_bool.txt"
save_numpy_result(boxes_diff_bool_file,
boxes_diff > boxes_diff_threshold)
save_numpy_result(boxes_diff_ratio_file, boxes_diff_ratio)
Expand Down
2 changes: 1 addition & 1 deletion tests/release_task/cpp_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LINUX_X64_GPU_CASE=('ort' 'paddle' 'trt')
LINUX_X64_CPU_CASE=('ort' 'paddle' 'openvino')
#LINUX_AARCH_CPU_CASE=('ort' 'openvino')
LINUX_AARCH_CPU_CASE=('ort')
MACOS_INTEL_CPU_CASE=('ort' 'paddle' 'openvino')
MACOS_INTEL_CPU_CASE=('ort' 'openvino')
MACOS_ARM64_CPU_CASE=('default')
wget -q https://bj.bcebos.com/paddlehub/fastdeploy/ppyoloe_crn_l_300e_coco.tgz
wget -q https://gitee.com/paddlepaddle/PaddleDetection/raw/release/2.4/demo/000000014439.jpg
Expand Down
11 changes: 8 additions & 3 deletions tests/release_task/py_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LINUX_X64_GPU_CASE=('ort' 'paddle' 'trt')
LINUX_X64_CPU_CASE=('ort' 'paddle' 'openvino')
#LINUX_AARCH_CPU_CASE=('ort' 'openvino')
LINUX_AARCH_CPU_CASE=('ort')
MACOS_INTEL_CPU_CASE=('ort' 'paddle' 'openvino')
MACOS_INTEL_CPU_CASE=('ort' 'openvino')
MACOS_ARM64_CPU_CASE=('default')
wget -q https://bj.bcebos.com/paddlehub/fastdeploy/ppyoloe_crn_l_300e_coco.tgz
wget -q https://gitee.com/paddlepaddle/PaddleDetection/raw/release/2.4/demo/000000014439.jpg
Expand Down Expand Up @@ -54,8 +54,13 @@ do
echo "Python Backend:" $backend
if [ "$backend" != "trt" ];then
python infer_ppyoloe.py --model_dir $MODEL_PATH --image $IMAGE_PATH --device cpu --backend $backend >> py_$backend\_cpu_result.txt
python $COMPARE_SHELL --gt_path $GROUND_TRUTH_PATH --result_path py_$backend\_cpu_result.txt --platform $PLATFORM --device cpu
check_ret
if [ "$PLATFORM" = "osx-arm64"]
python $COMPARE_SHELL --gt_path $GROUND_TRUTH_PATH --result_path py_$backend\_cpu_result.txt --platform $PLATFORM --device cpu --conf_threshold 0.5
check_ret
else
python $COMPARE_SHELL --gt_path $GROUND_TRUTH_PATH --result_path py_$backend\_cpu_result.txt --platform $PLATFORM --device cpu
check_ret
fi
fi
if [ "$DEVICE" = "gpu" ];then

Expand Down