Browse Source

[MSLITE][Develop] fix bug of arm cpu deconv depthwise

tags/v1.1.0
yangruoqi713 5 years ago
parent
commit
6cc2b813d4
4 changed files with 7 additions and 7 deletions
  1. +2
    -2
      mindspore/lite/nnacl/fp16/conv_depthwise_fp16.c
  2. +2
    -2
      mindspore/lite/nnacl/fp32/conv_depthwise.c
  3. +2
    -2
      mindspore/lite/nnacl/int8/conv_depthwise_int8.c
  4. +1
    -1
      mindspore/lite/tools/optimizer/graph/weight_format_hardcode_pass.cc

+ 2
- 2
mindspore/lite/nnacl/fp16/conv_depthwise_fp16.c View File

@@ -394,8 +394,8 @@ void DeconvDwC8Fp16(float16_t *output_data, const float16_t *input_data, const f
}
DeconvDepthwisePostFuncFp16(dst_data, bias, sliding->block_channel_, conv_param);
} // output C8 loop
src += sliding->in_step_;
dst += sliding->out_step_;
src += sliding->out_step_;
dst += sliding->in_step_;
} // batch loop
// output nchwc8
}


+ 2
- 2
mindspore/lite/nnacl/fp32/conv_depthwise.c View File

@@ -455,8 +455,8 @@ void DeconvDwC4Fp32(float *output_data, const float *input_data, const float *we
}
DeconvDepthwisePostFunc(dst_data, bias, sliding->block_channel_, conv_param);
} // output C4 loop
src += sliding->in_step_;
dst += sliding->out_step_;
src += sliding->out_step_;
dst += sliding->in_step_;
} // batch loop
// output nhwc4
}


+ 2
- 2
mindspore/lite/nnacl/int8/conv_depthwise_int8.c View File

@@ -818,8 +818,8 @@ void DeconvDwInt8(int8_t *output_data, int32_t *output_buffer, const int16_t *in
conv_param->conv_quant_arg_.output_quant_args_[0].zp_,
conv_param->conv_quant_arg_.out_act_min_[0], conv_param->conv_quant_arg_.out_act_max_[0]);
} // output C4 loop
src += sliding->in_step_;
dst += sliding->out_step_;
src += sliding->out_step_;
dst += sliding->in_step_;
} // batch loop
// output nhwc4
}


+ 1
- 1
mindspore/lite/tools/optimizer/graph/weight_format_hardcode_pass.cc View File

@@ -78,7 +78,7 @@ lite::STATUS WeightFormatHardCodePass::HardCodeONNX(const AnfNodePtr &conv_node,
// deconv (C x K/group x kH x kW) group = 1
// dedepth (C x K/group x kH x kW) group = channelIn ==> (C, multiplier, H, W)
if (op_type == schema::PrimitiveType_Conv2D || op_type == schema::PrimitiveType_DepthwiseConv2D ||
op_type == schema::PrimitiveType_DeConv2D) {
op_type == schema::PrimitiveType_DeConv2D || op_type == schema::PrimitiveType_DeDepthwiseConv2D) {
param_value->set_format(schema::Format::Format_KCHW);
} else {
MS_LOG(ERROR) << "Unsupported opType: " << EnumNamePrimitiveType(op_type)


Loading…
Cancel
Save