Skip to content

(4.x) Merge 3.4#20423

Merged
alalek merged 14 commits intoopencv:masterfrom
alalek:merge-3.4
Jul 16, 2021
Merged

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

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jul 16, 2021 •
edited
Loading

#20200 from rmeertens:update_grabcut
#20394 from SamFC10:conv-asymmetric-pads
#20397 from alalek:fix_winpack_dldt_stale_sysroot
#20399 from pablorcum:3.4
#20410 from alalek:fix_dnn_dldt_output_layout
#20420 from berak:python_fix_trackbar_warning

Previous "Merge 3.4": #20387

Details 
Xci_branch=merge-3.4
buildworker:Win64 OpenCL=windows-2
#buildworker:Custom=linux-1,linux-2,linux-4,linux-6
buildworker:Docs=linux-4,linux-6
build_image:Docs=docs-js:18.04
Xbuild_image:Custom=javascript
Xbuildworker:Custom=linux-4,linux-6
Xbuild_image:Custom=javascript-simd
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.4.0:16.04
#build_image:Custom=ubuntu-openvino-2021.1.0:20.04
#build_image:Custom=ubuntu-openvino-2021.2.0:20.04
#build_image:Custom=ubuntu-openvino-2021.3.0:20.04
build_image:Custom=ubuntu-openvino-2021.4.0:20.04
#buildworker:Custom=linux-1
#build_image:Custom=ubuntu-vulkan:16.04
#buildworker:Custom=linux-4
#build_image:Custom=fedora:28
#build_image:Custom=ubuntu-cuda:16.04
#build_image:Custom=ubuntu-clang:18.04
#build_image:Custom=ubuntu:20.04
#buildworker:Custom=linux-1
#build_image:Custom=javascript-simd
#build_image:Custom=mips64el
#build_image:Custom Mac=openvino-2019r3.0
#build_image:Custom Mac=openvino-2020.3.0
Xbuild_image:Custom Mac=openvino-2020.4.0
Xbuild_image:Custom Mac=openvino-2021.1.0
Xbuild_image:Custom Mac=openvino-2021.2.0
Xbuild_image:Custom Mac=openvino-2021.3.0
build_image:Custom Mac=openvino-2021.4.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.3.0
Xbuild_image:Custom Win=openvino-2020.4.0
Xbuild_image:Custom Win=openvino-2021.1.0
Xbuild_image:Custom Win=openvino-2021.2.0
Xbuild_image:Custom Win=openvino-2021.3.0
Xbuild_image:Custom Win=openvino-2021.4.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*OpenVINO*:*onv*
test_modules=dnn,gapi,python2,python3,java
test_opencl:Custom Win=ON
build_contrib:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,gapi,java,python3

build_image:Custom Win=winpack-dldt

buildworker:Custom=linux-1
# disabled due high memory usage: test_opencl:Custom=ON
test_opencl:Custom=ON
test_bigdata:Custom=1
test_filter:Custom=*OpenVINO*:*onv*

alalek and others added 14 commits July 12, 2021 19:33
@alalek
build(winpack_dldt): avoid stale sysroot contents
fd22e98
@alalek
Merge pull request opencv#20397 from alalek:fix_winpack_dldt_stale_sy…
0acd06d 
…sroot
@pablorcum
Merge pull request opencv#20399 from pablorcum:3.4
6f417b5 
Improves support for Unix non-Linux systems, including QNX

* Fixes opencv#20395. Improves support for Unix non-Linux systems. Focus on QNX Neutrino.

Signed-off-by: promero <promero@mathworks.com>

* Update system.cpp
@rmeertens
Updated grabcut example to show the background in a transparant way
2113af9
@alalek
dnn(test): backport test_ie_models.cpp from 4.5.3
bc210b2
@berak
python: fix trackbar warning
9f2dcc3
@alalek
Merge pull request opencv#20420 from berak:python_fix_trackbar_warning
eb9218a
@alalek
dnn(test): add extra IR models, more checks in IE testing code
602e7c8
@alalek
dnn(ie): fix handling of 1D and non-32F outputs of InferenceEngine
fbde0c6
@alalek
Merge pull request opencv#20410 from alalek:fix_dnn_dldt_output_layout
98c5fc6
@jebastin-nadar
Fix convolution asymmetric padding bug in onnx importer
96d35f7
@alalek
Merge pull request opencv#20200 from rmeertens:update_grabcut
cc2592f
@alalek
Merge pull request opencv#20394 from SamFC10:conv-asymmetric-pads
8334ee1
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
39b91c9
alalek
alalek commented Jul 16, 2021
View reviewed changes
CMakeLists.txt
Comment on lines 661 to +662
elseif(QNXNTO)
# no need to link to system libs with QNX
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m)
Copy link
Copy Markdown
Member Author

@alalek alalek Jul 16, 2021

Choose a reason for hiding this comment

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

@pablorcum @blackliner Could you please check merged QNX-related changes? (PR #20399)

Copy link
Copy Markdown

@blackliner blackliner Jul 16, 2021

Choose a reason for hiding this comment

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

LGTM: https://www.qnx.com/developers/docs/6.4.1/neutrino/lib_ref/c/cos.html

Copy link
Copy Markdown
Contributor

@pablorcum pablorcum Jul 16, 2021

Choose a reason for hiding this comment

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

I've built it successfully for QNX after this change.

@alalek alalek mentioned this pull request Jul 16, 2021
Merged
@alalek alalek mentioned this pull request Jul 16, 2021
Closed
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jul 16, 2021

👍

@alalek alalek merged commit 39b91c9 into opencv:master Jul 16, 2021
@alalek alalek mentioned this pull request Jul 24, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@blackliner blackliner blackliner approved these changes

@pablorcum pablorcum pablorcum approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@alalek alalek

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@alalek @blackliner @pablorcum @rmeertens @berak @jebastin-nadar