From d0213d2da20fcbee5034cf9522ebad884dd37ccf Mon Sep 17 00:00:00 2001 From: hangq Date: Tue, 13 Oct 2020 20:05:04 +0800 Subject: [PATCH] add parameter for nchw2nhwc and nhwc2nchw --- mindspore/lite/src/populate_parameter.cc | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/mindspore/lite/src/populate_parameter.cc b/mindspore/lite/src/populate_parameter.cc index 4a966dfe84..59983c1974 100644 --- a/mindspore/lite/src/populate_parameter.cc +++ b/mindspore/lite/src/populate_parameter.cc @@ -863,25 +863,35 @@ OpParameter *PopulateTopKParameter(const mindspore::lite::PrimitiveC *primitive) } OpParameter *PopulateNhwc2NchwParameter(const mindspore::lite::PrimitiveC *primitive) { - OpParameter *parameter = reinterpret_cast(malloc(sizeof(OpParameter))); + TransposeParameter *parameter = reinterpret_cast(malloc(sizeof(TransposeParameter))); if (parameter == nullptr) { MS_LOG(ERROR) << "malloc OpParameter failed."; return nullptr; } memset(parameter, 0, sizeof(OpParameter)); - parameter->type_ = primitive->Type(); - return parameter; + parameter->op_parameter_.type_ = primitive->Type(); + parameter->num_axes_ = 4; + parameter->perm_[0] = 0; + parameter->perm_[1] = 3; + parameter->perm_[2] = 1; + parameter->perm_[3] = 2; + return reinterpret_cast(parameter); } OpParameter *PopulateNchw2NhwcParameter(const mindspore::lite::PrimitiveC *primitive) { - OpParameter *parameter = reinterpret_cast(malloc(sizeof(OpParameter))); + TransposeParameter *parameter = reinterpret_cast(malloc(sizeof(TransposeParameter))); if (parameter == nullptr) { MS_LOG(ERROR) << "malloc OpParameter failed."; return nullptr; } memset(parameter, 0, sizeof(OpParameter)); - parameter->type_ = primitive->Type(); - return parameter; + parameter->op_parameter_.type_ = primitive->Type(); + parameter->num_axes_ = 4; + parameter->perm_[0] = 0; + parameter->perm_[1] = 2; + parameter->perm_[2] = 3; + parameter->perm_[3] = 1; + return reinterpret_cast(parameter); } OpParameter *PopulateTransposeParameter(const mindspore::lite::PrimitiveC *primitive) {