Skip to content

Merge 3.4#17785

Merged
alalek merged 14 commits intoopencv:masterfrom
alalek:merge-3.4
Jul 8, 2020
Merged

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

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jul 8, 2020

#17674 from alalek:issue_16214
#17707 from Yosshi999:gsoc_sift-universal-intrinsic
#17737 from pemmanuelviel:pev--fix-trees-descent
#17752 from YashasSamaga:generalize-concat-fusion-3.4
#17759 from alalek:build_opencv_winpack_dldt_2020.4.0
#17777 from alalek:backport_cuda_cmake

Previous "Merge 3.4": #17769

buildworker:Win64 OpenCL=windows-1
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

@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jul 8, 2020

👍

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

4 participants