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

Merge pull request #20335 from SamFC10:concat-const-input

Browse Source
This commit is contained in:
Alexander Alekhin 2021-07-01 10:25:35 +00:00
commit b699fe7a9d
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1792,6 +1792,23 @@ void ONNXImporter::handleNode(const opencv_onnx::NodeProto& node_proto_)
addConstant(layerParams.name, concatenated[0]); addConstant(layerParams.name, concatenated[0]);
return; return;
} }
else
{
for (int i = 0; i < node_proto.input_size(); ++i)
{
if (constBlobs.find(node_proto.input(i)) != constBlobs.end())
{
LayerParams constParams;
constParams.name = node_proto.input(i);
constParams.type = "Const";
constParams.blobs.push_back(getBlob(node_proto, i));
opencv_onnx::NodeProto proto;
proto.add_output(constParams.name);
addLayer(constParams, proto);
}
}
}
} }
else if (layer_type == "Resize") else if (layer_type == "Resize")
{ {

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

@ -327,6 +327,7 @@ TEST_P(Test_ONNX_layers, Concatenation)
if (target == DNN_TARGET_MYRIAD) applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_MYRIAD, CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER); if (target == DNN_TARGET_MYRIAD) applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_MYRIAD, CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER);
} }
testONNXModels("concatenation"); testONNXModels("concatenation");
testONNXModels("concat_const_blobs");
} }
TEST_P(Test_ONNX_layers, Eltwise3D) TEST_P(Test_ONNX_layers, Eltwise3D)