Skip to content

Merge 3.4#18556

Merged
alalek merged 13 commits intoopencv:masterfrom
alalek:merge-3.4
Oct 9, 2020
Merged

Merge 3.4#18556
alalek merged 13 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Oct 9, 2020 •
edited
Loading

#18527 from alalek:dnn_test_openvino
#18534 from alalek:build_opencv_winpack_dldt_2021.1.0
#18536 from alalek:backport_doxygen_style_18195
#18545 from alalek:enable_tests_17953
#18551 from alalek:issue_17964
#18554 from alalek:issue_17945

Previous "Merge 3.4": #18531

buildworker:Win64 OpenCL=windows-2
#buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
#build_image:Custom=javascript
buildworker:Custom=linux-4
build_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
#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
build_image:Custom Mac=openvino-2020.4.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.3.0
build_image:Custom Win=openvino-2020.4.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules=dnn,python2,python3,java
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

alalek added 13 commits October 7, 2020 16:16
@alalek
build: winpack_dldt with dldt 2021.1.0
1546b9b
@alalek
doxygen: backport style changes
d9ea9be
@alalek
Merge pull request opencv#18536 from alalek:backport_doxygen_style_18195
e24b162
@alalek
dnn(test): update tests for OpenVINO 2021.1
6da05f7
@alalek
Merge pull request opencv#18527 from alalek:dnn_test_openvino
ee76cef
@alalek
Merge pull request opencv#18534 from alalek:build_opencv_winpack_dldt…
8ee5f2a 
…_2021.1.0
@alalek
dnn(test): enable tests from issue 17953
e87a0ba
@alalek
Merge pull request opencv#18545 from alalek:enable_tests_17953
6c218c7
@alalek
dnn(opencl): bypass unsupported fusion cases
718dd9f
@alalek
Merge pull request opencv#18551 from alalek:issue_17964
083727b
@alalek
dnn(opencl): bypass unsupported fusion cases 2
cdcf7e6
@alalek
Merge pull request opencv#18554 from alalek:issue_17945
8a1caa0
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
1b44321
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Oct 9, 2020

👍

@alalek alalek merged commit 1b44321 into opencv:master Oct 9, 2020
@alalek alalek mentioned this pull request Oct 11, 2020
Merged
@YashasSamaga YashasSamaga mentioned this pull request Nov 21, 2020
Merged
6 tasks
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.

1 participant

@alalek