Skip to content

Merge 3.4#15890

Merged
alalek merged 26 commits intoopencv:masterfrom
alalek:merge-3.4
Nov 12, 2019
Merged

Merge 3.4#15890
alalek merged 26 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Nov 11, 2019

#15159 from SSE4:fix_find_openexr
#15319 from cancerberoSgx:fs
#15811 from l-bat:eltwise_div
#15813 from i-murzov:3.4-ocl-empty-platform
#15814 from i-murzov:3.4-ocl-cleanup
#15826 from alalek:cmake_fix_itt_define_condition
#15828 from ChipKerchner:momentsToHal
#15832 from collinbrake:feature_grammar_fixes_4
#15835 from alalek:cmake_cpu_optimizations_fix_15802
#15848 from alalek:backport_test_15842
#15854 from czgdp1807:rem-typo
#15861 from dkurt:dnn_fix_get_input_layers
#15875 from gyadam:fix-windows-install-doc
#15877 from mshabunin:fix-gst-relative-34

Previous "Merge 3.4": #15843

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

alalek and others added 25 commits November 1, 2019 15:07
* Reduce code nesting
* Drop redundant .c_str() calls
* Convert moments in tile algorithms to HAL (1.3x faster for VSX).

* Adding NEON code back in for non 64-bit platforms.

* Remove floats from post processing.
It's not an error if some OpenCL platform has no devices. This makes
OpenCL device detection work correctly in the following scenario:

$ OPENCV_OPENCL_DEVICE=:GPU: ./opencv_test_dnn

OpenCV version: 4.1.2-dev
OpenCV VCS version: 4.1.2-80-g467748ee98-dirty
Build type: Debug
Compiler: /usr/bin/g++  (ver 7.4.0)
Parallel framework: pthreads
CPU features: SSE SSE2 SSE3 *SSE4.1 *SSE4.2 *FP16 *AVX *AVX2 *AVX512-SKX?
Intel(R) IPP version: ippIP AVX2 (l9) 2019.0.0 Gold (-) Jul 24 2018
OpenCL Platforms:
    AMD Accelerated Parallel Processing
    Portable Computing Language
        CPU: pthread-AMD Ryzen 7 2700X Eight-Core Processor (OpenCL 1.2 pocl HSTR: pthread-x86_64-pc-linux-gnu-znver1)
    NVIDIA CUDA
        dGPU: GeForce GTX 1080 (OpenCL 1.2 CUDA)
Current OpenCL device:
    Type = dGPU
    Name = GeForce GTX 1080
    Version = OpenCL 1.2 CUDA
    Driver version = 430.26
Signed-off-by: SSE4 <tomskside@gmail.com>
* Grammar fixes for python core operations docs

* fixed whitespace error

* reverted changes
Fix an error during Windows installation caused by trying to create the already existing Build directory. Also excluding intermediate steps for Install directory creation.
Supported ONNX Squeeze, ReduceL2 and Eltwise::DIV

* Support eltwise div

* Fix test

* OpenCL support added

* refactoring

* fix code style

* Only squeeze with axes supported
backendId == DNN_BACKEND_CUDA ||
backendId == DNN_BACKEND_HALIDE ||
(backendId == DNN_BACKEND_CUDA && op != DIV) || // TODO: not implemented, see PR #15811
(backendId == DNN_BACKEND_HALIDE && op != DIV) || // TODO: not implemented, see PR #15811
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CUDA: 15894
Halide: #15893

@alalek
Copy link
Copy Markdown
Member Author

alalek commented Nov 12, 2019

👍

@alalek alalek merged commit b6a5881 into opencv:master Nov 12, 2019
@alalek alalek mentioned this pull request Nov 17, 2019
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.