Skip to content

(4.x) Merge 3.4#21572

Merged
alalek merged 14 commits intoopencv:4.xfrom
alalek:merge-3.4
Feb 6, 2022
Merged

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

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Feb 6, 2022 •
edited
Loading

#21551 from alalek:cmake_dnn_backport_3.4
#21562 from alalek:cmake_carotene_use_cv_disable_optimization
#21564 from alalek:dnn_fix_openvino_outputs
#21569 from alalek:fixup_18031

Previous "Merge 3.4": #21535

buildworker:Docs=linux-4,linux-6
build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-4,linux-6


force_builders=Custom,Custom Win,Custom Mac

Xbuild_image:Custom=ubuntu-openvino-2021.4.2:20.04
Xbuild_image:Custom=ubuntu-openvino-2022.1.0.dev20220131:20.04
build_image:Custom Win=openvino-2021.4.2
build_image:Custom Mac=openvino-2021.4.2

Xtest_modules:Custom=dnn,gapi,python2,python3,java
test_modules:Custom Win=dnn,gapi,python2,python3,java
test_modules:Custom Mac=dnn,gapi,python2,python3,java

Xbuildworker:Custom=linux-1
# disabled due high memory usage: test_opencl:Custom=ON
Xtest_opencl:Custom=ON
Xtest_bigdata:Custom=1
Xtest_filter:Custom=*

buildworker:Custom Win=windows-3
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_opencl:Custom Win=ON
build_contrib:Custom Win=OFF

ilya-lavrenov and others added 14 commits February 2, 2022 08:57
@ilya-lavrenov @alalek
3.4: Support of OpenVINO interface libraries
5b3d5f9 
original commit: c703f1e
@mshabunin @alalek
3.4: Use modern OpenVINO package interface
d1e76a3 
original commit: 437af37
@alalek
Merge pull request opencv#21551 from alalek:cmake_dnn_backport_3.4
5190043
@alalek
cmake(carotene): disable with CV_DISABLE_OPTIMIZATION
4d7953a
@alalek
Merge pull request opencv#21562 from alalek:cmake_carotene_use_cv_dis…
09af10f 
…able_optimization
@alalek
dnn(ngraph): fixup get_output_as_single_output_node() replacement patch
aa5bc20
@alalek
dnn(test): re-enable ONNX split tests for OpenVINO
1f70d4e
@alalek
dnn: don't fuse 'outputs' with OpenVINO backend
062f305
@alalek
dnn(ngraph): add debuging messages
67978b5
@alalek
dnn(ngraph): fix outputs handling, drop 'unconnected' logic
b57ff73
@alalek
dnn(ngraph): fix output names
1da48be
@alalek
Merge pull request opencv#21569 from alalek:fixup_18031
b41d2c5
@alalek
Merge pull request opencv#21564 from alalek:dnn_fix_openvino_outputs
a00a0db
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
57d3002
@alalek alalek mentioned this pull request Feb 6, 2022
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Feb 6, 2022

👍

@alalek alalek merged commit 57d3002 into opencv:4.x Feb 6, 2022
@alalek alalek mentioned this pull request Feb 10, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alalek alalek

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@alalek @ilya-lavrenov @mshabunin