p83571920
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!9900 [lite] fix mindir avgpool bug 

From: @xu_anyue
Reviewed-by: 
Signed-off-by:
This commit is contained in:
mindspore-ci-bot 2020-12-21 16:29:09 +08:00 committed by Gitee
parent 5671b177f4 38e9a57aeb
commit a61aff2fa4
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mindspore/lite/nnacl/fp32/pooling_fp32.c
View File

@ -31,7 +31,6 @@ int AvgPooling(const float *input_ptr, float *output_ptr, const PoolingParameter
int output_h = pooling_param->output_h_;
int out_plane = output_w * output_h;
int out_tile_count = UP_DIV(out_plane, TILE_NUM);
int window = win_w * win_h;
#if defined(ENABLE_NEON) || defined(ENABLE_SSE)
MS_FLOAT32X4 min_value = MS_MOVQ_F32(minf);
@ -85,9 +84,6 @@ int AvgPooling(const float *input_ptr, float *output_ptr, const PoolingParameter
++real_count;
} // win_w loop
} // win_h loop
if (pooling_param->avg_mode_ == 1) {
real_count = window;
}
if (real_count == 0) {
return NNACL_ERR;
}
@ -128,9 +124,6 @@ int AvgPooling(const float *input_ptr, float *output_ptr, const PoolingParameter
++real_count;
} // win_w loop
} // win_h loop
if (pooling_param->avg_mode_ == 1) {
real_count = window;
}
if (real_count == 0) {
return NNACL_ERR;
}

2
mindspore/lite/src/ops/pooling.cc
View File

@ -99,8 +99,6 @@ int Pooling::UnPackAttr(const Primitive &prim, const std::vector<AnfNodePtr> &in
attr->format = schema::Format::Format_NUM_OF_FORMAT;
}
attr->avgMode = 1;
auto pad_mode = GetValue<std::string>(prim.GetAttr("padding"));
if (pad_mode == "VALID") {
attr->padMode = schema::PadMode_VALID;

7
mindspore/lite/test/models_mindspore.cfg
View File

@ -2,7 +2,7 @@ ssd.mindir 1.5
mobilenetv2_438.mindir 1.5
gate_u_net_small-1_110.mindir 1.5
shufflenetv2.mindir 1.5
inceptionv3.mindir 1.5
#inceptionv3.mindir 1.5
googlenet.mindir 1.5
retinaface_732_1280_iod.mindir 1.5
mobilefacenet_iod.mindir 1.5
@ -16,3 +16,8 @@ mindspore_ghost-pets-8244.mindir 1.5
mindspore_ghostnet600M-pets.mindir 1.5
mindspore_ghostnet_1x_pets_int8.mindir 12
mindspore_deeplab_v3_s16.mindir 6.5
googlenet_1202.mindir 0.5
inceptionv3_1203.mindir 0.5
mobilenetv2_gpu.mindir 0.5
resnet50_1202.mindir 0.5
ssd_1130.mindir 0.5