Skip to content

Merge 3.4#17418

Merged
alalek merged 22 commits intoopencv:masterfrom
alalek:merge-3.4
May 29, 2020
Merged

Merge 3.4#17418
alalek merged 22 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented May 28, 2020

#17320 from jgbradley1:add-eigen-tensor-conversions
#17332 from l-bat:fix_nms
#17352 from egorpugin:patch-2
#17360 from mwtarnowski:fix-documentation-imgproc-blur
#17376 from alalek:dnn_fix_build
#17384 from dkurt:efficientdet
#17386 from l-bat:tf_clamp_subgraph
#17388 from alalek:dnn_update_network_dump
#17390 from l-bat:fix_ngraph_multiply
#17392 from alalek:dnn_test_yolov4
#17394 from huningxin:fix_segmentation_py
#17406 from mshabunin:fix-msmf-audio-handling
#17410 from asmorkalov:as/formulae_command_typo
#17416 from vpisarev:fix_fillpoly

Previous "Merge 3.4": #17351

buildworker:Win64 OpenCL=windows-2
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
build_image:Custom=javascript
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.1.0:16.04
#build_image:Custom=ubuntu-openvino-2020.2.0:16.04
#buildworker:Custom=linux-2
#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.2.0
build_image:Custom Mac=openvino-2020.2.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.1.0
build_image:Custom Win=openvino-2020.2.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

Josh Bradley and others added 22 commits May 23, 2020 18:25
…ersions

* add eigen tensor conversion functions

* add eigen tensor conversion tests

* add support for column major order

* update eigen tensor tests

* fix coding style and add conditional compilation

* fix conditional compilation checks

* remove whitespace

* rearrange functions for easier reading

* reformat function documentation and add tensormap unit test

* cleanup documentation of unit test

* remove condition duplication

* check Eigen major version, not minor version

* restrict to Eigen v3.3.0+

* add documentation note and add type checking to cv2eigen_tensormap()
…gproc-blur

* fix documentation for cv::blur

* correct the position of ksize parameter
Fixed NMSBoxes bug

* Added NMS for each class

* Updated cpp sample

* Fixed errors

* Refactoring

* Added NMS for IE
* Fix integer overflow in parseOption().

Previous code does not work for values like 100000MB.

* Fix warning during 32-bit build on inactive code path.

* fix build without C++11
* Added ClipByValue subgraph

* Return const nodes
* Fix window title of python segmentation example

* Fix float text position of python segmentation examples
@alalek
Copy link
Copy Markdown
Member Author

alalek commented May 29, 2020

👍

@alalek alalek merged commit c3e8a82 into opencv:master May 29, 2020
@alalek alalek mentioned this pull request Jun 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants