From 26fa88ffe7992460358f264e91279417c7123ae6 Mon Sep 17 00:00:00 2001 From: wangyanling Date: Mon, 26 Jul 2021 09:23:23 +0800 Subject: [PATCH] Add previously removed NPU model --- mindspore/lite/test/config/models_arm32.cfg | 4 ++-- mindspore/lite/test/config/models_arm32_fp16.cfg | 2 +- mindspore/lite/test/config/models_caffe.cfg | 3 +-- mindspore/lite/test/config/models_caffe_fp16.cfg | 4 +--- mindspore/lite/test/config/models_npu.cfg | 4 ++-- mindspore/lite/test/config/models_npu_fp16.cfg | 4 ++-- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/mindspore/lite/test/config/models_arm32.cfg b/mindspore/lite/test/config/models_arm32.cfg index 18e7d519b99..b773a72bed3 100644 --- a/mindspore/lite/test/config/models_arm32.cfg +++ b/mindspore/lite/test/config/models_arm32.cfg @@ -1,10 +1,10 @@ # caffe -age_medium +hdc_age_medium beard emotion glasses hat -isface +hdc_isface pose_3d tracking ml_face_contour diff --git a/mindspore/lite/test/config/models_arm32_fp16.cfg b/mindspore/lite/test/config/models_arm32_fp16.cfg index 751f77477eb..53c77ae4daa 100644 --- a/mindspore/lite/test/config/models_arm32_fp16.cfg +++ b/mindspore/lite/test/config/models_arm32_fp16.cfg @@ -1,4 +1,4 @@ -age_medium 4.5 +hdc_age_medium 5 ml_bodymask 18 ml_Hand_deploy 4 # ml_hand_3d_detection: The difference of output node divided by a very small value leads to a large error diff --git a/mindspore/lite/test/config/models_caffe.cfg b/mindspore/lite/test/config/models_caffe.cfg index 6c173248e7d..59b053c41e6 100644 --- a/mindspore/lite/test/config/models_caffe.cfg +++ b/mindspore/lite/test/config/models_caffe.cfg @@ -1,10 +1,9 @@ -age_medium +# age_medium beard emotion gender_res_large_deploy glasses hat -isface ml_bank_detect_0312_tmp ml_face_div_parsing ml_hardware_eyeclose diff --git a/mindspore/lite/test/config/models_caffe_fp16.cfg b/mindspore/lite/test/config/models_caffe_fp16.cfg index 3c7bd66649c..5a3173476d8 100644 --- a/mindspore/lite/test/config/models_caffe_fp16.cfg +++ b/mindspore/lite/test/config/models_caffe_fp16.cfg @@ -1,13 +1,12 @@ # [first column]:model_name;input_num;input_shape;threads;extra_info. If there is no need to set these parameters, the # content after ";" can be omitted. # [second column]:accuracy limit for float16 in arm64 device -age_medium 6 +hdc_age_medium 5.5 beard 2 emotion 60 gender_res_large_deploy 0.1 glasses 4 hat 2.5 -isface 1 ml_bank_detect_0312_tmp 20 ml_face_div_parsing 8 ml_hardware_eyeclose 0.1 @@ -74,7 +73,6 @@ ml_text_division 12 # Further analysis in the future to model ml_video_edit_Mnet ml_video_edit_Mnet 11 ml_video_edit_hairSeg_have_imageProcessLayer_interpTo145 0.5 -hdc_age_medium 6 hdc_contour_pose_128 0.5 hdc_emotion 0.5 hdc_fivembnet 1 diff --git a/mindspore/lite/test/config/models_npu.cfg b/mindspore/lite/test/config/models_npu.cfg index a42b907fc7e..b99cce5b9e6 100644 --- a/mindspore/lite/test/config/models_npu.cfg +++ b/mindspore/lite/test/config/models_npu.cfg @@ -63,8 +63,8 @@ ml_video_edit_have_imageProcessLayer_interpTo145_20201015 0.5 ml_video_edit_MnetN367_extract_1010_pay 0.5 ml_video_edit_reid 0.5 ml_video_edit_v10_best_model_nomean_20200723 8 -#hdc_ocr_attention.onnx 0.5 #too many subgraphs -#hdc_ocr_detect.onnx 30 #too many subgraphs +hdc_ocr_attention.onnx 0.5 #too many subgraphs +# hdc_ocr_detect.onnx 30 #too many subgraphs ml_edu_kit_hand_detection.onnx 1 ml_edu_kit_hand_key_position.onnx 2 ml_video_edit_oneclick_adaptis.pb;3 2.4 diff --git a/mindspore/lite/test/config/models_npu_fp16.cfg b/mindspore/lite/test/config/models_npu_fp16.cfg index 65465d69cf8..0a8a2a0fcdf 100644 --- a/mindspore/lite/test/config/models_npu_fp16.cfg +++ b/mindspore/lite/test/config/models_npu_fp16.cfg @@ -48,8 +48,8 @@ ml_video_edit_have_imageProcessLayer_interpTo145_20201015 0.5 ml_video_edit_MnetN367_extract_1010_pay 0.5 ml_video_edit_reid 0.5 ml_video_edit_v10_best_model_nomean_20200723 8 -#hdc_ocr_attention.onnx 0.5 #too many subgraphs -#hdc_ocr_detect.onnx 30 #too many subgraphs +# hdc_ocr_attention.onnx 0.5 #too many subgraphs +# hdc_ocr_detect.onnx 30 #too many subgraphs ml_edu_kit_hand_detection.onnx 1 ml_edu_kit_hand_key_position.onnx 2 ml_video_edit_oneclick_adaptis.pb;3 2.4