modify fc caffe parser and deconv onnx parser

pull/4711/head
lyvette 5 years ago
parent ff2851a25c
commit 1a2642adec

@ -24,13 +24,7 @@ STATUS CaffeFlattenParser::Parse(const caffe::LayerParameter &proto, const caffe
// MS_LOG(ERROR) << "null pointer dereferencing.";
return RET_NULL_PTR;
}
std::unique_ptr<schema::FullConnectionT> attr(new schema::FullConnectionT());
const caffe::FlattenParameter flattenParam = proto.flatten_param();
attr->axis = (int32_t)flattenParam.axis();
attr->useAxis = true;
attr->hasBias = false;
attr->activationType = schema::ActivationType_NO_ACTIVATION;
std::unique_ptr<schema::FlattenT> attr = std::make_unique<schema::FlattenT>();
op->primitive = std::make_unique<schema::PrimitiveT>();
op->primitive->value.type = schema::PrimitiveType_Flatten;

@ -40,6 +40,7 @@ STATUS CaffeInnerProductParser::Parse(const caffe::LayerParameter &proto, const
if (innerProductParam.bias_term()) {
attr->hasBias = true;
}
attr->activationType = schema::ActivationType_NO_ACTIVATION;
// parse weight
if (weight.blobs_size() == 0) {

@ -49,7 +49,7 @@ bool OnnxDeConvParser::ParseGroupDeConvolution(schema::CNodeT *op, schema::DeCon
deDepthwiseConv2DParam->activationType = attr->activationType;
if (op != nullptr) {
op->primitive = std::make_unique<schema::PrimitiveT>();
op->primitive->value.type = schema::PrimitiveType_DepthwiseConv2D;
op->primitive->value.type = schema::PrimitiveType_DeDepthwiseConv2D;
delete (op->primitive->value.value);
op->primitive->value.value = deDepthwiseConv2DParam;
}

Loading…
Cancel
Save