Alexander Panov
1618c963e4
Merge pull request #20676 from AleksandrPanov:delete_createConvexHull_convertTo
...
* deleted dublicated createConvexHull and convertTo
* replaced checkVector(2) with points.empty()
2021-09-13 19:27:00 +03:00
Alexander Alekhin
1e3be09b3b
Merge pull request #20693 from alalek:backport_merge34_fix
2021-09-12 11:09:51 +00:00
Alexander Alekhin
6e66a9222a
dnn(onnx): fix format specifier
2021-09-11 22:26:52 +00:00
Suleyman TURKMEN
9d1e8b1e1d
Update convexhull.cpp
2021-09-11 23:58:14 +03:00
Alexander Alekhin
f605373a2b
Merge pull request #20690 from alalek:build_opencv_winpack_dldt_2021.4.1
2021-09-11 16:26:51 +00:00
Alexander Alekhin
56b7622612
Merge pull request #20687 from alalek:core_ocl_fix_intel_gemm
2021-09-11 16:26:25 +00:00
Alexander Alekhin
696a6ccd57
Merge pull request #20686 from zihaomu:tf_biasadd_bug
...
DNN: BiasAdd tf_importer.cpp could load Const from First Place
2021-09-11 19:25:04 +03:00
Zihao Mu
51b03b87e6
BiasAdd could load Const from second place.
2021-09-11 15:34:41 +00:00
Alexander Alekhin
aa7ba0bc1a
build: winpack_dldt with dldt 2021.4.1
2021-09-11 06:20:53 +03:00
Alexander Alekhin
07e4076585
Merge pull request #20689 from diablodale:fix20613-selectocldevice
2021-09-10 22:26:36 +00:00
Dale Phurrough
de1a459879
fix opencv/opencv#20613
...
* copy 4.x selectOpenCLDevice() -- it is compatible
* filter platforms rather than trying only first matching
* this works on 3.4 and 4.x master
2021-09-10 21:18:01 +02:00
Alexander Alekhin
1aacb9bb15
dnn(perf): update convolution tests
2021-09-10 13:11:02 +00:00
Alexander Alekhin
9b4ecc96f6
core(ocl): buffer bounds in intelblas_gemm_buffer_NT
2021-09-10 12:10:41 +00:00
Alexander Alekhin
e3f4f874c5
Merge pull request #20670 from alalek:core_ocl_fix_intel_gpu_gemm_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
2021-09-10 12:00:11 +00:00
Alexander Alekhin
6ace801418
Merge pull request #20661 from alalek:dnn_ocl_fix_gemm_like_kernel
2021-09-10 11:58:52 +00:00
rogday
d31b93b513
Merge pull request #20674 from rogday:prelu_slope
...
Fix PReLU negative slope access pattern
* fix prelu negative slope access pattern
* change begin() to ptr()
2021-09-10 11:07:16 +00:00
Alexander Alekhin
ac0fd6aa9a
Merge pull request #20675 from diablodale:fix2-20544
2021-09-09 21:35:03 +00:00
Dale Phurrough
068f33cfdf
add nodiscard to features2d clone funcs
2021-09-09 15:20:45 +02:00
rogday
4807cd8a6e
Merge pull request #20605 from rogday:split_slice_shenanigans
...
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
2021-09-09 14:41:40 +03:00
Alexander Alekhin
35e824c287
dnn(ocl): fix out of bound access in GEMM-like kernels
...
- dropped usage of CreateSubBuffer() - buffers lifetime management issue
- fixed elementwise offset
- avoid out of bounds read access
2021-09-06 18:17:21 +00:00
Alexander Alekhin
1e0d290f2e
Merge pull request #20655 from alalek:dnn_ocl_fix_globalsize
2021-09-06 17:20:18 +00:00
Alexander Alekhin
0097a8d097
Merge pull request #20657 from zchrissirhcz:upd-doc-for-py_fast
2021-09-06 11:31:35 +00:00
Zhuo Zhang
36cc43170d
docs: fix image path for py_fast doc
2021-09-06 13:05:58 +08:00
Alexander Alekhin
5578ad5e14
dnn(ocl): fix automatic globalsize adjusting
...
- if kernel code doesn't support that
2021-09-06 03:11:29 +00:00
Alexander Alekhin
d11f0a709d
Merge pull request #20652 from alalek:ocl_debug
2021-09-04 18:23:09 +00:00
Alexander Alekhin
0a43b23275
Merge pull request #20651 from alalek:issue_18361
2021-09-04 18:22:12 +00:00
Alexander Alekhin
7967683296
Merge pull request #20648 from alalek:issue_20615
2021-09-04 18:21:58 +00:00
Alexander Alekhin
5b2c016834
dnn(ocl): avoid out of buffer access in copyWeightsSwizzled
2021-09-04 15:45:59 +00:00
Alexander Alekhin
aaff125608
core(ocl): debug capabilities
2021-09-04 15:37:39 +00:00
Alexander Alekhin
407adc7061
dnn(ocl): fix buffer offsets in IDLF kernel
...
- drop CreateSubBuffer
- fix FUSED_CONV_ELTWISE mode
2021-09-04 15:28:35 +00:00
rogday
d0e612dc36
Merge pull request #20647 from rogday:resize_concat_optimization
...
Fix resize+concat optimization
* fix resize+concat optimization
* add comment and fix indentation
2021-09-03 12:32:29 +00:00
Alexander Alekhin
7c23ec90a9
Merge pull request #20646 from VadimLevin:dev/vlevin/fix-vector-conversion
2021-09-02 09:30:57 +00:00
Vadim Levin
390957fec4
fix: NumPy array allocation error message in vector conversion
2021-09-02 10:32:17 +03:00
Alexander Alekhin
060a76dc3e
Merge pull request #20573 from rogday:onnx_scale_fix
2021-09-01 14:09:17 +00:00
Alexander Alekhin
6625810d2a
Merge pull request #20618 from VadimLevin:dev/vlevin/fix-vector-conversion
2021-09-01 10:52:37 +00:00
WJJ1995
edc442afdb
Merge pull request #20511 from wjj19950828:add_humanseg_support_0806
...
* support PPSeg model for dnn module
* fixed README for CI
* add test case
* fixed bug
* deal with comments
* rm dnn_model_runner
* update test case
* fixed bug for testcase
* update testcase
2021-09-01 10:10:05 +00:00
Vadim Levin
16b9514543
feat: update conversion logic for std::vector<T>
in Python bindings
...
`PyObject*` to `std::vector<T>` conversion logic:
- If user passed Numpy Array
- If array is planar and T is a primitive type (doesn't require
constructor call) that matches with the element type of array, then
copy element one by one with the respect of the step between array
elements. If compiler is lucky (or brave enough) copy loop can be
vectorized.
For classes that require constructor calls this path is not
possible, because we can't begin an object lifetime without hacks.
- Otherwise fall-back to general case
- Otherwise - execute the general case:
If PyObject* corresponds to Sequence protocol - iterate over the
sequence elements and invoke the appropriate `pyopencv_to` function.
`std::vector<T>` to `PyObject*` conversion logic:
- If `std::vector<T>` is empty - return empty tuple.
- If `T` has a corresponding `Mat` `DataType` than return
Numpy array instance of the matching `dtype` e.g.
`std::vector<cv::Rect>` is returned as `np.ndarray` of shape `Nx4` and
`dtype=int`.
This branch helps to optimize further evaluations in user code.
- Otherwise - execute the general case:
Construct a tuple of length N = `std::vector::size` and insert
elements one by one.
Unnecessary functions were removed and code was rearranged to allow
compiler select the appropriate conversion function specialization.
2021-09-01 13:00:21 +03:00
Alexander Alekhin
95c7f4a7f0
Merge pull request #20635 from alalek:issue_20559
2021-08-31 14:42:20 +00:00
Alexander Alekhin
ae6fabc6fe
dnn(ocl): drop CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE check
...
- it is a hint and it should not block kernel execution
2021-08-30 20:40:14 +00:00
Alexander Alekhin
7eaadf616c
Merge pull request #20622 from diablodale:fix20544-nodiscard
2021-08-30 18:09:51 +00:00
Alexander Alekhin
8fed5fc5ae
Merge pull request #20633 from alalek:ocl_dumpValue_handle_null
2021-08-30 13:39:44 +00:00
Alexander Alekhin
f25951c412
core(ocl): handle NULL in dumpValue() debug call
...
- NULL is used for allocation of workgroup local variables
2021-08-30 11:47:51 +00:00
Alexander Alekhin
1259a474ba
Merge pull request #20625 from alalek:fix_msvc_warnings
2021-08-28 21:24:03 +00:00
Dale Phurrough
3995deaf76
fix opencv/opencv#20544 nodiscard for msvc/gcc
...
- includes workaround for preprocessor non-compliance
- enable attribute syntax checking in msvc
2021-08-28 20:22:47 +02:00
Alexander Alekhin
076587425e
build: eliminate build warnings
2021-08-28 17:11:26 +00:00
Alexander Alekhin
da6aeaca46
Merge pull request #20623 from alalek:fix_java_byte
2021-08-28 13:23:33 +00:00
Alexander Alekhin
8ee33ca551
java(test): avoid deprecation warning
...
- 'new Byte' => 'Byte.valueOf'
2021-08-28 02:10:05 +00:00
Alexander Alekhin
ea7f13922b
Merge pull request #20609 from vrabaud:3.4
2021-08-27 23:42:24 +00:00
Vincent Rabaud
38d0063c36
Do not use deprecated ReleaseCleared in protobuf library.
...
This is to make code work with protobuf arenas for memory
management (ReleaseCleared is incompatible).
The cleaning of the memory is also simpler.
2021-08-26 15:36:22 +02:00
Alexander Alekhin
df83459721
Merge pull request #20602 from diablodale:fix20594-refcounts-wiith-exceptions
2021-08-25 22:13:43 +00:00