mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-22 12:17:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13989 from kohei-us:onnx-conv-transpose-output-shape

Browse Source
This commit is contained in:
Alexander Alekhin 2019-03-26 17:04:52 +00:00
commit f738e490a3
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -591,6 +591,37 @@ void ONNXImporter::populateNet(Net dstNet)
} }
layerParams.set("num_output", layerParams.blobs[0].size[1] * layerParams.get<int>("group", 1)); layerParams.set("num_output", layerParams.blobs[0].size[1] * layerParams.get<int>("group", 1));
layerParams.set("bias_term", node_proto.input_size() == 3); layerParams.set("bias_term", node_proto.input_size() == 3);
if (layerParams.has("output_shape"))
{
const DictValue& outShape = layerParams.get("output_shape");
if (outShape.size() != 4)
CV_Error(Error::StsNotImplemented, "Output shape must have 4 elements.");
const int strideY = layerParams.get<int>("stride_h", 1);
const int strideX = layerParams.get<int>("stride_w", 1);
const int outH = outShape.getIntValue(2);
const int outW = outShape.getIntValue(3);
if (layerParams.get<String>("pad_mode") == "SAME")
{
layerParams.set("adj_w", (outW - 1) % strideX);
layerParams.set("adj_h", (outH - 1) % strideY);
}
else if (layerParams.get<String>("pad_mode") == "VALID")
{
if (!layerParams.has("kernel_h") || !layerParams.has("kernel_w"))
CV_Error(Error::StsNotImplemented,
"Required attributes 'kernel_h' and 'kernel_w' are not present.");
int kernelH = layerParams.get<int>("kernel_h");
int kernelW = layerParams.get<int>("kernel_w");
layerParams.set("adj_w", (outW - kernelW) % strideX);
layerParams.set("adj_h", (outH - kernelH) % strideY);
}
}
} }
else if (layer_type == "Transpose") else if (layer_type == "Transpose")
{ {

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

@ -73,6 +73,7 @@ TEST_P(Test_ONNX_layers, Deconvolution)
testONNXModels("deconvolution"); testONNXModels("deconvolution");
testONNXModels("two_deconvolution"); testONNXModels("two_deconvolution");
testONNXModels("deconvolution_group"); testONNXModels("deconvolution_group");
testONNXModels("deconvolution_output_shape");
} }
TEST_P(Test_ONNX_layers, Dropout) TEST_P(Test_ONNX_layers, Dropout)