Skip to content

Merge 3.4#18800

Merged
alalek merged 6 commits intoopencv:masterfrom
alalek:merge-3.4
Nov 14, 2020
Merged

Merge 3.4#18800
alalek merged 6 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Nov 13, 2020 •
edited
Loading

#18774 from alalek:bindings_namespace_inline
#18783 from sl-sergei:fix_conv1d
#18798 from alalek:java_robust_binding_code

Previous "Merge 3.4": #18769

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
Xbuild_image:Custom=javascript-simd:1.39.16
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
#build_image:Custom=ubuntu-openvino-2021.1.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
build_image:Custom Mac=openvino-2021.1.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.3.0
Xbuild_image:Custom Win=openvino-2020.4.0
build_image:Custom Win=openvino-2021.1.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 and others added 6 commits November 11, 2020 10:38
@alalek
bindings: "inline namespace"
5dae278
@alalek
Merge pull request opencv#18774 from alalek:bindings_namespace_inline
ed3591e
@alalek
java: robust code generation
41c2669 
- the same generated code from Python2/3
- avoid randomized output due to unpredictable dict/set order
@alalek
Merge pull request opencv#18798 from alalek:java_robust_binding_code
d23435b
@sl-sergei
Merge pull request opencv#18783 from sl-sergei:fix_conv1d
61144f9 
Add support for Conv1D on OpenCV backend

* Add support for Conv1D on OpenCV backend

* disable tests on other targets/backends

* Fix formatting

* Restore comment

* Remove unnecessary flag and fix test logic

* Fix perf test

* fix braces

* Fix indentation, assert check and remove unnecessary condition

* Remove unnecessary changes

* Add test cases for variable weights and bias

* dnn(conv): fallback on OpenCV+CPU instead of failures

* coding style
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
a7c150e
@alalek alalek mentioned this pull request Nov 13, 2020
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Nov 13, 2020

👍

@alalek alalek merged commit a7c150e into opencv:master Nov 14, 2020
@alalek alalek mentioned this pull request Nov 17, 2020
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.

2 participants

@alalek @sl-sergei