mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add ONNX's padding import

Browse Source
This commit is contained in:
Dmitry Kurtaev 2018-10-31 18:24:05 +03:00
parent 850053f9ca
commit a6f9170f10
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/dnn/src/onnx/onnx_importer.cpp
View File

@ -96,6 +96,8 @@ Mat getMatFromTensor(opencv_onnx::TensorProto& tensor_proto)
for (int i = 0; i < tensor_proto.dims_size(); i++) { for (int i = 0; i < tensor_proto.dims_size(); i++) {
sizes.push_back(tensor_proto.dims(i)); sizes.push_back(tensor_proto.dims(i));
} }
if (sizes.empty())
sizes.assign(1, 1);
if (datatype == opencv_onnx::TensorProto_DataType_FLOAT) { if (datatype == opencv_onnx::TensorProto_DataType_FLOAT) {
if (!tensor_proto.float_data().empty()) { if (!tensor_proto.float_data().empty()) {
@ -173,11 +175,31 @@ LayerParams ONNXImporter::getLayerParams(const opencv_onnx::NodeProto& node_prot
} }
else if(attribute_name == "pads") else if(attribute_name == "pads")
{ {
CV_Assert(attribute_proto.ints_size() == 4); if (node_proto.op_type() == "Pad")
lp.set("pad_t", saturate_cast<int32_t>(attribute_proto.ints(0))); {
lp.set("pad_l", saturate_cast<int32_t>(attribute_proto.ints(1))); // Padding layer.
lp.set("pad_b", saturate_cast<int32_t>(attribute_proto.ints(2))); // Paddings are in order begin0, begin1, .. beginN, end0, end1, ..., endN.
lp.set("pad_r", saturate_cast<int32_t>(attribute_proto.ints(3))); // We need to shuffle it to begin0, end0, begin1, end1, ...
CV_Assert(attribute_proto.ints_size() % 2 == 0);
const int dims = attribute_proto.ints_size() / 2;
std::vector<int32_t> paddings;
paddings.reserve(attribute_proto.ints_size());
for (int i = 0; i < dims; ++i)
{
paddings.push_back(attribute_proto.ints(i));
paddings.push_back(attribute_proto.ints(dims + i));
}
lp.set("paddings", DictValue::arrayInt(&paddings[0], paddings.size()));
}
else
{
// Convolution or pooling.
CV_Assert(attribute_proto.ints_size() == 4);
lp.set("pad_t", saturate_cast<int32_t>(attribute_proto.ints(0)));
lp.set("pad_l", saturate_cast<int32_t>(attribute_proto.ints(1)));
lp.set("pad_b", saturate_cast<int32_t>(attribute_proto.ints(2)));
lp.set("pad_r", saturate_cast<int32_t>(attribute_proto.ints(3)));
}
} }
else if(attribute_name == "auto_pad") else if(attribute_name == "auto_pad")
{ {
@ -543,6 +565,10 @@ void ONNXImporter::populateNet(Net dstNet)
replaceLayerParam(layerParams, "shape", "dim"); replaceLayerParam(layerParams, "shape", "dim");
} }
} }
else if (layer_type == "Pad")
{
layerParams.type = "Padding";
}
else else
{ {
for (int j = 0; j < node_proto.input_size(); j++) { for (int j = 0; j < node_proto.input_size(); j++) {

5
modules/dnn/test/test_onnx_importer.cpp
View File

@ -129,6 +129,11 @@ TEST_P(Test_ONNX_layers, Constant)
testONNXModels("constant"); testONNXModels("constant");
} }
TEST_P(Test_ONNX_layers, Padding)
{
testONNXModels("padding");
}
TEST_P(Test_ONNX_layers, MultyInputs) TEST_P(Test_ONNX_layers, MultyInputs)
{ {
const String model = _tf("models/multy_inputs.onnx"); const String model = _tf("models/multy_inputs.onnx");