Skip to content

(4.x) Merge 3.4#22022

Merged
alalek merged 11 commits intoopencv:4.xfrom
alalek:merge-3.4
May 23, 2022
Merged

(4.x) Merge 3.4#22022
alalek merged 11 commits intoopencv:4.xfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented May 23, 2022

#21818 from rogday:revert_renaming
#21986 from alalek:gha_fix_git_merge
#21988 from alalek:fix_warnings_gcc12_3.4
#21994 from asenyaev:asen/extra_dnn_testing
#21998 from alalek:gha_fix_git_merge_fixup_21986
#22001 from asenyaev:asen/move_workflows

Previous "Merge 3.4": #21981

build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-f1

alalek and others added 10 commits May 15, 2022 09:35
Extended DNN testing in GHA

* Extended DNN testing in GHA for 3.4 branch

* Updated docker images in Linux GitHub Actions

* Added OPENCV_DOWNLOAD_PATH flag for ARM build to use pre-downloaded binaries
* add prefixes to layer names and layer output names

* dnn: OPENCV_DNN_ONNX_USE_LEGACY_NAMES runtime parameter

Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
siamRPN.setInput(blob);
Mat out1;
siamRPN.forward(out1, "63");
siamRPN.forward(out1, "onnx_node_output_0!63");
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This extra change is necessary to handle changes from #21818

siamRPN.setParam(siamRPN.getLayerId("65"), 0, r1.reshape(0, r1_shape));
siamRPN.setParam(siamRPN.getLayerId("68"), 0, cls1.reshape(0, cls1_shape));
siamRPN.setParam(siamRPN.getLayerId("onnx_node_output_0!65"), 0, r1.reshape(0, r1_shape));
siamRPN.setParam(siamRPN.getLayerId("onnx_node_output_0!68"), 0, cls1.reshape(0, cls1_shape));
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This extra change is necessary to handle changes from #21818

{
testLayer("log_softmax", "ONNX", 0.014, 0.025);
}
TEST_P(Test_Int8_layers, DISABLED_Softmax_unfused_ONNX) // FIXIT Support 'Identity' layer for outputs (#22022)
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vpisarev There is something wrong in int8 code with handling of Identity layer (used for aliases of outputs under new names).

Here and below disabled tests.

@alalek
Copy link
Copy Markdown
Member Author

alalek commented May 23, 2022

👍

@alalek alalek merged commit d9bf522 into opencv:4.x May 23, 2022
@alalek alalek mentioned this pull request Jun 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants