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

Merge pull request #23707 from Orange-OpenSource:ONNX_Squeeze_negative_index_for_the_axes_attribute

Browse Source 
Addition of normalize_axis to ONNXImporter::parseSqueeze
This commit is contained in:
Alexander Smorkalov 2023-05-30 16:33:25 +03:00 committed by GitHub
commit c55aee1e79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2147,6 +2147,7 @@ void ONNXImporter::parseSqueeze(LayerParams& layerParams, const opencv_onnx::Nod
for (int i = 0; i < axes_dict.size(); ++i) for (int i = 0; i < axes_dict.size(); ++i)
{ {
int axis = axes_dict.getIntValue(i); int axis = axes_dict.getIntValue(i);
axis = normalize_axis(axis, inpShape.size());
CV_CheckLE(axis, static_cast<int>(inpShape.size()), "Squeeze axis"); CV_CheckLE(axis, static_cast<int>(inpShape.size()), "Squeeze axis");
maskedAxes[axis] = inpShape[axis] == 1; maskedAxes[axis] = inpShape[axis] == 1;
} }
@ -2162,6 +2163,7 @@ void ONNXImporter::parseSqueeze(LayerParams& layerParams, const opencv_onnx::Nod
for (int i = 0; i < axesLen; i++) for (int i = 0; i < axesLen; i++)
{ {
int axis = axesMat.at<int>(i); int axis = axesMat.at<int>(i);
axis = normalize_axis(axis, inpShape.size());
CV_CheckLE(axis, static_cast<int>(inpShape.size()), "Squeeze axis"); CV_CheckLE(axis, static_cast<int>(inpShape.size()), "Squeeze axis");
maskedAxes[axis] = inpShape[axis] == 1; maskedAxes[axis] = inpShape[axis] == 1;
} }