Skip to content

Merge 3.4#17769

Merged
alalek merged 28 commits intoopencv:masterfrom
alalek:merge-3.4
Jul 7, 2020
Merged

Merge 3.4#17769
alalek merged 28 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jul 6, 2020

#17699 from alalek:build_core_cuda
#17708 from shirriff:patch-1
#17719 from pemmanuelviel:pev--fix-computeNodeStatistics-genericity
#17721 from pemmanuelviel:pev--fix-hist-intersect-arguments
#17722 from pemmanuelviel:pev--replace-asserts
#17723 from pemmanuelviel:pev--remove-duplicate
#17724 from pemmanuelviel:pev--fix-mix-of-types
#17725 from pemmanuelviel:pev--precompute-divisor
#17728 from sturkmen72:patch-4
#17729 from modeste2015:3.4
#17733 from l-bat:tiny_yolov4
#17743 from alalek:test_17666
#17744 from alalek:issue_17657
#17761 from mshabunin:test-wo-jpg-png
#17766 from alalek:backport_17756

Previous "Merge 3.4": #17697

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

pemmanuelviel and others added 28 commits July 1, 2020 12:14
… computation.

Argument "a" is of type ElementType* that is either int* or float*, while b was double*.
Mixing types prevents the possibility to use SSE or AVX instructions.
On implementation without SIMD instructions, this doesn't show any impact on performance.
Clarify component statistics documentation

* Change ConnectedComponentsTypes documentation

Change from "algorithm output formats" to "statistics" because it specifies types of statistics, not formats.

* Documentation: clarify component statistics

Explain that ConnectedComponentTypes selects a statistic.
* Supported yolov4-tiny

* Added comments
* Clean: replace C style asserts by CV_Assert and CV_DbgAssert

* Try fixing warning on Windows compilation

* Another way trying to fix warnings on Win

* Fixing warnings with some compilers:
Some compilers warn on systematic exit preventing to execute the code that follows.
This is why assert(0) that exits only in debug was working, but not CV_Assert or CV_Error
that exit both in release and debug, even if with different behavior.
In addition, other compilers complain when return 0 is removed from getKey(),
even if before we have a statement leading to systematic exit.

* Disable "unreachable code" warnings for Win compilers so we can use proper CV_Error
* Added dependency on IE version

backport of commit: 992c908
* core(cuda): fix build

- MSVS 19.25.28612.0
- CUDA release 11.0, V11.0.167

* cmake(cuda): backport workaround for CUDA 11

* cmake(cuda): call CUDA_BUILD_CLEAN_TARGET() on finalize

* cmake(cuda): use CMAKE_SUPPRESS_REGENERATION with MSVS
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jul 7, 2020

👍

@alalek alalek merged commit 524a2ff into opencv:master Jul 7, 2020
@alalek alalek mentioned this pull request Jul 8, 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.

7 participants