diff --git a/tests/release_task/compare_with_gt.py b/tests/release_task/compare_with_gt.py index ba030999c..57258f59b 100644 --- a/tests/release_task/compare_with_gt.py +++ b/tests/release_task/compare_with_gt.py @@ -3,31 +3,31 @@ import re 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 @@ -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) diff --git a/tests/release_task/cpp_run.sh b/tests/release_task/cpp_run.sh index 9a160b6e2..954a2a38e 100644 --- a/tests/release_task/cpp_run.sh +++ b/tests/release_task/cpp_run.sh @@ -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 diff --git a/tests/release_task/py_run.sh b/tests/release_task/py_run.sh index 6001bfbbb..64e876747 100644 --- a/tests/release_task/py_run.sh +++ b/tests/release_task/py_run.sh @@ -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 @@ -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