From 631aa8cf4614a02aa5d303373447a4206477b4e7 Mon Sep 17 00:00:00 2001 From: meng_chunyang Date: Fri, 21 Aug 2020 20:37:01 +0800 Subject: [PATCH] add tflite and caffe models --- mindspore/lite/test/models_caffe.cfg | 4 ++-- mindspore/lite/test/models_tflite.cfg | 3 +++ .../tools/converter/parser/tflite/tflite_activation_parser.cc | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mindspore/lite/test/models_caffe.cfg b/mindspore/lite/test/models_caffe.cfg index b8bcaf47f5..6c7dc87284 100644 --- a/mindspore/lite/test/models_caffe.cfg +++ b/mindspore/lite/test/models_caffe.cfg @@ -17,10 +17,10 @@ mtk_isface mtk_landmark mtk_pose_tuku mtk_face_recognition_v1 -#mtk_2012_ATLANTA_10class_20190614_v4.1 +mtk_2012_ATLANTA_10class_20190614_v41 mtk_detect-deeper-halfdeeper-mbv1-lastearlySSD-shortcut-400-400_nopostprocess_simplified detect-deeper-halfdeeper-mbv1-shortcut-400-400_nopostprocess_simplified -#hiai_face_detect_rfb +hiai_face_detect_rfb hiai_face_isface hiai_face_landmark hiai_face_pose_tuku diff --git a/mindspore/lite/test/models_tflite.cfg b/mindspore/lite/test/models_tflite.cfg index db31adadda..bfa423bfae 100644 --- a/mindspore/lite/test/models_tflite.cfg +++ b/mindspore/lite/test/models_tflite.cfg @@ -64,6 +64,9 @@ mtk_model_normalize_object_scene_ps_20200519_f16.tflite mtk_age_gender_fp16.tflite mtk_model_face_dress_fp16.tflite mtk_AADB_HADB_MBV2_model_f16.tflite +mtk_AADB_HADB_MBV3_model_f16.tflite +mtk_model_emotions_0725_fp16.tflite +magenta_arbitrary-image-stylization-v1-256_fp16_prediction_1.tflite ml_object_detect.tflite hiai_cpu_face_emotion.tflite hiai_cpu_face_gazing.tflite diff --git a/mindspore/lite/tools/converter/parser/tflite/tflite_activation_parser.cc b/mindspore/lite/tools/converter/parser/tflite/tflite_activation_parser.cc index 15ec51b292..2e58536bcd 100644 --- a/mindspore/lite/tools/converter/parser/tflite/tflite_activation_parser.cc +++ b/mindspore/lite/tools/converter/parser/tflite/tflite_activation_parser.cc @@ -63,7 +63,7 @@ STATUS TfliteActivationParser::Parse(const std::unique_ptr &t attr->type = schema::ActivationType_SIGMOID; } else if (std::strcmp(node_name, "HardSwish") == 0) { MS_LOG(DEBUG) << "parse TfliteHardSwishParser"; - attr->type = schema::ActivationType_SIGMOID; + attr->type = schema::ActivationType_HSWISH; } else if (std::strcmp(node_name, "LeakyRelu") == 0) { const auto &tflite_attr = tflite_op->builtin_options.AsLeakyReluOptions(); if (tflite_attr == nullptr) {