mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 14:29:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20713 from SamFC10:unsqueeze-opset13

Browse Source
This commit is contained in:
Alexander Alekhin 2021-09-21 15:27:48 +00:00
commit a4e2c56317
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1693,8 +1693,16 @@ void ONNXImporter::parseFlatten(LayerParams& layerParams, const opencv_onnx::Nod
void ONNXImporter::parseUnsqueeze(LayerParams& layerParams, const opencv_onnx::NodeProto& node_proto)
{
CV_Assert(node_proto.input_size() == 1);
DictValue axes = layerParams.get("axes");
CV_Assert(node_proto.input_size() == 1 || node_proto.input_size() == 2);
DictValue axes;
if (node_proto.input_size() == 2)
{
Mat blob = getBlob(node_proto, 1);
axes = DictValue::arrayInt(blob.ptr<int>(), blob.total());
}
else
axes = layerParams.get("axes");
if (constBlobs.find(node_proto.input(0)) != constBlobs.end())
{
// Constant input.

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

@ -605,6 +605,7 @@ TEST_P(Test_ONNX_layers, DynamicReshape)
TEST_P(Test_ONNX_layers, Reshape)
{
testONNXModels("unsqueeze");
testONNXModels("unsqueeze_opset_13");
}
TEST_P(Test_ONNX_layers, Squeeze)