Skip to content

(4.x) Merge 3.4#20691

Merged
alalek merged 27 commits intoopencv:masterfrom
alalek:merge-3.4
Sep 11, 2021
Merged

(4.x) Merge 3.4#20691
alalek merged 27 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Sep 11, 2021

#20605 from rogday:split_slice_shenanigans
#20647 from rogday:resize_concat_optimization
#20648 from alalek:issue_20615
#20651 from alalek:issue_18361
#20652 from alalek:ocl_debug
#20655 from alalek:dnn_ocl_fix_globalsize
#20657 from zchrissirhcz:upd-doc-for-py_fast
#20661 from alalek:dnn_ocl_fix_gemm_like_kernel
#20670 from alalek:core_ocl_fix_intel_gpu_gemm_requirements
#20674 from rogday:prelu_slope
#20675 from diablodale:fix2-20544
#20686 from zihaomu:tf_biasadd_bug
#20687 from alalek:core_ocl_fix_intel_gemm
#20689 from diablodale:fix20613-selectocldevice
#20690 from alalek:build_opencv_winpack_dldt_2021.4.1

Previous "Merge 3.4": #20642

Details
buildworker:Win64 OpenCL=windows-2
#buildworker:Custom=linux-1,linux-2,linux-4,linux-6
buildworker:Docs=linux-4,linux-6
build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-4,linux-6
Xbuild_image:Custom=javascript-simd
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.4.0:16.04
#build_image:Custom=ubuntu-openvino-2021.1.0:20.04
#build_image:Custom=ubuntu-openvino-2021.2.0:20.04
#build_image:Custom=ubuntu-openvino-2021.3.0:20.04
#build_image:Custom=ubuntu-openvino-2021.4.0:20.04
#buildworker:Custom=linux-1
#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.3.0
Xbuild_image:Custom Mac=openvino-2020.4.0
Xbuild_image:Custom Mac=openvino-2021.1.0
Xbuild_image:Custom Mac=openvino-2021.2.0
Xbuild_image:Custom Mac=openvino-2021.3.0
build_image:Custom Mac=openvino-2021.4.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.3.0
Xbuild_image:Custom Win=openvino-2020.4.0
Xbuild_image:Custom Win=openvino-2021.1.0
Xbuild_image:Custom Win=openvino-2021.2.0
Xbuild_image:Custom Win=openvino-2021.3.0
build_image:Custom Win=openvino-2021.4.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules=dnn,python2,python3,java
test_opencl:Custom Win=OFF
build_contrib:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

rogday and others added 26 commits September 3, 2021 12:32
Fix resize+concat optimization

* fix resize+concat optimization

* add comment and fix indentation
- drop CreateSubBuffer
- fix FUSED_CONV_ELTWISE mode
- if kernel code doesn't support that
- dropped usage of CreateSubBuffer() - buffers lifetime management issue
- fixed elementwise offset
- avoid out of bounds read access
Add Normalize subgraph, fix Slice, Mul and Expand

* Add Normalize subgraph, support for starts<0 and axis<0 in Slice, Mul broadcasting in the middle and fix Expand's unsqueeze

* remove todos

* remove range-based for loop

* address review comments

* change >> to > > in template

* fix indexation

* fix expand that does nothing
Fix PReLU negative slope access pattern

* fix prelu negative slope access pattern

* change begin() to ptr()
…mm_requirements

core(OpenCL): fix intel_gpu_gemm kernel requirements

* core(ocl): fix intel_gpu_gemm integration

- allow bailout to generic OpenCL kernel

* core(ocl): avoid failures of generic OpenCL gemm kernel

* core(ocl): define alignment requirements of intel_gpu_gemm kernels
* copy 4.x selectOpenCLDevice() -- it is compatible
* filter platforms rather than trying only first matching
* this works on 3.4 and 4.x master
DNN: BiasAdd tf_importer.cpp could load Const from First Place
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Sep 11, 2021

👍

@alalek alalek merged commit c3ac834 into opencv:master Sep 11, 2021
@alalek alalek mentioned this pull request Sep 25, 2021
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.

5 participants