From fa3a07cd8b692918b2263e153394ec992fcf07aa Mon Sep 17 00:00:00 2001 From: zengxianglong Date: Sat, 21 Aug 2021 16:51:21 +0800 Subject: [PATCH] fix entrance guard problem --- .../src/runtime/kernel/arm/base/group_convolution_base.cc | 4 ++++ mindspore/lite/test/config/models_tflite.cfg | 2 +- mindspore/lite/test/config/models_tflite_fp16.cfg | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mindspore/lite/src/runtime/kernel/arm/base/group_convolution_base.cc b/mindspore/lite/src/runtime/kernel/arm/base/group_convolution_base.cc index 153f50e5ab9..075f29f6e27 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/group_convolution_base.cc +++ b/mindspore/lite/src/runtime/kernel/arm/base/group_convolution_base.cc @@ -74,6 +74,10 @@ void GroupConvolutionBaseCPUKernel::FreeSubKernel() { sub_conv = nullptr; } group_convs_.clear(); + if (group_conv_creator_ != nullptr) { + delete group_conv_creator_; + group_conv_creator_ = nullptr; + } } int GroupConvolutionBaseCPUKernel::PreProcess() { diff --git a/mindspore/lite/test/config/models_tflite.cfg b/mindspore/lite/test/config/models_tflite.cfg index 62ad6ca76e3..fef9fb298c7 100644 --- a/mindspore/lite/test/config/models_tflite.cfg +++ b/mindspore/lite/test/config/models_tflite.cfg @@ -4,7 +4,7 @@ hiai_bigmodel_ghost_2_1_no_normalized_no_trans_tflite.tflite hiai_bigmodel_ghost_5_1_no_normalized_no_trans_tflite.tflite hiai_cn_recognize_modify_padv2.tflite hiai_model_normalize_object_scene_ps_20200519.tflite -#mtk_AADB_HADB_MBV2_model_fp32.tflite The model has three outputs, but the benchmark file has one output only. +mtk_AADB_HADB_MBV2_model_fp32.tflite mtk_AADB_HADB_MBV3_model_fp32.tflite mobilenet_v1_0.25_128.tflite mobilenet_v1_0.25_160.tflite diff --git a/mindspore/lite/test/config/models_tflite_fp16.cfg b/mindspore/lite/test/config/models_tflite_fp16.cfg index 29c5517ed78..66fba94be91 100644 --- a/mindspore/lite/test/config/models_tflite_fp16.cfg +++ b/mindspore/lite/test/config/models_tflite_fp16.cfg @@ -10,7 +10,7 @@ hiai_model_normalize_object_scene_ps_20200519.tflite 20 #hiai_detectmodel_06_23_960_480_1180700.tflite 20 #hiai_detect_curve_model_float32.tflite 20 #hiai_detectmodel_desnet_256_128_64_32.tflite 20 -mtk_AADB_HADB_MBV2_model_fp32.tflite 5 +mtk_AADB_HADB_MBV2_model_fp32.tflite 2 mtk_AADB_HADB_MBV3_model_fp32.tflite 6 mobilenet_v1_0.25_128.tflite 5 mobilenet_v1_0.25_160.tflite 5