Skip to content

Merge 3.4#19396

Merged
alalek merged 14 commits intoopencv:masterfrom
alalek:merge-3.4
Jan 26, 2021
Merged

Merge 3.4#19396
alalek merged 14 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jan 25, 2021 •
edited
Loading

#19344 from VadimLevin:dev/vlevin/generic-sequence-conversion
#19372 from l-bat:lb/onnx_pads_calc
#19373 from l-bat:lb/tf_matmul_shared
#19382 from crackwitz:highgui-w32-remove-gutter
#19383 from tomoaki0705:fixWrongIndex (moved to contrib)
#19385 from alalek:ocl_isOpenCLActivated_update
#19390 from tomoaki0705:fixCudaLegacyCalib3d (moved to contrib)

Previous "Merge 3.4": #19378

Details 
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
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
#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
build_image:Custom Mac=openvino-2021.2.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
build_image:Custom Win=openvino-2021.2.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules=dnn,python2,python3,java
test_opencl:Custom Win=OFF
build_contrib:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

l-bat and others added 14 commits January 22, 2021 16:47
@l-bat
Added shared weights for MatMul
38a49f9
@crackwitz
highgui: remove gutter in window_w32
0c0cf8b
@alalek
core(ocl): update isOpenCLActivated()
37e6560 
- reuse g_isOpenCLAvailable variable instead
@tomoaki0705
fix wrong index
3cfe7b9
@alalek
Merge pull request opencv#19382 from crackwitz:highgui-w32-remove-gutter
331f1b9
@alalek
Merge pull request opencv#19383 from tomoaki0705:fixWrongIndex
fb0abde
@VadimLevin
feat: common fixed size sequence conversion for Python bindings
1d3207d
@tomoaki0705
fix peaky test failure
96e0902 
  * follow the review comment
@alalek
Merge pull request opencv#19344 from VadimLevin:dev/vlevin/generic-se…
62b60b1 
…quence-conversion
@alalek
Merge pull request opencv#19390 from tomoaki0705:fixCudaLegacyCalib3d
b1ffe7a
@alalek
Merge pull request opencv#19385 from alalek:ocl_isOpenCLActivated_update
857f339
@l-bat
Merge pull request opencv#19372 from l-bat:lb/onnx_pads_calc
c12930c 
* Fixed bug with constant Div

* Supported constant mul and div for inputs with different shapes
@alalek
Merge pull request opencv#19373 from l-bat:lb/tf_matmul_shared
573812d
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
e85b41f
This was referenced Jan 25, 2021
Merged
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jan 26, 2021

👍

@alalek alalek merged commit e85b41f into opencv:master Jan 26, 2021
@alalek alalek mentioned this pull request Jan 31, 2021
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.

5 participants

@alalek @l-bat @crackwitz @tomoaki0705 @VadimLevin