Skip to content

Merge 3.4#16674

Merged
alalek merged 29 commits intoopencv:masterfrom
alalek:merge-3.4
Feb 26, 2020
Merged

Merge 3.4#16674
alalek merged 29 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Feb 26, 2020

#13928 from catree:add_matx_div_operations
#16457 from ganesh-k13:bugfix/getCPUCount-fix
#16586 from themechanicalcoder:video-psnr
#16594 from vpisarev:hull_ordering_fix
#16608 from vpisarev:fix_mac_ocl_tests
#16616 from alalek:dnn_fix_input_shape
#16628 from dkurt:dnn_ngraph_custom_layers
#16629 from alalek:dnn_test_32bit
#16635 from mshabunin:fix-avx512-cvt
#16638 from mshabunin:use-safe-buffers
#16639 from iigalanin:patch-1
#16641 from alalek:fix_build_msvs2019
#16650 from ashishkrshrivastava:cvdarknet
#16656 from alalek:issue_16655
#16661 from alalek:dnn_test_32bit_part2
#16670 from alalek:update_valgrind_suppressions
#16675 from alalek:fix_js_build_getNumberOfCPUs

Previous "Merge 3.4": #16627

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
#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
#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.1.0
#build_image:Custom Win=openvino-2019r3.0
build_image:Custom Win=openvino-2020.1.0
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

catree and others added 26 commits February 27, 2019 19:36
* fixed several problems when running tests on Mac:
* OCL_pyrUp
* OCL_flip
* some basic UMat tests
* histogram badarg test (out of range access)

* retained the storepix fix in ocl_flip only for 16U/16S datatype, where the OpenCL compiler on Mac generates incorrect code

* moved deletion of ACCESS_FAST flag to non-SVM branch (where SVM is shared virtual memory (in OpenCL 2.x), not support vector machine)

* force OpenCL to use read/write for GPU<=>CPU memory transfers on machines with discrete video only on Macs. On Windows/Linux the drivers are seemingly smart enough to implement map/unmap properly (and maybe more efficiently than explicit read/write)
fixed the ordering of contour convex hull points

* partially fixed the issue opencv#4539

* fixed warnings and test failures

* fixed integer overflow (issue opencv#14521)

* added comment to force buildbot to re-run

* extended the test for the issue 4539. Check the expected behaviour on the original contour as well

* added comment; fixed typo, renamed another variable for a little better clarity

* added yet another part to the test for issue opencv#4539, where we run convexHull and convexityDetects on the original contour, without any manipulations. the rest of the test stays the same
* dnn: fix processing of input shapes

- importer: avoid using of .setInput() => .setInputShape()
- setInput: shape limitation check (partial)

* dnn(test): test .setInput() in readNet()
* add  python version of video-input-psnr-ssim

* remove ret

* documentation changes

* added link for python file

* command line argument
* Update to new ICV packages

MacOS ia32 ICV package is no longer built.

* cmake(ippicv): add Apple 32-bit check

* Updated commit hash
* Fixed getCPUCount

Minor new line changes

Android fix | efficient linux checks

Android fix 2

Fixed cpu logic for non linux platforms

Android fix 3

Android fix 4

* No v1 case handle | Refactor long lines

* Refined Cgroups logic | Combine Android and Linux

* Fixed directives

* Added support for --cpus | Fixed minor bug in Andriod | Change file read logic

* Added macro checks for apple errors

* Fixed macro to include android

* Addressed review comments

* Fixed android macro

* Refined return values

* Fixed apple warning

* Addressed review comments

* Fixed whitespace

* Android Fix try 1

* Android Fix try 2

* Android Fix try 3

* Removed unwanted endif

* Android Fix try 4

* Android Fix try 5

* Macro Restructure

* core: updates to CPUs detection (minor)
* Custom layers with nGraph

* nGraph: multiple outputs from nodes
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Feb 26, 2020

👍

@alalek alalek merged commit 45d073f into opencv:master Feb 26, 2020
@alalek alalek mentioned this pull request Feb 28, 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.

10 participants