Alexander Alekhin
53d6c9b9c0
Merge pull request #20860 from rogday:sum_fix
2021-10-12 15:36:32 +00:00
Smirnov Egor
238dbffb48
change asserts for Sum
2021-10-11 20:59:44 +03:00
Smirnov Egor
a9d7b6eab7
fix const - input and remove unimplemented function
2021-10-11 18:58:10 +03:00
Alexander Alekhin
4672dbda2a
Merge pull request #20818 from rogday:yolov4x_mish_cuda
2021-10-08 19:12:43 +00:00
Smirnov Egor
9c84749e2c
backport YOLOv4x-mish new_coords CUDA implementation
2021-10-08 14:14:49 +03:00
Alexander Alekhin
cca4c47781
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-08 11:05:45 +00:00
Alexander Alekhin
81e7988eb9
Merge pull request #20840 from alalek:dnn_ocl_cleanup_code
2021-10-08 05:07:51 +00:00
Alexander Alekhin
8c2dd5fb9a
dnn(ocl4dnn): cleanup dead code, improve logging
2021-10-08 00:39:40 +00:00
Alexander Alekhin
724e04e979
dnn(ocl4dnn): add extra checks to convolution layer
...
- prevent running code over unsupported/non-tested configurations
- prevent integer div by zero
2021-10-07 23:18:32 +00:00
Alexander Alekhin
03a08435e2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-07 04:27:22 +00:00
Alexander Alekhin
1a29ea1038
Merge pull request #20829 from alalek:dnn_ocl_skip_int8_tests
2021-10-06 22:46:21 +00:00
Alexander Alekhin
94e92cd6c0
dnn(ocl): skip int8 tests due to memory access issues
2021-10-06 21:27:18 +00:00
Alexander Alekhin
822d468232
Merge pull request #20813 from rogday:soft_nms
2021-10-06 20:20:34 +00:00
Smirnov Egor
2221dcc9f2
add SoftNMS implementation
2021-10-06 21:31:45 +03:00
Oliver Kuckertz
a3d7811f24
Merge pull request #20725 from mologie:fix-dnn-tf-on-arm
...
* dnn: fix unaligned memory access crash on armv7
The getTensorContent function would return a Mat pointing to some
member of a Protobuf-encoded message. Protobuf does not make any
alignment guarantees, which results in a crash on armv7 when loading
models while bit 2 is set in /proc/cpu/alignment (or the relevant
kernel feature for alignment compatibility is disabled). Any read
attempt from the previously unaligned data member would send SIGBUS.
As workaround, this commit makes an aligned copy via existing clone
functionality in getTensorContent. The unsafe copy=false option is
removed. Unfortunately, a rather crude hack in PReLUSubgraph in fact
writes(!) to the Protobuf message. We limit ourselves to fixing the
alignment issues in this commit, and add getTensorContentRefUnaligned
to cover the write case with a safe memcpy. A FIXME marks the issue.
* dnn: reduce amount of .clone() calls
* dnn: update FIXME comment
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2021-10-06 16:41:05 +00:00
Alexander Alekhin
646924fce8
dnn(pytest/test_input_3d): reload model between switching targets
2021-10-05 23:23:08 +00:00
HAN Liutong
e5fb50476c
Merge pull request #20521 from hanliutong:dev-rvv-multiVLEN
...
Make the implementation of optimization in DNN adjustable to different vector sizes with RVV intrinsics.
* Update fastGEMM for multi VLEN.
* Update fastGEMM1T for multi VLEN.
* Update fastDepthwiseConv for multi VLEN.
* Update fastConv for multi VLEN.
* Replace malloc with cv::AutoBuffer.
2021-10-05 15:35:00 +00:00
Alexander Alekhin
3e6f27522b
pre: OpenCV 4.5.4 (version++)
2021-10-04 22:35:47 +00:00
Alexander Alekhin
1b70f94282
Merge pull request #20782 from YashasSamaga:cuda4dnn-eltwise-broadcast
2021-10-04 22:35:00 +00:00
Alexander Alekhin
ebef84e9ea
pre: OpenCV 3.4.16 (version++)
2021-10-04 20:47:07 +00:00
Jebastin Nadar
cce78cc5e2
Merge pull request #20535 from SamFC10:onnx-q
...
dnn : int8 quantized layers support in onnx importer
* added quantized layers support in onnx importer
* added more cases in eltwise node, some more checks
* added tests for quantized nodes
* relax thresholds for failed tests, address review comments
* refactoring based on review comments
* added support for unsupported cases and pre-quantized resnet50 test
* relax thresholds due to int8 resize layer
2021-10-04 18:07:38 +00:00
Zihao Mu
9085b933d8
Merge pull request #20702 from zihaomu:tf_expand_dim_layer
...
Add ExpandDims layer of tf_importer.cpp
* Add ExpandDims to tf_importer.
* add -1 expand test case.
* Support different dimensions of input.
* Compatible with 5-dimensional NDHWC data
* Code align
* support 3-dim input.
* 3-dim bug fixed.
* fixing error of code format.
2021-10-04 16:37:38 +00:00
YashasSamaga
505dde09de
support broadcasting in eltwise ops
2021-10-04 12:38:45 +05:30
SamFC10
87ebf2e50b
fix illegal memory access in int8 convolution
2021-10-03 15:16:01 +05:30
Alexander Alekhin
37c3f0d8a0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-02 17:57:18 +00:00
Alexander Alekhin
f977d10a19
dnn(ocl): fix conv DWCONV workgroup
2021-10-01 18:52:07 +00:00
Alexander Alekhin
846317ef37
dnn(ocl): fix conv BASIC workgroup
2021-09-29 14:55:46 +00:00
Alexander Alekhin
24fcb7f813
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-09-25 17:50:00 +00:00
rogday
38b9ec7a18
Merge pull request #20682 from rogday:min
...
* Add Min layer to CPU, OpenCL, Halide, Inference Engine, NGraph and CUDA
* fix indentation
* add min to fusion and halide tests; fix doc
2021-09-22 15:17:37 +03:00
SamFC10
9c5d7716e2
fix for unsqueeze opset version 13
2021-09-17 17:40:57 +05:30
Alexander Alekhin
46fd26e366
Merge pull request #20699 from alalek:dnn_perf_update_convolution_tests
2021-09-16 17:11:32 +00:00
rogday
c410d7a97d
Merge pull request #20671 from rogday:yolov4x-mish
...
Add support for YOLOv4x-mish
* backport to 3.4 for supporting yolov4x-mish
* add YOLOv4x-mish test
* address review comments
Co-authored-by: Guo Xu <guoxu@1school.com.cn>
2021-09-14 17:49:49 +00:00
YashasSamaga
50462dcdc6
fix effrank assert to allow input effrank <= output effrank
2021-09-13 20:44:33 +05:30
Alexander Alekhin
6e66a9222a
dnn(onnx): fix format specifier
2021-09-11 22:26:52 +00:00
Alexander Alekhin
c3ac834526
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-09-11 21:27:26 +00:00
Zihao Mu
51b03b87e6
BiasAdd could load Const from second place.
2021-09-11 15:34:41 +00:00
Alexander Alekhin
1aacb9bb15
dnn(perf): update convolution tests
2021-09-10 13:11:02 +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
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
5578ad5e14
dnn(ocl): fix automatic globalsize adjusting
...
- if kernel code doesn't support that
2021-09-06 03:11:29 +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
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
5aa7435d25
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-09-02 15:24:04 +00:00
Alexander Alekhin
060a76dc3e
Merge pull request #20573 from rogday:onnx_scale_fix
2021-09-01 14:09:17 +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
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
4c05a697fa
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-08-28 21:30:28 +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
6fbfc58602
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-08-21 17:25:18 +00:00
Alexander Alekhin
77a5c43d50
Merge pull request #20586 from alalek:issue_20585
2021-08-21 17:22:58 +00:00
Alexander Alekhin
f28e4b86fb
dnn(ocl): fix top initialization in verifyResult
2021-08-21 16:04:13 +00:00
rogday
6801dd043d
Merge pull request #20494 from rogday:onnx_diagnostic_fix
...
fix ONNXImporter diagnostic mode layer registration issue
* fix layer registration, thread unsafe access and align the behavior of DNN_DIAGNOSTICS_RUN between onnx and tf importers
* move skipModelInput
* print all missing layers
* address TF issue
2021-08-20 14:43:47 +00:00
Alexander Alekhin
a9817e9127
Merge pull request #20556 from rogday:onnx_split_sum_fix
2021-08-20 08:10:18 +00:00
Vincent Rabaud
9cfa84313c
Use the one argument version of SetTotalBytesLimit.
...
The two argument versions has been deprecated, cf
https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream
2021-08-19 14:31:29 +02:00
SamFC10
fa90e14b06
int8 layers and 8-bit quantization support
2021-08-19 09:56:47 +05:30
Smirnov Egor
fe625a558e
fix hasDynamicShapes for batch_size and fix axis selection in Scale layer
2021-08-18 19:22:24 +03:00
thezane
210bfaf8d6
Merge pull request #20483 from thezane:support-cumsum-layer-for-onnx
...
* Support cumsum layer for onnx
* Add unit tests
* Address review comments
2021-08-17 20:09:25 +03:00
Smirnov Egor
9ef41f68fb
fix Split partial sum
2021-08-16 15:44:54 +03:00
Alexander Alekhin
05d733e707
Merge pull request #20524 from yichenj:dnn_text_recognition_enhance
2021-08-15 12:30:25 +00:00
Alexander Alekhin
0c01cf7c85
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-08-14 18:24:00 +00:00
Julia Bareeva
cfb36443fb
Merge pull request #20506 from JulieBar:lstm_activations
...
* Support activations(Sigmoid, Tanh) for LSTM
* fix warning
2021-08-13 15:41:00 +03:00
Alexander Alekhin
9d3826c676
Merge pull request #20525 from SamFC10:fix-prior-variances
2021-08-13 10:06:55 +00:00
JIANG Yichen
955cf35d5f
Implement ctc prefix beam search decode for TextRecognitionModel.
...
The algorithm is based on Hannun's paper: First-Pass Large Vocabulary
Continuous Speech Recognition using Bi-Directional Recurrent DNNs
2021-08-12 20:33:31 +08:00
HAN Liutong
aaca4987c9
Merge pull request #20287 from hanliutong:dev-rvv-0.10
...
Optimization of DNN using native RISC-V vector intrinsics.
* Use RVV to optimize fastGEMM (FP32) in DNN.
* Use RVV to optimize fastGEMM1T in DNN.
* Use RVV to optimize fastConv in DNN.
* Use RVV to optimize fastDepthwiseConv in DNN.
* Vectorize tails using vl.
* Use "vl" instead of scalar to handle small block in fastConv.
* Fix memory access out of bound in "fastGEMM1T".
* Remove setvl.
* Remove useless initialization.
* Use loop unrolling to handle tail part instead of switch.
2021-08-11 01:16:03 +03:00
Smirnov Egor
739ff84732
add Max layer to TFImporter
2021-08-09 14:01:51 +03:00
SamFC10
2a177052de
fix bug in prior-box variances
2021-08-09 12:08:55 +05:30
Alexander Alekhin
424eaba4c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-08-07 17:25:06 +00:00
Julia Bareeva
e1cafa3834
Merge pull request #20442 from JulieBar:gru_layer
...
* Add initialization and inference for GRU layer
* fix issues found on review
2021-08-07 10:07:37 +03:00
Julia Bareeva
633fedaa96
Merge pull request #20480 from JulieBar:lstm_pytest
...
Add Python's test for LSTM layer
* Add Python's test for LSTM layer
* Set different test threshold for FP16 target
* rename test to test_input_3d
Co-authored-by: Julie Bareeva <julia.bareeva@xperience.ai>
2021-08-05 18:13:17 +03:00
Alexander Alekhin
907743eee7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-07-30 14:50:36 +00:00
Smirnov Egor
27392f832d
reimplement onnx refactor for master
2021-07-30 13:00:13 +03:00
rogday
cff0168f3a
Merge pull request #20453 from rogday:onnx_importer_fix
...
Split layer dispatch into functions in ONNXImporter
* split layer dispatch into functions
* fixes
* identation and comment fixes
* fix constness
2021-07-28 18:06:24 +03:00
Alexander Alekhin
f4d6a3ec4e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-07-24 15:34:58 +00:00
Julia Bareeva
4e5699fa71
Merge pull request #20450 from JulieBar:lstm_inside
...
Support non-zero hidden state for LSTM
* fully support non-zero hidden state for LSTM
* check dims of hidden state for LSTM
* fix failed test Test_Model.TextRecognition
* add new tests for LSTM w/ non-zero hidden params
Co-authored-by: Julie Bareeva <julia.bareeva@xperience.ai>
2021-07-23 17:11:50 +03:00
Smirnov Egor
024b43ca06
implement asymmetric padding for conv2d, max_pool and conv2d_backprop_input
2021-07-22 16:58:40 +03:00
Alexander Alekhin
b61a55eebf
Merge pull request #20402 from rogday:tf_diag_dummy
2021-07-16 15:44:29 +00:00
Smirnov Egor
c30078c5a3
add NotImplemented layer
2021-07-16 15:39:54 +03:00
Alexander Alekhin
39b91c97f0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-07-16 10:35:42 +00:00
Alexander Alekhin
8334ee18e6
Merge pull request #20394 from SamFC10:conv-asymmetric-pads
2021-07-16 10:33:42 +00:00
SamFC10
96d35f7c54
Fix convolution asymmetric padding bug in onnx importer
2021-07-16 09:39:41 +05:30
Alexander Alekhin
fbde0c6c96
dnn(ie): fix handling of 1D and non-32F outputs of InferenceEngine
2021-07-15 21:47:05 +00:00
Alexander Alekhin
602e7c83e2
dnn(test): add extra IR models, more checks in IE testing code
2021-07-15 21:47:05 +00:00
Alexander Alekhin
bc210b292b
dnn(test): backport test_ie_models.cpp from 4.5.3
2021-07-15 00:05:02 +00:00
Alexander Alekhin
9e42e04b4a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-07-10 13:01:03 +00:00
César Gouveia
167a12028d
Merge pull request #20374 from cesarpgouveia:bugfix/fix_load_onnxModel_debug
...
* Fix bug while loading onnx model in debug
* dnn: fix other .at using
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2021-07-09 18:21:56 +00:00
Alexander Alekhin
821fae0d94
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-07-03 00:30:58 +00:00
Alexander Alekhin
0f2f966a91
Merge pull request #20345 from mitruska:update_ngraph_normalizel2
2021-07-02 23:37:03 +00:00
mitruska
18dbac203f
Use explicit version of ngraph NormalizeL2
2021-07-02 21:33:05 +00:00
Alexander Alekhin
8d1f254dcc
java: force using of 'Ptr<>' for OpenCV classes
...
backport of commit: e5841d3126
2021-07-02 21:20:08 +00:00
Alexander Alekhin
e5841d3126
java: force using of 'Ptr<>' for OpenCV classes
2021-07-02 21:13:49 +00:00
Alexander Alekhin
8fad85edda
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-07-01 10:52:31 +00:00
Alexander Alekhin
b699fe7a9d
Merge pull request #20335 from SamFC10:concat-const-input
2021-07-01 10:25:35 +00:00
SamFC10
5b8c10f2f8
modified onnx importer to concat const input blobs
2021-07-01 10:58:31 +05:30
Alexander Alekhin
24983f62e2
Merge pull request #20325 from alalek:dnn_openvino_2021.4.0
2021-06-30 23:58:26 +00:00
Alexander Alekhin
f2057ce1ab
dnn(ie): replace deprecated calls
2021-06-30 22:30:15 +00:00
Alexander Alekhin
6797fd65a5
dnn(test): update tests for OpenVINO 2021.4
2021-06-30 22:30:15 +00:00
Alexander Alekhin
7d842f5bcf
dnn: use OpenVINO 2021.4 defines
2021-06-29 18:48:21 +00:00
Smirnov Egor
dc5199feea
skipping missing layers and layer failures
2021-06-25 11:26:37 +03:00
SamFC10
55e1dfb778
Fix BatchNorm reinitialization
2021-06-20 13:19:29 +05:30
Alexander Alekhin
735a79ae83
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-06-19 18:44:16 +00:00
Alexander Alekhin
7a5f554bc4
Merge branch 4.x
2021-06-13 10:27:44 +00:00
Alexander Alekhin
c1adbe3189
Merge pull request #20190 from rogday:tf_importer_ref
2021-06-11 20:06:09 +00:00
rogday
7ee1816612
split if into map of functions
2021-06-11 13:20:45 +03:00
Alexander Alekhin
1c4d70896a
Merge pull request #20138 from YashasSamaga:cuda4dnn-runtime-matmul
2021-06-08 14:47:17 +00:00
Alexander Alekhin
b57faa41c2
pre: OpenCV 4.5.3 (version++)
2021-06-08 08:52:20 +00:00
Alexander Alekhin
43940f7ffc
pre: OpenCV 3.4.15 (version++)
2021-06-07 20:10:34 +00:00
Alexander Alekhin
b91e0dca90
Merge branch 4.x
2021-06-04 15:18:51 +00:00
Alexander Alekhin
3e513ee6ab
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-06-03 16:23:36 +00:00
Paul Jurczak
ff60abb575
Merge pull request #20080 from pauljurczak:patch-3
...
* Update dnn.hpp
getPerfProfile is not supported by the CUDA backend, see https://github.com/opencv/opencv/issues/20077
* dnn.hpp: fix doxygen formatting
2021-06-02 19:15:52 +00:00
YashasSamaga
32df5faa25
add MatMulOp
2021-05-22 01:01:29 +05:30
Alexander Alekhin
170bf6d7af
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-05-01 09:44:24 +00:00
Alexander Alekhin
71bae7c23f
dnn(ie): implicit usage of IE::GPU OpenCL kernels cache
2021-04-29 12:43:22 +03:00
Suleyman TURKMEN
159534313e
Update CMakeLists.txt
2021-04-26 22:43:04 +03:00
Aleksandr Voron
2e143b8799
Merge pull request #19961 from alvoron:dnn_ngraph_int64_fix
...
Explicit usage of int64_t in CropAndResizeLayer (IE backend)
* Update crop_and_resize_layer.cpp
2021-04-21 18:29:19 +00:00
Alexander Alekhin
fc628014bb
Merge branch 4.x
2021-04-10 18:03:01 +00:00
Alexander Alekhin
3e1673e8b2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-04-01 09:54:57 +00:00
Anastasia Murzova
cc6d48959e
Added reduce sum by channel support
2021-03-30 23:01:22 +03:00
Vitaly Tuzov
aab62aa6dd
Merge pull request #18952 from terfendail:wui_doc
...
* Updated UI documentation to address WUI
* Added documentation for vx_ calls
* Removed vx_store operation overload
* Doxyfile updated to enable wide UI
* Enable doxygen documentation for vx_ WUI functions
* Wide intrinsics definition rework
* core: fix SIMD C++ emulator build (supports 128-bit only)
2021-03-30 16:18:03 +00:00
Alexander Alekhin
c89084e6b7
Merge pull request #19223 from YashasSamaga:cuda4dnn-halfpix-linear-resize
2021-03-30 13:19:41 +00:00
Anastasia M
e08de1101d
Merge pull request #19693 from LupusSanctus:onnx_diagnostic
...
ONNX diagnostic tool
* Final
* Add forgotten Normalize layer to the set of supported types
* ONNX diagnostic tool corrections
* Fixed CI test warnings
* Added code minor corrections
Co-authored-by: Sergey Slashchinin <sergei.slashchinin@xperience.ai>
2021-03-29 16:38:28 +00:00
Alexander Alekhin
35eaacd1db
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-03-27 15:35:16 +00:00
Alexander Alekhin
d27eb79fa6
Merge pull request #19785 from alalek:dnn_ocl_fix_async_kernels
2021-03-26 12:27:58 +00:00
Anastasia M
3e48a91d97
Merge pull request #19546 from LupusSanctus:am/slice_steps
...
* Added Steps support in DNN Slice layer
* Added code corrections
* dnn(slice): fix OCL and OCL_FP16 processing
2021-03-26 11:04:57 +00:00
Alexander Alekhin
86d0a86141
dnn(ocl): fix gemm kernel scheduling
2021-03-26 00:35:00 +00:00
Alexander Alekhin
26ea4760ad
Merge pull request #19774 from aarongreig:aaron/dnn/oclTestAccuracyThresholds
2021-03-25 16:58:07 +00:00
Aaron Greig
f59917bea1
Introduce relaxed accuracy thresholds for CL target in some dnn tests.
...
Partially addresses #9821
2021-03-25 10:58:23 +00:00
Alexander Alekhin
b62d015285
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-03-24 18:58:46 +00:00
Alexander Alekhin
e56e4876e7
dnn(test): update tests for OpenVINO 2021.3
2021-03-24 14:50:42 +00:00
Alexander Alekhin
56bdd7db5c
dnn: use OpenVINO 2021.3 defines
...
original commit: 6291503793
2021-03-24 10:26:24 +00:00
Anastasia Murzova
e75f1b071b
Added reshape corrections
2021-03-24 10:53:11 +03:00
Anastasia Murzova
7a2b3ed471
Corrected DNN elementwise multiplication
2021-03-24 10:53:11 +03:00
Anastasia M
551d4a8ec1
Merge pull request #19477 from LupusSanctus:am/eltwice_vec
...
* Aligned OpenCV DNN and TF sum op behaviour
Support Mat (shape: [1, m, k, n] ) + Vec (shape: [1, 1, 1, n]) operation
by vec to mat expansion
* Added code corrections: backend, minor refactoring
2021-03-23 22:16:09 +00:00
Alexander Alekhin
ca8c3dd9b5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-03-22 12:05:23 +00:00
Liubov Batanina
c0dd82fb53
Merge pull request #19632 from l-bat:lb/ie_arm_target
...
Added OpenVINO ARM target
* Added IE ARM target
* Added OpenVINO ARM target
* Delete ARM target
* Detect ARM platform
* Changed device name in ArmPlugin
* Change ARM detection
2021-03-20 11:20:02 +00:00
Alexander Alekhin
b19f860384
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-03-13 13:02:18 +00:00
Liubov Batanina
8d29a902e4
Added ngraph::op::v6::MVN
2021-03-12 21:02:03 +03:00
Liubov Batanina
95ab9468c1
Added ngraph::op::v4::Interpolation
2021-03-12 12:00:59 +03:00
Alexander Alekhin
fbb38cc245
Merge pull request #19222 from YashasSamaga:cuda4dnn-fix-build-diagnostics
2021-03-10 17:40:36 +00:00
Alexander Alekhin
e4692ac079
Merge pull request #19613 from WeiChungChang:NMS_refine
2021-03-10 17:36:57 +00:00
Qoo
47337e2196
boost NMS performance
2021-03-10 15:59:26 +00:00
Alexander Alekhin
d643a90efa
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-03-06 17:31:08 +00:00
Alexander Alekhin
dc24663e8d
Merge pull request #19641 from LupusSanctus:am/tf_reshape
2021-03-06 17:21:34 +00:00
YashasSamaga
d0fe6ad109
fix checkVersions()
2021-03-06 19:03:03 +05:30
Alexander Alekhin
358878caf7
Merge pull request #19671 from SamFC10:sam-darknet
2021-03-05 15:12:21 +00:00
Anastasia Murzova
7894cd3c73
Aligned TF Reshape layer behaviour
2021-03-05 01:01:37 +03:00
Liubov Batanina
94533e12eb
Determine layout
2021-03-04 13:05:01 +03:00
SamFC10
a42d4da003
Added Spatial Attention Module in Darknet Importer
2021-03-03 22:42:47 +05:30
Alexander Alekhin
a823b06fa5
pre: OpenCV 4.5.2 (version++)
2021-03-02 23:20:59 +00:00
Alexander Alekhin
a123c48d4d
pre: OpenCV 3.4.14 (version++)
2021-03-02 20:47:29 +00:00
SamFC10
96947c30c0
Added exp layer
...
backport of commit: 6111935835
partial backport of commit: dd5976162b
2021-02-28 19:59:40 +00:00
Alexander Alekhin
e0265c67c6
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-02-27 17:41:57 +00:00
Maksim Shabunin
b2321576bc
Fixed several issues found by static analysis
2021-02-25 15:44:15 +03:00
Maksim Shabunin
dd5976162b
Fixed several issues found by static analysis
2021-02-25 15:08:39 +03:00
WeiChungChang
d4d12164aa
Merge pull request #19529 from WeiChungChang:3.4
...
* improve map allocation check
* fix accoring to CR
2021-02-23 21:09:55 +00:00
Alexander Alekhin
86cb435adf
dnn: fix build (nullptr issue)
2021-02-23 03:31:29 +00:00
Alexander Alekhin
513f5a8869
Merge pull request #19536 from WeiChungChang:ReduceMemory
2021-02-22 20:04:11 +00:00
WeiChungChang
f6bc4fd4c6
Merge pull request #19552 from WeiChungChang:partialSort
...
apply partial sort to save computations
* apply partial sort
* fix typo
* fix accroding to CR
2021-02-22 19:44:00 +03:00
Alexander Alekhin
0a6f216f83
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-02-21 20:14:09 +00:00
SamFC10
6111935835
Added exp layer
2021-02-20 22:16:00 +05:30
Alexander Alekhin
8d21c84e7d
Merge pull request #19474 from aryanshomray:darknet_tanh
2021-02-17 17:10:44 +00:00
Aryansh Omray
601851cc7e
TanH darknet and test
2021-02-17 18:49:52 +05:30
Qoo
bc8727786b
save allocation of memory for fake image
2021-02-15 20:14:07 -05:00
Qoo
c909693d45
refine
2021-02-12 20:53:09 -05:00
Tsukasa Sugiura
107f233626
Merge pull request #19484 from UnaNancyOwen:fix_highlevelapi
...
* [dnn] fix high level api for python
* [dnn] add test_textdetection_model_db
* [dnn] fix textdetection test only check type and shape
2021-02-10 19:42:00 +00:00
Ilya Churaev
8fa013309e
Merge pull request #19479 from ilyachur:remove_v0_multiply
...
* Switched to v1 Multiply
* Apply changes only for new OV
2021-02-09 09:46:28 +00:00
Alexander Alekhin
6b474c4051
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-02-06 00:44:11 +00:00
Alexander Alekhin
4f08bb5046
Merge pull request #19428 from alalek:dnn_drop_misbehaved_clamp
2021-02-04 11:57:19 +00:00
Jebastin Nadar
09d2ca17cf
Merge pull request #19449 from SamFC10:tf-leakyrelu
...
* add LeakyRelu to tf-importer
* fix whitespace error
* added test for leakyrelu
2021-02-04 08:50:08 +00:00
Alexander Alekhin
83aa711346
dnn: rename clamp() => normalize_axis()
2021-02-04 08:13:55 +00:00
Alexander Alekhin
0a86ddc36c
Merge pull request #19435 from l-bat:lb/onnx_normalize
2021-02-03 09:16:06 +00:00
Liubov Batanina
68eb54dc13
Added ONNX NormalizeL2 subgraph
2021-02-01 12:44:48 +03:00
Alexander Alekhin
b9dfffc237
Merge pull request #19057 from sl-sergei:changes_for_cuda_1d
2021-01-30 11:39:43 +00:00
Sergey Slashchinin
e2949c7d0a
Align 3.4 branch with master
2021-01-29 23:48:08 +03:00
Alexander Alekhin
e85b41f9be
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-01-25 22:42:13 +00:00
Alexander Alekhin
573812d0ff
Merge pull request #19373 from l-bat:lb/tf_matmul_shared
2021-01-25 22:08:24 +00:00
Liubov Batanina
c12930cdde
Merge pull request #19372 from l-bat:lb/onnx_pads_calc
...
* Fixed bug with constant Div
* Supported constant mul and div for inputs with different shapes
2021-01-25 22:07:50 +00:00
Alexander Alekhin
7825abd540
python: handle errors in Rect conversions
2021-01-23 03:07:38 +00:00
Liubov Batanina
38a49f92ab
Added shared weights for MatMul
2021-01-22 16:47:02 +03:00
Sergei Slashchinin
ea41f89b40
Merge pull request #19058 from sl-sergei:cuda_1d
...
Conv1D and Pool1D for CUDA backend
* CUDA-independent changes
* Add Conv1D and Pool1D for CUDA backend
* CUDA-independent changes
* Fix typo
* fix comment
* Update fix
* make changes more correct for pooling layer
* Minor fixes for review
* Split skip blocks
2021-01-21 22:16:56 +00:00
Alexander Alekhin
28c0cd8460
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-01-16 19:03:42 +00:00
Liubov Batanina
af9597f454
Added Mish ONNX subgraph
2021-01-15 14:01:48 +03:00
Alexander Alekhin
d3bc563c6e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-01-12 18:34:33 +00:00
YashasSamaga
8c74d7e4fa
add half pixel centers and align corners param
2020-12-27 15:05:39 +05:30
Alexander Alekhin
55f06b76f9
dnn: improve debugging of TensorFlow parsing errors
2020-12-26 15:31:30 +00:00
Alexander Alekhin
624d532000
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-12-17 21:05:34 +00:00
Alexander Alekhin
9b4adc9acb
Merge pull request #19146 from alalek:dnn_openvino_2021.2.0
2020-12-17 19:50:36 +00:00
Vincent Rabaud
8391a23600
Optimize calls to std::string::find() and friends for a single char.
...
The character literal overload is more efficient. More info at:
http://clang.llvm.org/extra/clang-tidy/checks/performance-faster-string-find.html
2020-12-17 09:39:23 +01:00
Alexander Alekhin
28aab134db
dnn(test): update tests for OpenVINO 2021.2
2020-12-17 07:53:35 +00:00
Alexander Alekhin
752cc26ad6
dnn: use OpenVINO 2021.2 defines
...
original commit: 4699d2ba0c
2020-12-16 22:22:17 +00:00
Alexander Alekhin
7631056b8a
Merge pull request #19114 from alalek:issue_18937
2020-12-15 20:47:05 +00:00
Alexander Alekhin
c240355cc6
dnn(ocl): avoid mess FP16/FP32 in convolution layer
2020-12-15 08:51:24 +00:00
Alexander Alekhin
4b3d2c8834
dnn(ocl): fix gemm kernels with beta=0
...
- dst is not initialized, may include NaN values
- 0*NaN produces NaN
2020-12-15 00:58:43 +00:00
Alexander Alekhin
dd1494eebf
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-12-11 19:27:20 +00:00
Alexander Alekhin
23c246882e
Merge pull request #19071 from LupusSanctus:am/dnn_nearest_resize_3.4
2020-12-11 18:25:55 +00:00
Alexander Alekhin
d6a7f5e1e0
Merge pull request #19075 from alalek:dnn_fix_halide_build
2020-12-10 20:37:37 +00:00
Alexander Alekhin
fce8d8e090
Merge pull request #19074 from alalek:dnn_test_tolerance_east
2020-12-10 20:29:36 +00:00
Alexander Alekhin
d84a9484b7
dnn: fix build with Halide, skip tests with crashes
2020-12-10 18:23:24 +00:00
Alexander Alekhin
8ff27a07bb
dnn(test): adjust EAST test tolerance
2020-12-10 16:39:20 +00:00
Anastasia Murzova
f2422ace7d
Added TF nearest neighbour resize behaviour alignment
...
Relates to OpenCV issue #18721
2020-12-10 15:53:24 +03:00
Alexander Alekhin
de385009ae
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-12-09 18:09:00 +00:00
Alexander Alekhin
8286d84fb1
Merge pull request #19061 from alalek:dnn_load_face_detector_with_external_protobuf
2020-12-09 18:03:52 +00:00
Alexander Alekhin
d7e936de5c
dnn(caffe): add DetectionOutputParameter.clip to .proto file
...
- allow to load opencv_face_detector with external unpatched protobuf
2020-12-09 05:21:07 +00:00
Anastasia Murzova
a82c50eac2
Added TF resize_bilinear behaviour alignment
...
Fixes OpenCV issue #18721
2020-12-08 22:51:38 +03:00
berak
cf28b5e5be
dnn: add another color to Net::Impl::dump()
2020-12-07 17:58:40 +01:00
Alexander Alekhin
d1b5a78171
build warnings
...
- GCC 4.8.5 / CentOS 7
2020-12-05 20:08:29 +00:00
Alexander Alekhin
00f36a3149
dnn: prefer to use v_fma() instead of v_c += v_a * v_b
2020-12-05 11:51:03 +00:00
Wenqing Zhang
22d64ae08f
Merge pull request #17570 from HannibalAPE:text_det_recog_demo
...
[GSoC] High Level API and Samples for Scene Text Detection and Recognition
* APIs and samples for scene text detection and recognition
* update APIs and tutorial for Text Detection and Recognition
* API updates:
(1) put decodeType into struct Voc
(2) optimize the post-processing of DB
* sample update:
(1) add transformation into scene_text_spotting.cpp
(2) modify text_detection.cpp with API update
* update tutorial
* simplify text recognition API
update tutorial
* update impl usage in recognize() and detect()
* dnn: refactoring public API of TextRecognitionModel/TextDetectionModel
* update provided models
update opencv.bib
* dnn: adjust text rectangle angle
* remove points ordering operation in model.cpp
* update gts of DB test in test_model.cpp
* dnn: ensure to keep text rectangle angle
- avoid 90/180 degree turns
* dnn(text): use quadrangle result in TextDetectionModel API
* dnn: update Text Detection API
(1) keep points' order consistent with (bl, tl, tr, br) in unclip
(2) update contourScore with boundingRect
2020-12-03 18:47:40 +00:00
Daniel Cauchi
9d37cdaa66
Merge pull request #18891 from CowKeyMan:NMS_boxes_with_different_labels
...
Add option for NMS for boxes with different labels
* DetectionModel impl
* Add option for NMS for boxes with different labels
In the detect function in modules/dnn/include/opencv2/dnn/dnn.hpp, whose implementation can be found at modules/dnn/src/model.cpp, the Non Max Suppression (NMS) is applied only for objects of the same label. Thus, a flag
was added with the purpose to allow developers to choose if they want to keep the default implementation or wether they would like NMS to be applied to all the boxes, regardless of label.
The flag is called nmsDifferentLabels, and is given a default value of false, which applies the current default implementation, thus allowing existing projects to update opencv without disruption
Solves issue opencv#18832
* Change return type of set & Add default constr
* Add assertions due to default constructor
2020-12-01 13:50:24 +00:00
Sergei Slashchinin
9cef41000a
Merge pull request #18973 from sl-sergei:fix_vulkan_build
...
* Fix build when HAVE_VULKAN is ON
* Fix warnings
2020-12-01 12:52:09 +00:00
Alexander Alekhin
9d2eabaaa2
Merge remote-tracking branch 'upstream/master' into merge-4.x
2020-11-27 18:15:28 +00:00
Alexander Alekhin
2155296a13
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-11-27 14:08:06 +00:00
Alexander Alekhin
2cf2456f4c
dnn(test): skip unstable GatherMultiOutput OCL_FP16 test
2020-11-26 21:30:21 +00:00
Sergei Slashchinin
f4f462c50b
Merge pull request #18862 from sl-sergei:support_pool1d
...
Support for Pool1d layer for OpenCV and OpenCL targets
* Initial version of Pool1d support
* Fix variable naming
* Fix 1d pooling for OpenCL
* Change support logic, remove unnecessary variable, split the tests
* Remove other depricated variables
* Fix warning. Check tests
* Change support check logic
* Change support check logic, 2
2020-11-24 16:52:45 +00:00
Alexander Alekhin
0401d5920c
Merge pull request #18845 from joegeisbauer:fix_reduce_mean_index_error
2020-11-23 17:03:47 +00:00
YashasSamaga
0f8ab0557e
enable fusion tests, update thresholds and fix missed eltwise fusions
2020-11-21 17:35:20 +05:30
Alexander Alekhin
0105f8fa38
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-11-20 20:32:00 +00:00
Joe
e05c2e0f1d
Fix Reduce Mean error for MobileNets DNN
...
Fix for index error for Reduce Mean
Correct Reduce Mean indexing error
2020-11-20 11:17:02 -06:00
Julien
ac24a72e66
Merge pull request #18841 from JulienMaille:patch-2
...
Fixing dnn Resize layer for variable input size
* Fix onnx loading of resize/upsample layers for different opset
* group all DynamicResize tests
* cleaned up scales checks
* Simplify branching
2020-11-20 11:14:00 +00:00
Liubov Batanina
b86f129393
Fixed Test_Model.DetectionOutput
2020-11-19 12:11:52 +03:00
Alexander Alekhin
ce8027c6fb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-11-17 21:56:26 +00:00
Alexander Alekhin
9485113923
pre: OpenCV 3.4.13 (version++)
2020-11-17 21:50:30 +00:00
Alexander Alekhin
9acbfc6e05
Merge pull request #18711 from alalek:dnn_fix_model_public_api
2020-11-17 21:47:59 +00:00
Alexander Alekhin
4f3130f562
Merge pull request #18145 from sl-sergei:fix_17914
2020-11-17 21:46:08 +00:00
Alexander Alekhin
f7e8dc770a
Merge pull request #18834 from l-bat:update_reducemax
2020-11-17 21:14:10 +00:00
Alexander Alekhin
34909d97b4
Merge pull request #18840 from alalek:dnn_test_skip_myriad_gather_multi_output
2020-11-17 23:45:37 +03:00
Alexander Alekhin
474a67231c
dnn(test): skip gather_multi_output test on Myriad
2020-11-17 19:52:07 +00:00
Omar Alzaibaq
a316b11aaa
Merge pull request #18220 from Omar-AE:hddl-supported
...
* added HDDL VPU support
* changed to return True in one line if any device connected
* dnn: use releaseHDDLPlugin()
* dnn(hddl): fix conditions
2020-11-17 19:47:24 +00:00
Liubov Batanina
72d06080c6
[ONNX] Added Reduce ops for batch and channel
2020-11-17 14:45:36 +03:00
Sergey Slashchinin
3cdf926454
disable Conv1d test on NGRAPH/MYRIAD
2020-11-17 14:33:39 +03:00
Alexander Alekhin
23baf1a75e
dnn: fix High-Level public API (cv::dnn::Model class)
...
- proxy selected Net methods only (don't derive from Net directly)
- default Model ctor is protected
2020-11-17 11:01:31 +00:00
Alexander Alekhin
025a9647af
Merge pull request #18830 from l-bat:issue_18785
2020-11-17 10:40:53 +00:00
Sergey Slashchinin
32e7ef8a3d
Add fixes and tests for different layers
2020-11-17 13:39:32 +03:00
Sergei Slashchinin
2b82f8f12c
Merge pull request #18296 from sl-sergei:fix_16783
...
Fix loading issue for Faster RCNN model from #16783
* Add a reproducer with multi-output Gather
* Fix an issue with ONNX graph simplifier
* fix build
* Move checks to correct class
* Minor changes for better code appearence
2020-11-17 09:52:08 +00:00
Liubov Batanina
3a184ae677
[ONNX] Added handler for int32 tensors
2020-11-17 10:17:06 +03:00
Alexander Alekhin
a7c150ec66
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-11-13 22:29:14 +00:00
Sergei Slashchinin
61144f935e
Merge pull request #18783 from sl-sergei:fix_conv1d
...
Add support for Conv1D on OpenCV backend
* Add support for Conv1D on OpenCV backend
* disable tests on other targets/backends
* Fix formatting
* Restore comment
* Remove unnecessary flag and fix test logic
* Fix perf test
* fix braces
* Fix indentation, assert check and remove unnecessary condition
* Remove unnecessary changes
* Add test cases for variable weights and bias
* dnn(conv): fallback on OpenCV+CPU instead of failures
* coding style
2020-11-13 22:22:10 +00:00
Alexander Alekhin
ef32d7fd16
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-11-10 20:09:18 +00:00
Alexander Alekhin
c3e7a23da5
Merge pull request #18752 from alalek:dnn_defines_openvino_2021.1.0
2020-11-08 18:09:52 +00:00
Alexander Alekhin
bed5debca6
dnn: use OpenVINO 2021.1 defines
2020-11-07 17:27:33 +00:00
Roman Kazantsev
bb5b628cce
Use explicit opset of Unsqueeze from nGraph
...
backporting commit eb24575e2c
2020-11-06 22:29:35 +00:00
Roman Kazantsev
eb24575e2c
Use explicit opset of Unsqueeze from nGraph
...
The change is needed due to removing default opset namespace for Unsqueeze
in the scope of this refactoring activity: https://github.com/openvinotoolkit/openvino/pull/2767
Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>
2020-11-06 09:51:40 +03:00
Alexander Alekhin
9794ff1398
next: update versions handling
2020-10-11 08:11:32 +00:00
Alexander Alekhin
e58da86efc
dnn(test): update tests for OpenVINO 2021.1 (OpenCV 4.x)
2020-10-10 21:34:15 +00:00
Alexander Alekhin
1b443219ed
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-10-09 20:09:26 +00:00
Alexander Alekhin
cdcf7e62f3
dnn(opencl): bypass unsupported fusion cases 2
2020-10-09 18:59:08 +00:00
Alexander Alekhin
718dd9f170
dnn(opencl): bypass unsupported fusion cases
2020-10-09 12:33:06 +00:00
Alexander Alekhin
e87a0baa4b
dnn(test): enable tests from issue 17953
2020-10-08 20:27:03 +00:00
Alexander Alekhin
6da05f7086
dnn(test): update tests for OpenVINO 2021.1
2020-10-08 10:22:31 +00:00
Alexander Alekhin
39d5e14c1f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-10-07 09:09:37 +00:00
Alexander Alekhin
a5f0fb6008
Merge pull request #18518 from alalek:backport_17993
2020-10-06 22:47:45 +00:00
Alexander Alekhin
037a72debd
Merge pull request #18517 from alalek:backport_18031
2020-10-06 19:56:49 +00:00
Maksim Doronin
36f61f3879
[IE][VPU]: Refactor vpu configs
...
backported commit: 7fe87d9a5b
2020-10-05 20:27:52 +00:00
Ilya Churaev
aa11f7d8a3
Removed get_output_as_single_output_node method
...
backported commit: 5fd3d36fe8
2020-10-05 20:24:21 +00:00
Alexander Alekhin
a00fe15abd
dnn: check for empty Net in .forward()
2020-10-05 06:23:47 +00:00
Alexander Alekhin
199687a1c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-10-02 15:58:45 +00:00
zhuqiang00099
a968eadbf1
fix darknet-relu bug in darknet_io.cpp
2020-10-02 06:16:38 +00:00
Alexander Alekhin
969b55036f
Merge pull request #18438 from alalek:dnn_onnx_importer_error_reporting
2020-09-29 13:49:02 +00:00
Alexander Alekhin
295afd5882
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-09-28 21:33:29 +00:00
Alexander Alekhin
c08f29c803
dnn(opencl): fix convolution kernel w/o bias with activation
2020-09-27 23:42:30 +00:00
Alexander Alekhin
e59793cc75
dnn: improve debugging of ONNX parsing errors
2020-09-27 23:04:48 +00:00
Alexander Alekhin
236ad4aeda
Merge pull request #18441 from alalek:core_check_force_string_literals
2020-09-27 23:03:18 +00:00
Alexander Alekhin
233030e417
core: force check for string literals are used in the message
2020-09-27 06:37:44 +00:00
Tomoaki Teshima
48368dc9a1
loosen threshold for Mali
2020-09-27 00:37:52 +09:00
Alexander Alekhin
220b37144b
Merge pull request #18395 from tomoaki0705:fixNativePow
2020-09-23 18:27:45 +00:00
Maksim Shabunin
c012490399
Merge pull request #18393 from mshabunin:fix-dnn-test
...
* dnn: fixed HighLevelApi tests
2020-09-23 18:26:46 +00:00
Tomoaki Teshima
74c8ccb45b
fix build error of kernel on Mali
2020-09-23 21:38:12 +09:00
NesQl
3fc1487cc9
Merge pull request #18323 from liqi-c:tengine-lite-update
...
Tengine lite update
* update tengine
* Modify for arm32 build.
* format optimization
* add teng_ befor some tengine api
* update graph_t to teng_graph_t
* update graph_t to teng_graph_t
* Code structure optimization
* optimization
* optimization
* remove space
* update tengine url
Co-authored-by: liqi <qli@openailab.com>
2020-09-23 09:34:29 +00:00
Julien
48ddb53332
Merge pull request #18386 from JulienMaille:patch-1
...
* Make sure there is a cuda device before getting it
* Update init.hpp
2020-09-23 09:15:02 +00:00
Alexander Alekhin
f52a2cf5e1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-09-19 17:03:08 +00:00
Alexander Alekhin
4fa82809df
ocl: avoid rescheduling of async kernels
2020-09-18 14:53:50 +00:00
Alexander Alekhin
3e3787ecb6
Merge pull request #18360 from tomoaki0705:fixClampFailure
2020-09-18 13:10:36 +00:00
Liubov Batanina
ebb528976f
Merge pull request #18353 from l-bat:issue_18350
...
* Fixed bug in ONNX Mul op
* Replaced node
2020-09-18 13:01:14 +00:00
Tomoaki Teshima
f77c2d700f
add explicit cast for half
2020-09-18 21:04:24 +09:00
Sergei Slashchinin
fa953e4205
Merge pull request #18316 from sl-sergei:fix_18253
...
Fix loading of ONNX models with Resize operation with Opset 11 for newer versions of Pytorch
* Add reproducer for Resize operation from newer versions of Pytorch
* Fix loading of scales parameter for Resize layer
* Change check type for better diagnostic messages
2020-09-17 11:05:22 +00:00
Alexander Alekhin
4b24ddd70d
Merge pull request #18317 from sl-sergei:restored_pr_17629
2020-09-13 12:51:41 +00:00
Shubham Singh
23e71d1aa2
fixes #17187 probably
...
Added Eltwise Layer Support
2020-09-11 18:53:42 +03:00
Liubov Batanina
b542a1804c
Support global reduce ops
2020-09-09 11:56:20 +03:00
Alexander Alekhin
a12ceb04bb
pre: OpenCV 4.5.0 (version++)
2020-09-08 06:08:58 +00:00
Alexander Alekhin
50ff40d684
pre: OpenCV 3.4.12 (version++)
2020-09-06 22:26:32 +00:00
Alexander Alekhin
620629593b
Merge pull request #18270 from komakai:swift-inout-arrays
2020-09-06 20:12:16 +00:00
Alexander Alekhin
5c76f99fdd
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-09-05 19:37:38 +00:00
Alexander Alekhin
7e019af50d
checks and fixes from static code analyzers results (2)
2020-09-03 18:28:27 +00:00
Giles Payne
8b61719a9d
Swift native in/out array handling
2020-09-03 21:31:11 +09:00
Alexander Alekhin
fa11b98800
Merge pull request #18255 from alalek:backport_18243
2020-09-02 22:50:21 +00:00
Alexander Alekhin
64c67a93d3
Merge pull request #18246 from YashasSamaga:dnn-permute-fix-unwanted-ocl-init
2020-09-02 21:15:19 +00:00
Alexander Alekhin
1f2c83845d
backport: checks and fixes from static code analyzers results
...
original commit: 71f665bd8c
2020-09-02 19:05:47 +00:00
Alexander Alekhin
71f665bd8c
checks and fixes from static code analyzers results
2020-09-02 21:59:34 +03:00
Liubov Batanina
2349a09736
Support Reshape with zero dim
2020-09-02 11:58:43 +03:00
YashasSamaga
1df533c914
fix typo in fusion tests
2020-09-02 14:25:36 +05:30
YashasSamaga
44bf748479
do not allocate UMat in non-OpenCL targets
2020-09-02 12:18:41 +05:30
Alexander Alekhin
ba147d2be2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-08-26 15:51:25 +00:00
Alexander Alekhin
792722865f
Merge pull request #17919 from zhaoyue-zephyrus:flownet2_with_anysize
2020-08-26 11:43:17 +00:00
Sergei Slashchinin
9aa401a7d0
Merge pull request #17978 from sl-sergei:fix_17516_17531
...
* Fix ONNX loading in issues opencv#17516, opencv#17531
* Add tests for Linear and Matmul layers
* Disable tests for IE versions lower than 20.4
* Skip unstable tests with OpenCL FP16 on Intel GPU
* Add correct test filtering for OpenCL FP16 tests
2020-08-26 10:15:59 +00:00
Liubov Batanina
d392b11dfb
Supported ONNX Pow op
2020-08-24 11:20:18 +03:00
Alexander Alekhin
41548a091b
Merge pull request #17993 from Maxim-Doronin:vpu/mdoronin/refactor_vpu_configs
2020-08-17 19:20:04 +00:00
Alexander Alekhin
b45273eccb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-08-14 19:45:45 +00:00
Liubov Batanina
ad63d24dba
Merge pull request #18096 from l-bat:update_onnx_importer
...
* Added ReduceSum to ONNX importer
* Fix comments
* Fix Mul
2020-08-14 16:49:42 +00:00
Alexander Alekhin
3b5813c035
Merge pull request #18078 from l-bat:fix_matmul
2020-08-14 13:46:46 +00:00
Liubov Batanina
339b963e6b
Fix MatMul and Add axes
2020-08-14 11:18:58 +03:00
Maksim Doronin
7fe87d9a5b
[IE][VPU]: Refactor vpu configs
2020-08-13 15:25:01 +03:00
Yashas Samaga B L
2171cae8ff
Merge pull request #17976 from YashasSamaga:dnn-fusion-tests-fix-ocl
...
dnn: add exhaustive fusion tests, enable more eltwise fusions
* add eltwise fusion tests, enable more eltwise fusions
* merge weighted eltwise tests with eltwise tests
2020-08-13 10:55:41 +00:00
Liubov Batanina
f3cebb3e1b
Merge pull request #18077 from l-bat:reduce_sum
...
* Supported ReduceSum op
* Skip test
2020-08-12 14:32:16 +00:00
zhaoyue-zephyrus
e231be86b7
support flownet2 with arbitary input size
...
revise default proto to match the filename in documentations
fix a bug
beautify python codes
fix bug
beautify codes
add test samples with larger/smaller size
remove unless code
using bytearray without creating tmp file
remove useless codes
2020-08-12 00:50:58 +08:00
Alexander Alekhin
b4e9b4fe7d
Merge pull request #18060 from YashasSamaga:cuda4dnn-fix-detection-output-cterr
2020-08-10 20:26:50 +00:00
Alexander Alekhin
2ffe15f22f
Merge pull request #18031 from ilyachur:feature/ichuraev/remove_goe
2020-08-10 17:36:58 +00:00
YashasSamaga
f0149cdae2
fix compile-time errors, disable unsupported tests
2020-08-09 14:43:20 +05:30
Alexander Alekhin
fa25faa2d2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-08-06 14:15:52 +00:00
Liubov Batanina
6226ea0085
Fix bug in ONNX Gather op
2020-08-06 15:47:34 +03:00
Vadim Pisarevsky
1537ecd931
* added depth-wise convolution; gives ~20-30% performance improvement in MobileSSD networks
...
* hopefully, eliminated compile warnings, errors, as well as failure in one test
* * fixed a few typos
* decreased buffer size in some cases
* added more optimal im2row branch in the case of 1x1 convolutions
* tuned fastConv to reduce the number of passes over arrays
backport of commit 77b01deb80
2020-08-04 17:34:48 +00:00
Alexander Alekhin
5b5c42d2c7
Merge pull request #18027 from dkurt:dnn_backport_ngraph
2020-08-04 16:24:11 +00:00
Alexander Alekhin
161890dad4
Merge pull request #18017 from danielenricocahall:add-relu-to-darknet
2020-08-04 16:17:07 +00:00
Ilya Churaev
5fd3d36fe8
Removed get_output_as_single_output_node method
2020-08-04 08:18:38 +03:00
danielenricocahall
8457e471fd
add relu as activation option in darknet
...
add relu option
add relu as activation option in darknet
simplify the setParams if-else ladder
add relu as activation option in darknet
correct activation_param type
format
format
add relu as activation option in darknet
spacing
spacing
add relu as activation option in darknet
2020-08-03 19:19:35 -04:00
Ilya Churaev
246de2b7f5
Replaced copy_with_new_args to clone_with_new_inputs
2020-08-03 23:08:29 +03:00
Ilya Churaev
e8c26963e9
Fixed removing is_parameter, is_constant, is_output
2020-08-03 23:08:22 +03:00
Alexander Alekhin
27b2059662
Merge pull request #18011 from YashasSamaga:cuda4dnn-feature-mvn
2020-08-03 18:25:14 +00:00
Alexander Alekhin
a28533933f
Merge pull request #17998 from dkurt:dnn_fix_ngraph
2020-08-03 18:23:11 +00:00
Liubov Batanina
d695208727
Merge pull request #17967 from l-bat:non_const_weights_for_conv
...
* Supported convolution with non-const weights
* Fix opencl blobs
* Update tests
2020-08-03 18:02:49 +00:00
Alexander Alekhin
65b02cc8f2
Merge pull request #17742 from SoheibKadi/DetectionOutput_layer_doc
...
Adding comment from source code to DetectionOutputLayer class documentation
2020-08-03 17:17:04 +03:00
Alexander Alekhin
1c8ee3f957
Merge pull request #17885 from alalek:dnn_ocl_slice_update
...
DNN: OpenCL/slice update
* dnn(ocl/slice): make slice kernel VTune friendly
- more unique names
- inline code of copy functions
* dnn(ocl/slice): prefer to spawn more work groups
- even in case with 1D copy
- perf improvement up to 2x of kernel time (due to changed configuration 128x1x1 => 128x32x1)
* dnn(ocl/slice): cache kernel exec info
2020-08-03 14:13:34 +00:00
Alexander Alekhin
1192734131
Merge pull request #17882 from komakai:objc-contrib-wrappers
2020-08-03 11:10:37 +00:00
Dmitry Kurtaev
cf8f65d806
Do not use size_t for nGraph layers
2020-08-02 20:50:44 +03:00
YashasSamaga
a3106d424b
add MVNOp
2020-08-02 12:44:35 +05:30
Vadim Pisarevsky
77b01deb80
Merge pull request #17858 from vpisarev:dnn_depthwise_conv
...
* added depth-wise convolution; gives ~20-30% performance improvement in MobileSSD networks
* hopefully, eliminated compile warnings, errors, as well as failure in one test
* * fixed a few typos
* decreased buffer size in some cases
* added more optimal im2row branch in the case of 1x1 convolutions
* tuned fastConv to reduce the number of passes over arrays
2020-08-01 15:05:05 +03:00
Yashas Samaga B L
f53f491cd2
Merge pull request #17939 from YashasSamaga:cuda4dnn-fix-eltwise-fusion
...
* fix eltwise fusion segfault, more eltwise fusions, fix power fusion
* add assertion
2020-08-01 15:03:07 +03:00
kadi soheib
6bed5c181b
Corrected Comment as requested by reviewer.
2020-07-31 23:43:38 +03:00
YashasSamaga
ae293f27cf
add DetectionOutputOp
2020-07-29 12:28:00 +05:30
Alexander Alekhin
afe9993376
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-07-28 17:25:20 +00:00
Sinitsina
0ac2f0e04c
mish_functor_update
2020-07-23 09:02:00 +03:00
Giles Payne
4cf76754d3
Add Objective-C/Swift wrappers for opencv_contrib modules
2020-07-21 19:19:08 +09:00
Maksim Shabunin
b698d0a6ee
Merge pull request #17894 from ilyachur:feature/ichuraev/remove_copy_with_new_args
2020-07-21 08:19:42 +00:00
Ilya Churaev
aaf65bb3af
Fixed removing is_parameter, is_constant, is_output
2020-07-21 08:45:16 +03:00
Ilya Churaev
0291dd3ef8
Replaced copy_with_new_args to clone_with_new_inputs
2020-07-20 16:05:01 +03:00
Liubov Batanina
a35d4f9029
Support Gather for variable inputs
2020-07-20 14:02:45 +03:00
Ilya Churaev
a46ca98c57
Revert "Fixed removing is_parameter, is_constant, is_output"
2020-07-20 07:00:09 +03:00
Ilya Churaev
33db2ac928
Fixed removing is_parameter, is_constant, is_output
2020-07-17 14:45:11 +03:00
Alexander Alekhin
971cc3354b
dnn(test): adjust tests for OpenVINO 2020.4 (4.x branch)
2020-07-17 01:42:16 +00:00
Alexander Alekhin
9b7b22ee0e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-07-16 20:13:27 +00:00
Alexander Alekhin
b2ebd37ee2
Merge pull request #17856 from alalek:dnn_openvino_2020.4.0
2020-07-16 20:08:00 +00:00
Alexander Alekhin
09f24a851e
Merge pull request #17764 from alalek:issue_17762
2020-07-16 15:27:21 +00:00
Alexander Alekhin
81e027eef7
dnn: fix OpenCL implementation of Slice layer
2020-07-16 04:33:52 +00:00
Alexander Alekhin
1c371d07b5
dnn(test): adjust tests for OpenVINO 2020.4
2020-07-15 23:47:40 +00:00
Alexander Alekhin
55e8549839
dnn: eliminate IE deprecation warning
2020-07-15 23:39:06 +00:00
Alexander Alekhin
435b6df989
dnn: use OpenVINO 2020.4 defines
...
original commit: 2813aa7eb9
2020-07-15 20:13:40 +00:00
Alexander Alekhin
cd0f0384ef
Merge pull request #17788 from YashasSamaga:cuda4dnn-nice-build
2020-07-15 12:25:23 +00:00
Dmitry Kurtaev
cc584760d3
Fix TensorFlow->ONNX imports
2020-07-15 14:36:13 +03:00
Alexander Alekhin
e5e767abc1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-07-13 19:54:49 +00:00
YashasSamaga
1949056423
improved diagnostics for build issues
2020-07-13 21:09:38 +05:30
YashasSamaga
ead1dcf308
error if cuda4dnn depends are not resolved
2020-07-11 21:37:51 +05:30
Alexander Alekhin
5cb8619eca
dnn(ie): enable KEY_CPU_THREADS_NUM for Windows
2020-07-10 14:29:21 +00:00
YashasSamaga
37e2afb8f6
fix concat fusion for cuda4dnn
2020-07-09 19:40:44 +05:30
Yashas Samaga B L
d0e6d2438c
Merge pull request #17363 from YashasSamaga:cuda4dnn-eltwise-fusion2
...
cuda4dnn(conv): fuse eltwise with convolutions
* fuse eltwise with convolutions
* manually rebase to avoid bad git merge
2020-07-09 16:02:21 +03:00
Alexander Alekhin
44d473fba0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-07-08 21:03:43 +00:00
Alexander Alekhin
988bc804bf
Merge pull request #17748 from YashasSamaga:cuda4dnn-data-parallel
2020-07-08 20:20:19 +00:00
Alexander Alekhin
950a916952
Merge pull request #17752 from YashasSamaga:generalize-concat-fusion-3.4
2020-07-07 10:36:02 +00:00
Alexander Alekhin
524a2fffe9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-07-06 23:05:04 +00:00
Alexander Alekhin
6781ca7d55
Merge pull request #17685 from YashasSamaga:cuda4dnn-cudnn8-support
2020-07-06 22:48:07 +00:00
Alexander Alekhin
d62e0a3695
Merge pull request #17743 from alalek:test_17666
2020-07-06 22:36:35 +00:00
Alexander Alekhin
d5713c657b
dnn(slice): disable buggy OCV/OCL implementation
2020-07-06 21:36:19 +00:00
Alexander Alekhin
99c4b76a6d
dnn(test): add YOLOv4-tiny tests
2020-07-06 21:36:19 +00:00
Alexander Alekhin
0970ef57bd
Merge pull request #17754 from YashasSamaga:cuda4dnn-slice-concat-copy-reduction
2020-07-06 20:00:52 +00:00
Ilya Churaev
d69a7a3bbf
Fixed header paths for some nGraph ops
...
* Added dependency on IE version
backport of commit: 992c908b56
2020-07-06 19:51:57 +00:00
Ilya Churaev
992c908b56
Merge pull request #17756 from ilyachur:feature/ichuraev/fix_ngraph_headers
...
* Fixed header paths for some nGraph ops
* Added dependency on IE version
2020-07-06 08:11:59 +00:00
YashasSamaga
cbdaa93e54
reduce slice, concat to copy; enable more concat fusions
2020-07-05 20:52:35 +05:30
YashasSamaga
b7eec216e9
generalize axis for concat fusion
2020-07-04 18:57:28 +05:30
YashasSamaga
4988e131fd
transfer output blobs in background
2020-07-04 12:55:12 +05:30
kadi soheib
17c430da88
Updated comment.
2020-07-04 06:37:59 +03:00
kadi soheib
96a501c08b
Adding comment from source code to documentation.
2020-07-04 06:37:58 +03:00
Liubov Batanina
65dbbf712d
Merge pull request #17733 from l-bat:tiny_yolov4
...
* Supported yolov4-tiny
* Added comments
2020-07-03 18:07:08 +00:00
YashasSamaga
62a63021c7
add cuDNN 8 support
2020-06-30 21:51:23 +05:30
cyy
206c843f36
Merge pull request #17499 from cyyever:fix_CUDA11
...
Fix cuda11
* use cudnn_version.h to detect version when it is available
* remove nppi from CUDA11
* use ocv_list_filterout
* dnn(cuda): temporary disable CUDNN 8.0
2020-06-27 20:34:44 +00:00
Ilya Lavrenov
e58ce89b10
Conditional compilation for IR v7 support
...
backported commit 86905754e4
2020-06-25 10:05:14 +00:00
Ilya Lavrenov
86905754e4
Conditional compilation for IR v7 support
2020-06-25 11:32:10 +03:00
Alexander Alekhin
c81d785ada
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-23 19:15:47 +00:00
Alexander Alekhin
6fb46bb34b
Merge pull request #17621 from YashasSamaga:cuda4dnn-mish-half
2020-06-23 18:44:50 +00:00
Alexander Alekhin
2e165053ef
Merge pull request #17624 from dkurt:dnn_optimize_mish
2020-06-23 18:43:51 +00:00
Dmitry Kurtaev
3bdd7bfbea
Remove deprecated Inference Engine CPU extensions
2020-06-23 14:33:22 +03:00
Ilya Lavrenov
ad5e70f94e
Conditional compilation for network reader
...
origibal commit: 63e92cccf2
2020-06-23 14:15:52 +03:00
Dmitry Kurtaev
8e3f5fb209
Remove deprecated Inference Engine CPU extensions
2020-06-23 10:10:29 +03:00
Dmitry Kurtaev
1491934d17
Optimize Mish for CPU backend
2020-06-22 23:27:47 +03:00
YashasSamaga
6573b9ace0
use fp32 mish for fp16 mish
2020-06-22 19:09:36 +05:30
Ilya Lavrenov
63e92cccf2
Conditional compilation for network reader
2020-06-22 11:45:56 +03:00
Liubov Batanina
85c0c8c7ed
Disabling dafault NMS in yolo layer
2020-06-19 14:34:13 +03:00
Alexander Alekhin
e3d502310f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-19 07:33:50 +00:00
Yashas Samaga B L
9ba5581d17
Merge pull request #17534 from YashasSamaga:cuda4dnn-remove-unused-funcs
...
cuda4dnn: reduce CUDA version requirements to at least CUDA 9.2
* remove half2 specializations
* do not remove atomicAdd for half in CUDA 10 and below
* remove fp16.hpp
2020-06-17 09:07:52 +00:00
Liubov Batanina
d93b6be3cc
Changed StridedSlice to VariadicSplit in Region layer
2020-06-17 10:02:53 +03:00
Ilya Lavrenov
676b818d6a
Removed plugin dispatcher
...
backport of commit 74113737f3
2020-06-15 18:03:14 +00:00
Ilya Lavrenov
74113737f3
Removed plugin dispatcher
2020-06-15 16:02:52 +03:00
Alexander Alekhin
c244b456f0
Merge pull request #17540 from YashasSamaga:cuda4dnn-update-mish
2020-06-14 11:08:53 +00:00
YashasSamaga
87ab4ee567
improve mish performance and accuracy
2020-06-13 16:53:27 +05:30
Alexander Alekhin
0cbaaba4b1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-12 22:20:50 +00:00
Alexander Alekhin
1644af841b
Merge pull request #17536 from ilya-lavrenov:remove-error-listener
2020-06-12 22:18:04 +00:00
Ilya Lavrenov
9697e3ac24
Removed error lisneter usage
2020-06-12 20:29:11 +00:00
Alexander Alekhin
d2a9efd039
dnn: use OpenVINO 2020.3 defines
2020-06-12 20:24:08 +00:00
YashasSamaga
265acccd56
allow multiple inputs to resize, fix tests
2020-06-11 19:31:48 +05:30
Maksim Shabunin
9096b1c768
dnn/NGraph: added nullptr checks
2020-06-10 13:48:24 +03:00
Maksim Shabunin
7ce518106b
dnn/NGraph: added nullptr checks
2020-06-09 11:10:36 +03:00
Alexander Alekhin
5f3012fc9a
pre: OpenCV 4.4.0 (version++)
2020-06-09 02:27:13 +00:00
Alexander Alekhin
a43e3bebe6
pre: OpenCV 3.4.11 (version++)
2020-06-08 18:46:27 +00:00
Giles Payne
02385472b6
Merge pull request #17165 from komakai:objc-binding
...
Objc binding
* Initial work on Objective-C wrapper
* Objective-C generator script; update manually generated wrappers
* Add Mat tests
* Core Tests
* Imgproc wrapper generation and tests
* Fixes for Imgcodecs wrapper
* Miscellaneous fixes. Swift build support
* Objective-C wrapper build/install
* Add Swift wrappers for videoio/objdetect/feature2d
* Framework build;iOS support
* Fix toArray functions;Use enum types whenever possible
* Use enum types where possible;prepare test build
* Update test
* Add test runner scripts for iOS and macOS
* Add test scripts and samples
* Build fixes
* Fix build (cmake 3.17.x compatibility)
* Fix warnings
* Fix enum name conflicting handling
* Add support for document generation with Jazzy
* Swift/Native fast accessor functions
* Add Objective-C wrapper for calib3d, dnn, ml, photo and video modules
* Remove IntOut/FloatOut/DoubleOut classes
* Fix iOS default test platform value
* Fix samples
* Revert default framework name to opencv2
* Add converter util functions
* Fix failing test
* Fix whitespace
* Add handling for deprecated methods;fix warnings;define __OPENCV_BUILD
* Suppress cmake warnings
* Reduce severity of "jazzy not found" log message
* Fix incorrect #include of compatibility header in ios.h
* Use explicit returns in subscript/get implementation
* Reduce minimum required cmake version to 3.15 for Objective-C/Swift binding
2020-06-08 18:32:53 +00:00
Alexander Alekhin
7722a2b8a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-04 17:58:34 +00:00
Alexander Alekhin
08d1c54364
Merge pull request #17469 from l-bat:fix_virtual_try_on
2020-06-04 10:32:30 +00:00
Liubov Batanina
5ffc5bca7c
Fixed virtual try on sample
2020-06-04 09:41:24 +03:00
Alexander Alekhin
d60524ecfa
Merge pull request #17447 from alalek:dnn_ie_extract_layers
2020-06-02 12:40:06 +00:00
Alexander Alekhin
be1a121d0d
dnn(ie): fix layers extraction
2020-06-01 21:57:39 +00:00
Alexander Alekhin
8de176988d
Merge pull request #17439 from alalek:fix_dnn_test_required_file
2020-05-31 19:51:56 +00:00
Alexander Alekhin
79c5d07abe
dnn(test): file 'dnn/efficientdet-d0.pb' is optional
2020-05-31 16:18:37 +00:00
Alexander Alekhin
740f6628ec
Merge pull request #17419 from YourButterfly:fix_divide_zero_in_darknet_3_4
2020-05-29 17:32:48 +00:00
YourButterfly
f7daa9e4f5
chk divide 0
2020-05-29 09:54:46 +08:00
Alexander Alekhin
c3e8a82c9c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-28 23:53:54 +00:00
Liubov Batanina
d3aaf2d3a3
Merge pull request #17371 from l-bat:nms_model
...
* Fix NMS bug in DetectionModel
* Fixed comments
* Refactoring
2020-05-28 22:54:19 +00:00
Alexander Alekhin
e58e545584
Merge pull request #17392 from alalek:dnn_test_yolov4
2020-05-28 22:52:21 +00:00
Alexander Alekhin
319db07b6b
Merge pull request #17384 from dkurt:efficientdet
2020-05-28 22:48:52 +00:00
Dmitry Kurtaev
d9bada9867
dnn: EfficientDet
2020-05-28 17:23:42 +03:00
Alexander Alekhin
6b89154afd
dnn(test): add YOLOv4 tests
2020-05-28 13:27:40 +00:00
Alexander Alekhin
515a06cedf
Merge pull request #17359 from YashasSamaga:cuda4dnn-fix-default-stream-wrappers
2020-05-27 11:28:09 +00:00
Alexander Alekhin
7d9e1be588
Merge pull request #17388 from alalek:dnn_update_network_dump
2020-05-27 07:55:32 +00:00
Liubov Batanina
ba3cf47600
Merge pull request #17386 from l-bat:tf_clamp_subgraph
...
* Added ClipByValue subgraph
* Return const nodes
2020-05-26 19:01:47 +00:00
Liubov Batanina
b236f10792
Switch ngraph::op::v1::Multiply to v0
2020-05-26 16:59:50 +03:00
Alexander Alekhin
f0bef94a03
dnn: update network dump code, include ngraph serialization
2020-05-26 12:49:22 +00:00
Alexander Alekhin
88d8a48b09
Merge pull request #17374 from alalek:dnn_fix_build
2020-05-25 18:46:15 +00:00
Alexander Alekhin
73aa5f567b
dnn: *_DENORMALS_ZERO_MODE is defined for SSE3
2020-05-25 17:55:36 +00:00
YashasSamaga
b3a261c7ce
set stream at the site of creation
2020-05-24 19:01:17 +05:30
Alexander Alekhin
6b0fff72d9
Merge pull request #17349 from YashasSamaga:cuda4dnn-general-fixes
2020-05-23 18:18:55 +00:00
Alexander Alekhin
21e28adb87
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-22 19:50:14 +00:00
Alexander Alekhin
a9b030591b
Merge pull request #17295 from dkurt:dnn_fusion_ftz
2020-05-22 18:49:43 +00:00
YashasSamaga
57ca10636c
do not create redundant handles
2020-05-22 19:52:20 +05:30
Liubov Batanina
d991c22090
Merge pull request #16575 from l-bat:flownet2
...
Support FlowNet2 model
* Support DataAugmentation layer
* Fix warnings
* Fix comments
* Support Correlation layer
* TEST
* Support Correlation layer
* Supported Accum and FlowWarp layers
* Supported ChannelNorm layer
* Supported Resample with inputs.size() > 1
* Fixed comments
* Refactoring
* Added tests
* Add resample test
* Added asserts in resize layer
* Updated DataAugmentation layer
* Update convolution layer
* Refactoring
* Fix data augmentation layer
* Fix caffe importer
* Fix resize
* Switch to Mat ptr
* Remove useless resize type
* Used ResizeLayer in Accum
* Split ChannelNormLayer
* Delete duplicate assert
* Add sample
* Fix sample
* Added colormap
2020-05-19 12:29:50 +00:00
Alexander Alekhin
593af7287b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-18 17:50:16 +00:00
Dmitry Kurtaev
b5035ce991
Increase test threshold for YOLOv3 on OCL FP16
2020-05-18 19:06:15 +03:00
Dmitry Kurtaev
68d59a2913
Flush to zero Convolution denormal weights
2020-05-15 23:44:34 +03:00
Maksim Shabunin
7c41b54e3d
Fixed build with latest Vulkan headers
2020-05-14 23:20:28 +03:00
Alexander Alekhin
c8689d9d0a
Merge pull request #17288 from dkurt:dnn_tf_resize_down
2020-05-14 07:08:41 +00:00
Alexander Alekhin
bcf96d637e
Merge pull request #17284 from dkurt:dnn_bn_fusion
2020-05-14 06:57:36 +00:00
Dmitry Kurtaev
b4a6aa335d
TensorFlow bilinear resize downscale
2020-05-13 23:59:20 +03:00
Dmitry Kurtaev
df305e83fa
Fix BatchNorm reinitialization after fusion
2020-05-13 22:15:36 +03:00
Alexander Alekhin
06bff34a6b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-12 19:24:28 +00:00
Liubov Batanina
b27ae9c63b
Switch v1::Multiply to v0::Multiply
2020-05-12 16:05:03 +03:00
Liubov Batanina
79f8b7fd73
Merge pull request #17233 from l-bat:onnx_bn
...
* Added ONNX BatchNorm subgraph
* Move removing constant inputs to addConstantNodesForInitializers
* Added initializers to ONNXGraphWrapper
2020-05-12 15:33:57 +03:00
Alexander Alekhin
713577b257
Merge pull request #17258 from YashasSamaga:cuda4dnn-hotfix-slice-pr17231-pr17222
2020-05-11 19:25:50 +00:00
YashasSamaga
45a6386e45
port pr17222 changes to CUDA backend
2020-05-11 11:01:01 +05:30
YashasSamaga
3c35b563d7
add scale_x_y parameter to region
2020-05-10 16:53:28 +05:30
Alexander Alekhin
066259b656
Merge pull request #17118 from l-bat/concat_3d
...
Added NDHWC Concat support for TensorFlow
* Supported TF concat 3d
* Skip myriad
* Fix test
2020-05-09 22:24:06 +03:00
Yashas Samaga B L
d981d04c76
Merge pull request #17200 from YashasSamaga:cuda4dnn-general-opt1
...
cuda4dnn: optimizations for swish, mish, sigmoid, region, resize based ops, transpose, identity-conv fusion
* bunch of optimizations
* more accurate implementation for mish
2020-05-09 17:20:30 +00:00
Alexander Alekhin
09799402f9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-06 19:53:51 +00:00
Dmitry Kurtaev
8b13b85c5e
dnn: Slice with variable input shapes
2020-05-05 13:35:17 +03:00
Liubov Batanina
a5696da9ec
Merge pull request #17185 from l-bat:yolo_v4
...
* Support Yolov4
* Skip Mish on OpenVINO 2020.2
* Revert Mish
* Refactoring
2020-04-30 16:53:44 +03:00
Alexander Alekhin
b805115c1a
dnn(test): update skip tests on Win32 configuration
2020-04-29 20:02:13 +00:00
Alexander Alekhin
c722625f28
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-28 16:53:19 +00:00
Dmitry Kurtaev
25ec4ce6f1
PReLU from Tensorflow
2020-04-28 00:01:21 +03:00
Alexander Alekhin
3f38edfd61
Merge pull request #17161 from alalek:cmake_protobuf_fix
2020-04-27 12:24:37 +00:00
Alexander Alekhin
9181ecfc7b
cmake: fix protobuf handling
2020-04-27 02:11:19 +00:00
Liubov Batanina
4bf94cb5d1
Fix test
2020-04-26 20:42:11 +03:00
Alexander Alekhin
288fa70ed9
dnn(protobuf): backport AllowUnknownField(), SetRecursionLimit()
...
- limit recursion in SkipField*() calls
2020-04-25 20:45:43 +00:00
Alexander Alekhin
152e6476d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-24 19:02:39 +00:00
YashasSamaga
aff2c7c43c
handle redundant slice in SliceOp
2020-04-24 12:54:17 +05:30
Alexander Alekhin
2df978b8e7
Merge pull request #17134 from alalek:dnn_ie_avoid_conversion_to_legacy
2020-04-23 22:39:45 +00:00
Alexander Alekhin
10808ccbb4
Merge pull request #17129 from alalek:dnn_myriad_tests
2020-04-23 19:41:15 +00:00
Alexander Alekhin
f756923271
dnn(ie): avoid conversion to legacy CNNNetworkImpl
2020-04-23 19:11:33 +00:00
Alexander Alekhin
83c4378d5d
dnn(test): skip failed NGRAPH/MYRIAD tests
2020-04-22 15:00:23 +00:00
Liubov Batanina
1c1762d3f6
Skip myriad
2020-04-22 09:52:20 +03:00
ashishiva3@gmail.com
e0ac0cfbe2
add fused batchNorm Upsample
2020-04-22 08:24:17 +05:30
Alexander Alekhin
bfcc136dc7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-21 21:32:51 +00:00
Alexander Alekhin
1a17f402a4
Merge pull request #17030 from ashishkrshrivastava:onnximporter
2020-04-21 21:02:41 +00:00
Liubov Batanina
aa08900ac8
Supported TF concat 3d
2020-04-21 15:15:22 +03:00
AshihsKrShrivastava
d37180a2c4
modification for upsample node fused from unfused Resize subgraph
2020-04-21 15:03:00 +05:30
Liubov Batanina
8badf7f354
Merge pull request #17112 from l-bat:ie_region
...
* Support nGraph Region
* Support region since OpenVINO 2020.2
* Skip myriad
2020-04-21 09:26:58 +00:00
Dmitry Kurtaev
908bf935f7
Flexible inputs for OpenVINO IR models
2020-04-18 20:00:22 +03:00
Alexander Alekhin
2cef100303
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-16 18:28:27 +00:00
Alexander Alekhin
c007228d0f
Merge pull request #17075 from alalek:dnn_updates_from_openvino_2020.2
2020-04-16 12:19:58 +00:00
Dmitry Kurtaev
5e5385a814
Remove NodeVector for nGraph
2020-04-16 11:13:49 +03:00
Alexander Alekhin
ef68cc3d5f
dnn: use OpenVINO 2020.2 defines
...
original commit: 45263d7642
2020-04-15 11:14:43 +00:00
Alexander Alekhin
f6de25b6cb
Merge pull request #17060 from dkurt:dnn_align_ie_pool
2020-04-14 15:15:44 +00:00
Ilya Lavrenov
91b0100287
Fixed compilation when NN builder is not built
2020-04-14 15:05:01 +03:00
Dmitry Kurtaev
870a775d7d
Align DLIE and nGraph average pooling layers
2020-04-14 13:54:54 +03:00
Alexander Alekhin
ca9756f6a1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-13 20:00:12 +00:00
Dmitry Kurtaev
d3f9ad1145
Enable ONNX SSD from https://github.com/amdegroot/ssd.pytorch
2020-04-13 15:12:27 +03:00
AshihsKrShrivastava
bef6b6282c
ReflecitonPad2d and ZeroPad2d Subgraph fusion added
2020-04-11 07:14:05 +05:30
Alexander Alekhin
1537a5f253
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-09 19:19:20 +00:00
Alexander Alekhin
06bf845783
Merge pull request #16979 from dkurt:dnn_fused_resize_conv
2020-04-08 13:29:51 +00:00
Alexander Alekhin
b8579f12be
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-08 10:19:09 +00:00
Dmitry Kurtaev
21ed892489
Fix Elu import from ONNX
2020-04-08 12:09:45 +03:00
Alexander Alekhin
adf54d41d5
Merge pull request #16905 from dkurt:dnn_tf2_keras
2020-04-07 14:59:42 +00:00
Liubov Batanina
734771418e
Merge pull request #16840 from l-bat:matmul_inputs
...
* Supported FullyConnected layer with two inputs
* Skipped test
* Fix conditions
* Added OpenCL support
* Supported ReduceMean3D
* Supported Expand layer
* Fix warning
* Added Normalize subgraph
* refactoring
* Used addLayer
* Fix check
* Used addLayer
* Skip failed test
* Added normalize1 subgraph
* Fix comments
2020-04-07 14:12:18 +00:00
Alexander Alekhin
ce5626db45
Merge pull request #16878 from dkurt:fix_16877
2020-04-06 18:14:35 +00:00
Alexander Alekhin
763a1d7392
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-06 15:57:43 +00:00
Liubov Batanina
a448d3a6aa
Fix ENet test with OpenVINO 2020.2
2020-04-06 17:29:43 +03:00
Dmitry Kurtaev
b36eba7fab
Support FusedResizeAndPadConv2D from TensorFlow
2020-04-04 16:02:17 +03:00
Dmitry Kurtaev
8574a757f9
Case sensitive dnn layers types
2020-04-04 15:03:56 +03:00
Alexander Alekhin
e661ad2a67
eliminate build warnings
2020-03-27 11:39:07 +00:00
Alexander Alekhin
b4b4d21212
eliminate build warnings
2020-03-26 19:18:09 +00:00
Dmitry Kurtaev
7e4b2057f2
Import TF2.0 network from Keras
2020-03-25 15:34:28 +03:00
Alexander Alekhin
ea34b2fefb
Merge pull request #16888 from YashasSamaga:cuda4dnn-redundant-act-fusion-check
2020-03-24 08:41:11 +00:00
Alexander Alekhin
0b4c101e8a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-23 16:54:35 +00:00
Alexander Alekhin
e8c7d61752
Merge pull request #16817 from dkurt:dnn_onnx_lstm
2020-03-23 16:22:17 +00:00
YashasSamaga
4e8cd4629c
fix CUDNN_STATUS_NOT_SUPPORTED, remove redundant fusion checks
2020-03-23 19:47:00 +05:30
Dmitry Kurtaev
467c3ef0ac
Add checks for LSTM initial h and c
2020-03-23 16:28:55 +03:00
YashasSamaga
2aeb32d2d1
fix segfaults, support bias in untrainable mode, support batches in untrainable mode
2020-03-22 22:18:52 +05:30
Dmitry Kurtaev
8433620295
Bidirectional LSTM
2020-03-22 00:56:48 +03:00
Alexander Alekhin
4cdb4652cf
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-20 21:41:15 +00:00
Alexander Alekhin
dbb30134bc
Merge pull request #16835 from YashasSamaga:cuda4dnn-hotfix-memory-lock
2020-03-19 16:50:39 +00:00
Pavel Rojtberg
66cf55ea1f
dnn: expose only float variant of NMSBoxes for bindings
...
the float variant was always shadowed by the int version as
Rect2d is implicitly convertible to Rect.
This swaps things which is fine, as the vector of boxes was always
copied and the computation was done in double.
2020-03-19 12:36:35 +01:00
Dmitry Kurtaev
11d565ca62
Fix LSTM from ONNX with batch==1
2020-03-18 00:00:24 +03:00
Dmitry Kurtaev
8d69dbdf49
LSTM from ONNX works
2020-03-17 22:05:57 +03:00
Dmitry Kurtaev
14da5ec311
LSTM scalar
2020-03-17 22:01:49 +03:00
Liubov Batanina
718d7e4b04
Merge pull request #16715 from l-bat:slice_onnx
...
* Support Slice layer with multiple inputs
* Add test
* Supported Resize from PyTorch
* Rewrite test
* Remove Cast layer (supported in #16735 )
* Support ConstantOfShape
* Fix tests
* Fix coments
* Remove useless condition
* Fixed failed tests
2020-03-17 17:31:01 +03:00
YashasSamaga
034a43e7f7
release and relock on wrapper resize
2020-03-17 16:08:04 +05:30
Alexander Alekhin
ca23c0e630
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-17 13:23:33 +03:00
Dmitry Kurtaev
7f0d90a525
Fix memory leak in Python custom dnn layers
2020-03-16 16:54:55 +03:00
Alexander Alekhin
00925ad795
Merge pull request #16809 from alalek:dnn_ie_separate_core_instances
2020-03-14 13:47:50 +00:00
Alexander Alekhin
683910f579
Merge pull request #16760 from dkurt:dnn_mobilenet_v3
2020-03-14 13:38:06 +00:00
Liubov Batanina
2645ee90ca
Merge pull request #16735 from l-bat:flatten_const_onnx
...
* Supported Flatten for constant nodes
* Added default axis
* Refactoring
* Refactoring
* Added cast layer
* Fix comments
* Add Cast for layers
2020-03-14 11:05:49 +00:00
Alexander Alekhin
9b64eadcb6
dnn(ie): separate IECore for different devices
...
- HETERO plugin doesn't switch well between devices
2020-03-13 18:49:28 +03:00
Alexander Alekhin
7d1c42afe1
dnn: fix merge mistake in scale_layer.cpp
2020-03-12 13:07:33 +03:00
Alexander Alekhin
d00e58cdb0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-10 22:49:51 +00:00
Alexander Alekhin
510a8520c7
Merge pull request #16746 from alalek:dnn_switch_ie_backend_ngraph
2020-03-10 13:52:33 +00:00
Alexander Alekhin
db95aec4a7
dnn(ie): switch to nGraph backend by default
2020-03-10 14:33:22 +03:00
Yashas Samaga B L
490908f0ff
Merge pull request #16436 from YashasSamaga:feature-enetb0-yolo
...
dnn(darknet-importer): add grouped convolutions, sigmoid, swish, scale_channels
* update darknet importer to support enetb0-yolo
* remove dropout (pr16438) and fix formatting
* add test for scale_channels
* disable batch testing for scale channels
* do not set LayerParams::name
* merge all activations into setActivation
2020-03-10 12:45:19 +03:00
Alexander Alekhin
9b3be01b83
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-09 20:27:34 +00:00
NesQl
0bcdf7d03e
Merge pull request #16724 from liqi-c:3.4-tengine
...
* Add Tengine support .
* Modify printf to CV_LOG_WARNING
* a few minor fixes in the code
* Renew Tengine version
* Add header file for CV_LOG_WARNING
* Add #ifdef HAVE_TENGINE in tengine_graph_convolution.cpp
* remove trailing whitespace
* Remove trailing whitespace
* Modify for compile problem
* Modify some code style error
* remove whitespace
* Move some code style problem
* test
* add ios limit and build problem
* Modified as alalek suggested
* Add cmake 2.8 support
* modify cmake 3.5.1 problem
* test and set BUILD_ANDROID_PROJECTS OFF
* remove some compile error
* remove some extra code in tengine
* close test.
* Test again
* disable android.
* delete ndk version judgement
* Remove setenv() call . and add License information
* Set tengine default OFF. Close test .
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
2020-03-09 14:59:23 +00:00
Dmitry Kurtaev
b927ce18b2
Support for MobileNetV3-SSD from TensorFlow
2020-03-08 21:09:21 +03:00
Alexander Alekhin
619180dffd
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-06 20:41:30 +00:00
Alexander Alekhin
a76c72acdd
Merge pull request #16738 from dkurt:onnx_broadcast
2020-03-06 19:04:43 +00:00
Alexander Alekhin
6271192a32
Merge pull request #16694 from alalek:dnn_disable_nn_builder_api
2020-03-06 13:18:41 +00:00
Alexander Alekhin
094a5b0cba
Merge pull request #16719 from alalek:dnn_disable_nn_builder_api_3.4
2020-03-06 12:26:48 +00:00
Dmitry Kurtaev
9e332dc5fb
Broadcasting from ONNX
2020-03-06 00:58:59 +03:00
Alexander Alekhin
d4a17da7b2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-04 20:49:09 +00:00
Liubov Batanina
9ed1332355
Merge pull request #16722 from l-bat:reshape_opset_11
...
* Supported Div op for constants
* Added Mul test
2020-03-04 11:27:10 +03:00
ashishiva3@gmail.com
e18d5e94c7
Gather-Cast, Mul-Cast fusion
2020-03-03 21:08:28 +05:30
Alexander Alekhin
124bf8339f
dnn(IE): use HAVE_DNN_IE_NN_BUILDER_2019 for NN Builder API code
...
- CMake option: OPENCV_DNN_IE_NN_BUILDER_2019
2020-03-03 08:07:54 +00:00
Alexander Alekhin
29d214474f
dnn(IE): use HAVE_DNN_IE_NN_BUILDER_2019 for NN Builder API code
...
- CMake option: OPENCV_DNN_IE_NN_BUILDER_2019
2020-03-03 07:45:09 +00:00
Liubov Batanina
b1b78aedd2
Skipped ResizeUnfused test on Builder API
2020-03-02 15:45:29 +03:00
Alexander Alekhin
599a595c6f
Merge pull request #16573 from ashishkrshrivastava:opencvonnx
2020-02-29 21:20:40 +03:00
ashishiva3@gmail.com
8559237d4e
ONNX: upsample subgraph fusion added
2020-02-29 15:24:06 +05:30
Yashas Samaga B L
8808aaccff
Merge pull request #16658 from YashasSamaga:cuda4dnn-refactor-activations
...
cuda4dnn(activations, eltwise, scale_shift): refactor to reduce code duplication
* refactor activations
* refactor eltwise kernels
* move all functors to functors.hpp
* remove bias1 and scale1 kernels
2020-02-29 11:46:14 +03:00
Alexander Alekhin
333a767be4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-28 18:34:37 +00:00
Alexander Alekhin
9c4b1d0a51
Merge pull request #16685 from YashasSamaga:cuda4dnn-fix-tests-pr16595
2020-02-27 20:42:45 +00:00
YashasSamaga
98b5fb4b9f
disable MaskRCNN test for CUDA_FP16
2020-02-28 15:44:37 +05:30
Alexander Alekhin
cc0066d38d
dnn(test): adjust check tolerance in Keypoints_face
2020-02-27 19:44:51 +03:00
Dmitry Kurtaev
5bbe116f89
Track Hetero execution for nGraph networks using ngraph::Function
2020-02-27 17:45:28 +03:00
Alexander Alekhin
45d073f889
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-26 20:09:03 +03:00
Dmitry Kurtaev
d8dea7896b
Merge pull request #16628 from dkurt:dnn_ngraph_custom_layers
...
* Custom layers with nGraph
* nGraph: multiple outputs from nodes
2020-02-26 17:51:18 +03:00
Alexander Alekhin
f48c84eaee
Merge pull request #16656 from alalek:issue_16655
2020-02-26 12:47:46 +00:00
Alexander Alekhin
a5d0c7b02c
Merge pull request #16650 from ashishkrshrivastava:cvdarknet
2020-02-25 12:57:11 +00:00
Alexander Alekhin
c2f5f5a202
dnn(test): configure filtering for 32-bit systems (part 2)
2020-02-24 18:18:33 +00:00
YashasSamaga
5e082ab852
resize tensor on reuse if required
2020-02-24 10:45:59 +05:30
Alexander Alekhin
fce6e7248e
Merge pull request #16629 from alalek:dnn_test_32bit
2020-02-23 17:09:31 +00:00
Alexander Alekhin
d54d01ca46
core(MatExpr): fix .type() bug
2020-02-23 17:05:05 +00:00
ashishiva3@gmail.com
2b96a485e7
Darknet_io: Parsing for cost layer added
2020-02-23 21:06:48 +05:30
Alexander Alekhin
8eafddf211
Merge pull request #16647 from YashasSamaga:cuda4dnn-hotfix-i16568
2020-02-22 22:21:56 +00:00
Alexander Alekhin
1540ae340f
dnn(test): configure filtering for 32-bit systems
2020-02-22 17:35:26 +00:00
YashasSamaga
c23ab37355
fix weights rank assertion in InnerProductOp
2020-02-22 16:59:09 +05:30
Alexander Alekhin
01048e5603
Merge pull request #16616 from alalek:dnn_fix_input_shape
...
* dnn: fix processing of input shapes
- importer: avoid using of .setInput() => .setInputShape()
- setInput: shape limitation check (partial)
* dnn(test): test .setInput() in readNet()
2020-02-21 22:39:54 +03:00
Alexander Alekhin
102ef39a27
Merge pull request #16225 from berak:dnn_pose_estimation
...
dnn: small fix in pose estimation model
2020-02-21 22:37:23 +03:00
Alexander Alekhin
96b26dc8f4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-20 19:47:27 +03:00
berak
4fdf4d380c
dnn: small fix in pose estimation model
2020-02-20 17:08:55 +01:00
Alexander Alekhin
30331eef4b
Merge pull request #16595 from dkurt:dnn_ie_mask_rcnn
2020-02-20 12:50:27 +00:00
Yashas Samaga B L
1f695c4532
Merge pull request #16161 from YashasSamaga:cuda4dnn-concat-fusion
...
cuda4dnn(concat): write outputs from previous layers directly into concat's output
* eliminate concat by directly writing to its output buffer
* fix concat fusion not happening sometimes
* use a whitelist instead of a blacklist
2020-02-20 15:43:05 +03:00
Dmitry Kurtaev
f3eef792eb
Enable Mask R-CNN with Inference Engine. Full coverage with nGraph
2020-02-20 10:13:40 +03:00
Alexander Alekhin
4b0d3316f6
Merge pull request #16617 from alalek:dnn_fix_caffe_importer
2020-02-19 10:57:27 +00:00
Alexander Alekhin
7ac7aca33b
dnn(caffe): fix net.input_dim handling in Caffe importer
2020-02-19 07:37:27 +00:00
Alexander Alekhin
1602a38fa9
Merge pull request #16572 from alalek:dnn_test_dldt_ir_v10
...
* dnn(test): test DLDT IRv10 model, drop old models
* dnn(test): don't expect bitexact results in DLDT IR tests
2020-02-18 17:57:46 +03:00
Liubov Batanina
e970eccbf1
Merge pull request #16472 from l-bat:cp_vton
...
Add CP-VTON sample
* Support resize from PyTorch
* Add CP-VTON sample
* Fix downsampling
* Fix test
* Add model links
* Add default args
* Speed up resize
* Fix TOM link
* Add default args
* Fix comments
* Set aspect ratio for input
* Update links
* Check files exist
2020-02-17 22:29:37 +03:00
Gagandeep Singh
a6f3a21256
Merge pull request #16424 from czgdp1807:issue-16370
...
* fixed Split layer in ONNXImporter
* added test for fix of split layer
* fixed tests for Split layer
* applied reviews
* updated tests
* fixed paths in tests
2020-02-15 14:12:20 +03:00
Alexander Alekhin
f3237fdc6e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-14 19:54:59 +03:00
Dmitry Kurtaev
9a4cafa319
Resolve #14566
2020-02-14 00:21:38 +03:00
Alexander Alekhin
0a91261c7f
dnn: turn off visibility workaround for OpenVINO 2020.1
2020-02-12 17:22:44 +03:00
Alexander Alekhin
d81a0da3e0
dnn: use OpenVINO 2020.1 defines
2020-02-12 17:21:08 +03:00
Alexander Alekhin
2a6637afdf
Merge pull request #16516 from alalek:dnn_dump_network
2020-02-11 16:22:32 +00:00
Alexander Alekhin
aa2777ed61
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-10 19:40:29 +03:00
Alexander Alekhin
db9f4436e0
Merge pull request #16473 from ashishkrshrivastava:opencvtf
2020-02-09 11:52:24 +03:00
ashishiva3@gmail.com
cd53144ed3
commit: Corrected end tensor_content parsing for StridedSlice layer.
2020-02-09 06:43:23 +05:30
Alexander Alekhin
eb14f9a464
Merge pull request #16463 from alalek:core_strong_ptr_alignment
2020-02-08 19:45:43 +00:00
Alexander Alekhin
0a691f7840
Merge pull request #16529 from alalek:dnn_skip_failed_ngraph_tests
2020-02-08 18:53:10 +00:00
Alexander Alekhin
8ecfb59930
dnn(test): skip failed ngraph tests
2020-02-07 22:43:40 +00:00
Alexander Alekhin
bcc9946650
Merge pull request #16438 from ashishkrshrivastava:opencvc
2020-02-07 23:17:59 +03:00
ashishiva3@gmail.com
d64529f6de
Added parsing for Connected and Dropout. Modified maxpool padding
2020-02-07 07:26:36 +05:30
Alexander Alekhin
ac0a14631d
dnn: eliminate MSVC warnings from ngraph.hpp
2020-02-06 19:53:49 +00:00
Alexander Alekhin
6eba1a4d44
dnn: auto network dump through parameter
2020-02-05 21:46:32 +00:00
Alexander Alekhin
fa4871b013
dnn: don't require setInput in .dump()
2020-02-05 21:28:07 +00:00
Alexander Alekhin
225566da7b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-04 19:49:24 +03:00
Dmitry Kurtaev
005f38fb45
Fix dnn::ResizeLayer to manage varying input shapes
2020-02-04 09:06:17 +03:00
Alexander Alekhin
2ced568d34
Merge pull request #16220 from YashasSamaga:cuda4dnn-roi-pooling-test_fix-optim
2020-01-29 20:57:15 +00:00
Alexander Alekhin
a4bd7506a5
core: CV_STRONG_ALIGNMENT macro
...
Should be used to guard unsafe type casts of pointers
2020-01-29 18:44:17 +03:00
Alexander Alekhin
560f85f8e5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-28 14:26:57 +03:00
Alexander Alekhin
5429b1f5ff
Merge pull request #16223 from l-bat:lip_jppnet
2020-01-27 19:17:43 +00:00
Liubov Batanina
4a19ac5aca
Move instruction
2020-01-27 16:18:32 +03:00
Alexander Alekhin
f8f74fc4ae
Merge pull request #16413 from l-bat:ngraph_deconv
2020-01-26 07:19:58 +00:00
Alexander Alekhin
3d5ca3ef75
Merge pull request #16418 from l-bat:ngraph_logsoftmax
2020-01-24 21:46:28 +00:00
Alexander Alekhin
bd66f76fea
Merge pull request #16356 from alalek:dnn_ie_prevent_plugins_unloading
2020-01-24 12:07:05 +00:00
Liubov Batanina
d9474648f0
Fix diff
2020-01-24 11:00:06 +03:00
Liubov Batanina
0687cffe21
Support logSoftMax
2020-01-23 15:32:16 +03:00
Liubov Batanina
a3ae69893c
Extend nGraph Deconvolution layer support
2020-01-23 15:10:42 +03:00
Liubov Batanina
55b03dcaba
Refactoring
2020-01-23 10:25:41 +03:00
Alexander Alekhin
6670e6b0bb
dnn: prevent unloading of InferenceEngine plugins
2020-01-22 19:34:32 +03:00
Alexander Alekhin
3d14dd4e39
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-22 16:58:30 +03:00
Liubov Batanina
7e5b5390ba
Fix comments
2020-01-22 14:57:54 +03:00
Alexander Alekhin
b21a861c5b
dnn(test): adjust test tolerance for MYRIAD
2020-01-22 14:42:52 +03:00
Liubov Batanina
35c24480ae
Fix axis
2020-01-22 13:36:29 +03:00
Alexander Alekhin
16d8e9e0c8
Merge pull request #16358 from ashishkrshrivastava:opencv-2
2020-01-22 09:57:41 +00:00
Liubov Batanina
832ca0734d
Refactoring
2020-01-22 10:52:40 +03:00
Liubov Batanina
fada959b4b
Fix comment
2020-01-21 10:28:50 +03:00
Liubov Batanina
c6936f5a77
Support lrn with SPATIAL_NRM
2020-01-21 10:12:05 +03:00
Liubov Batanina
d825caf18e
Update check params
2020-01-21 10:09:24 +03:00
Liubov Batanina
97455f1593
Remove useless condition
2020-01-20 17:31:58 +03:00
Liubov Batanina
08ba63da02
Add global pool flags
2020-01-20 15:37:11 +03:00
Alexander Alekhin
4e577b8d3c
Merge pull request #16378 from alalek:dnn_getMemoryShapes_error_dump_blobs
2020-01-20 10:49:17 +00:00
Alexander Alekhin
61b6d40539
Merge pull request #16377 from alalek:fix_16373
2020-01-20 10:48:21 +00:00
ashishiva3@gmail.com
f29bc22005
Convolutional padding parsing modified
2020-01-19 22:33:12 +05:30
Julien
886220b9be
Merge pull request #16273 from JulienMaille:wrapper_available_target
...
* add a wrapper for getAvailableTargets
* add java wrapper on Target enum
2020-01-17 19:24:37 +03:00
Alexander Alekhin
55d54b56bf
dnn(onnx): handle unaligned access in ONNX importer
2020-01-17 19:03:34 +03:00
Julien Maille
a696348ec5
FIX: disable dnn cuda input_shortcut on _half for CC<5.3
2020-01-17 14:21:25 +01:00
Yashas Samaga B L
d85e67d3ec
Merge pull request #16063 from YashasSamaga:cuda4dnn-shortcut-unequal
...
support eltwise sum with different number of input channels in CUDA backend
* add shortcut primitive
* add offsets in shortcut kernel
* skip tests involving more than two inputs
* remove redundant modulus operation
* support multiple inputs
* remove whole file indentation
* skip acc in0 trunc test if weighted
* use shortcut iff channels are unequal
2020-01-16 21:54:00 +03:00
Dmitry Kurtaev
8b9e8a805d
MVN support through nGraph
2020-01-16 18:15:31 +03:00
Alexander Alekhin
2638c5e9b7
dnn: dump layer's blobs on getMemoryShapes() error
2020-01-16 14:59:47 +03:00
Julien
ced3df73da
Fix: rsqrt(float) was improperly put in the ifdef for half
2020-01-16 09:21:50 +01:00
YashasSamaga
fd369a5004
fix and optimize ROIPooling
2020-01-15 22:53:48 +05:30
Alexander Alekhin
f6137292f1
Merge pull request #16357 from dkurt:dnn_ie_reset_myriad
2020-01-15 17:03:09 +00:00
Dmitry Kurtaev
d92a883de1
Different way to reset Myriad device
2020-01-15 18:52:37 +03:00
Alexander Alekhin
f6a8f7859c
Merge pull request #16354 from dkurt:dnn_ie_custom_cpu_layers
2020-01-15 15:33:18 +00:00
Julien
4e2ef8c8f5
Merge pull request #16218 from JulienMaille:cuda-dnn-for-older-gpus
...
Enable cuda4dnn on hardware without support for __half
* Enable cuda4dnn on hardware without support for half (ie. compute capability < 5.3)
Update CMakeLists.txt
Lowered minimum CC to 3.0
* UPD: added ifdef on new copy kernel
* added fp16 support detection at runtime
* Clarified #if condition on atomicAdd definition
* More explicit CMake error message
2020-01-15 18:28:37 +03:00
Dmitry Kurtaev
7c741f54fa
Wrap custom OpenCV layers to try-catch
2020-01-15 17:44:38 +03:00
Dmitry Kurtaev
0d896af8ec
Fix uninitialized value
2020-01-15 12:58:12 +03:00
Alexander Alekhin
4cb9faf6c9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-14 17:04:22 +03:00
Alexander Alekhin
a67228cd73
Merge pull request #16291 from dkurt:dnn_onnx_graph_simplifier
2020-01-14 12:45:59 +00:00
Liubov Batanina
be86338a79
Enable acrossSpatial normalizeL2 on Myriad
2020-01-14 12:51:19 +03:00
Dmitry Kurtaev
c1c84d2fd1
ONNX graphs simplifier
2020-01-14 12:45:49 +03:00
Alexander Alekhin
3f27f8cf41
Merge pull request #16232 from dkurt:dnn_ie_ngraph_fix_myriad_tests
2020-01-13 16:59:45 +00:00
Dmitry Kurtaev
8f1e36f7c1
Disable some tests for Myriad target of nGraph
...
Add lightweight IE hardware targets checks
nGraph: Concat with paddings
Enable more nGraph tests
Restore FP32->FP16 for GPU plugin of IE
try to fix buildbot
Use lightweight IE targets check only starts from R4
2020-01-13 15:35:47 +03:00
Alexander Alekhin
fb61f88b9c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-12 09:35:39 +00:00
Liubov Batanina
9ed372b297
Update get memory shapes
2020-01-10 14:09:08 +03:00
Liubov Batanina
4625337179
Add docs reduce mean
2020-01-10 12:49:06 +03:00
Liubov Batanina
e9e3af0aaa
Add global pool by axis test
2020-01-10 11:32:48 +03:00
Liubov Batanina
a33d50084d
Add global_pooling_dim flags
2020-01-10 09:01:57 +03:00
Liubov Batanina
7eba3a7c96
Add pack description
2020-01-09 13:59:35 +03:00
Alexander Alekhin
1f2b2c5242
Merge pull request #16230 from YashasSamaga:cuda4dnn-fp-conversion
2020-01-05 11:59:33 +00:00
Alexander Alekhin
1996ae4a42
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-31 10:11:39 +00:00
Dmitry Kurtaev
f954f0830c
Sort text TensorFlow graphs
2019-12-31 11:43:32 +03:00
YashasSamaga
48eecafc89
simplify code to help MSVC 19.10 and lower
2019-12-30 23:02:17 +05:30
Dmitry Kurtaev
76cfa65d55
AddV2 from TensorFlow
2019-12-30 20:06:58 +03:00
YashasSamaga
01f97f150c
perfor fp conversions on GPU
2019-12-30 00:05:39 +05:30
YashasSamaga
17a35587e1
use optimized cuDNN path for conv + bias + relu
2019-12-29 13:08:38 +05:30
Liubov Batanina
752653c70b
Update global pooling
2019-12-28 18:03:40 +03:00
Alexander Alekhin
9ec3d76b21
Merge pull request #16241 from bwignall:typo
2019-12-27 16:18:57 +00:00
Brian Wignall
f9c514b391
Fix spelling typos
...
backport commit 659ffaddb4
2019-12-27 12:46:53 +00:00
Brian Wignall
659ffaddb4
Fix spelling typos
2019-12-26 06:45:03 -05:00
Liubov Batanina
cf477f7e9f
Fix global axis
2019-12-24 16:42:00 +03:00
Liubov Batanina
543e0302d3
Support global pooling by axis
2019-12-24 16:16:58 +03:00
YashasSamaga
16bc505d26
improve reduction logic and add fast transpose kernel
2019-12-24 00:23:45 +05:30
Liubov Batanina
6e33769e56
Add human parsing demo
2019-12-23 15:47:20 +03:00
Yashas Samaga B L
1fac1421e5
Merge pull request #16010 from YashasSamaga:cuda4dnn-fp16-tests
...
* enable tests for DNN_TARGET_CUDA_FP16
* disable deconvolution tests
* disable shortcut tests
* fix typos and some minor changes
* dnn(test): skip CUDA FP16 test too (run_pool_max)
2019-12-20 16:36:32 +03:00
Alexander Alekhin
97b6068c46
dnn(test): don't require downloaded data
2019-12-19 19:31:59 +00:00
Alexander Alekhin
4c86fc13cb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-19 15:09:05 +03:00
Alexander Alekhin
4342657762
Merge pull request #16034 from Quantizs:irLoadFromBuffer
2019-12-19 10:00:07 +00:00
Alexander Alekhin
b8e0898c7c
Merge pull request #16082 from YashasSamaga:cuda4dnn-roi-pooling
2019-12-18 14:41:58 +00:00
antalzsiroscandid
aa80f754f4
dnn: reading IR models from buffer
2019-12-18 15:31:08 +01:00
Alexander Alekhin
61969dc158
Merge pull request #16171 from YashasSamaga:cuda4dnn-tensor-cores
2019-12-17 18:58:12 +00:00
Alexander Alekhin
2c0d9fa81f
dnn(test): fix Test_Model.Keypoints* tests
2019-12-16 18:07:23 +03:00
YashasSamaga
cf93df41fc
enable tensor cores for fp16 convolutions
2019-12-16 15:38:12 +05:30
Alexander Alekhin
ba7b0f4c54
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-15 11:23:46 +00:00
Yashas Samaga B L
17c485eb03
Merge pull request #16092 from YashasSamaga:cuda4dnn-conv-act-fuse
...
cuda4dnn: fuse activations with convolutions
* fuse ReLU, ReLU6, TanH, Sigmoid with conv
* fix OpenCL errors
* improve ReLU, add power, swish and mish
* fix missing fusion entries
* fix handling of unsetAttached
* remove whole file indentation
* optimize power = 1.0, use IDENTITY instead of NONE
* handle edge case: change backend and then clear
2019-12-14 22:26:58 +03:00
Xuanda Yang
3d60a9b96c
Merge pull request #16156 from TH3CHARLie:3.4
...
* Eltwise::DIV support in Halide backend
* fix typo
* remove div from generated test suite to pass CI, switching to manual test...
* ensure divisor not near to zero
* use randu
* dnn(test): update test data for Eltwise.Accuracy/DIV layer test
2019-12-13 18:29:39 +03:00
Diego
5b0b59ecfb
Merge pull request #15189 from dvd42:keypoints_module
...
Keypoints module
2019-12-13 18:00:06 +03:00
Alexander Alekhin
92b9888837
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-12 13:02:19 +03:00
Alexander Alekhin
5ee7abbe3c
Merge pull request #16088 from alalek:dnn_eltwise_layer_different_src_channels
...
dnn(eltwise): fix handling of different number of channels
* dnn(test): reproducer for Eltwise layer issue from PR16063
* dnn(eltwise): rework support for inputs with different channels
* dnn(eltwise): get rid of finalize(), variableChannels
* dnn(eltwise): update input sorting by number of channels
- do not swap inputs if number of channels are same after truncation
* dnn(test): skip "shortcut" with batch size 2 on MYRIAD targets
2019-12-11 20:16:58 +03:00
Alexander Alekhin
2a11103a73
Merge pull request #16098 from alalek:dnn_clarify_error_getMemoryShapes
2019-12-11 14:02:15 +00:00
Alexander Alekhin
939099b9ce
Merge pull request #16107 from dkurt:dnn_ie_ngraph_v1_conv
2019-12-10 12:10:50 +00:00
Alexander Alekhin
2a19db0f0a
Merge pull request #16106 from dkurt:dnn_ie_ngraph_weights_fusion
2019-12-10 12:08:04 +00:00
Dmitry Kurtaev
fe77223dee
Modify nGraph's ConvolutionBackpropData and GroupConvolution
2019-12-10 14:14:00 +03:00
Yashas Samaga B L
3fddd3bf93
Merge pull request #16069 from YashasSamaga:cuda4dnn-crop_and_resize
...
add CropAndResize layer for CUDA backend
* add CropAndResize layer
* process multiple channels per iteration
2019-12-09 22:26:58 +03:00
Alexander Alekhin
45f6931352
Merge pull request #16089 from dkurt:dnn_ie_fix_fpga
2019-12-09 19:26:00 +00:00
Dmitry Kurtaev
c2ca3ee2fa
Fix weights fusion for Convolution and Deconvolution layers in nGraph
2019-12-09 19:06:47 +03:00
Alexander Alekhin
b505cf84de
Merge pull request #16096 from YashasSamaga:cuda4dnn-region-optimize
2019-12-09 14:34:48 +00:00
Yashas Samaga B L
476a02739e
Merge pull request #16097 from YashasSamaga:cuda4dnn-optimize-resize-bilinear
...
cuda4dnn(resize): process multiple channels each iteration
* resize bilinear: process multiple chans. per iter.
* remove unused headers
* correct dispatch logic
* resize_nn: process multiple chans. per iter.
2019-12-09 17:31:27 +03:00
Dmitry Kurtaev
883c4c60c3
Remove Dummy layer
2019-12-09 12:49:47 +03:00
Alexander Alekhin
b1b505f783
dnn: clarify error message from getMemoryShapes()
2019-12-08 22:17:24 +00:00
Yashas
dd3f517fe9
optimize region kernels
2019-12-08 21:03:30 +05:30
Alexander Alekhin
202ba124a5
Merge pull request #16087 from YashasSamaga:cuda4dnn-eltwise-div
2019-12-06 18:33:55 +00:00
Lubov Batanina
629d47fcd8
Merge pull request #15988 from l-bat:custom_layer
...
Test create custom layer in python
* check is contiguos
* Add custom layer test
* Fix test
* Remove assert
* Move assert to pyopencv dnn
* remove assert
* Add unregister
* Fix python2
* proto to bytearray
* Fix data type
2019-12-06 21:29:57 +03:00
Dmitry Kurtaev
beb5b291b9
Fix HETERO:FPGA,CPU plugin for IE backend
2019-12-06 19:35:11 +03:00
YashasSamaga
a91eca6ec2
add DIV support to EltwiseOp
2019-12-06 21:28:36 +05:30
Alexander Alekhin
51d54ad4f0
Merge pull request #16076 from l-bat:prior_ngraph
2019-12-06 14:08:21 +00:00
YashasSamaga
9b8ddba4d1
add ROIPoolingOp
2019-12-06 18:19:37 +05:30
Liubov Batanina
660a709840
Support Swish and Mish activations
2019-12-06 11:27:59 +03:00
Liubov Batanina
d99d18304a
Slice v1 op
2019-12-06 09:56:21 +03:00
Dmitry Kurtaev
134094a442
Backport fix for autodetection of input shapes
2019-12-05 19:25:51 +03:00
Alexander Alekhin
8108fb0575
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-05 18:27:45 +03:00
Alexander Alekhin
986c5084a4
Merge pull request #16036 from dkurt:dnn_backport_15203
2019-12-05 09:56:00 +00:00
Dmitry Kurtaev
d8e10f3a8d
Enable MaxPooling with indices in Inference Engine
2019-12-04 19:14:55 +03:00
Alexander Alekhin
72315e7b00
Merge pull request #16045 from YashasSamaga:cuda4dnn-hotfix-log1p-expm1
2019-12-04 15:50:07 +00:00
Alexander Alekhin
1633c29f29
Merge pull request #16037 from alalek:dnn_test_fix_skip_vulkan
2019-12-04 15:49:47 +00:00
YashasSamaga
fbb3f64a1a
fix expm1 and log1p for __half/__half2
2019-12-03 15:25:35 +05:30
Alexander Alekhin
0dc0bc80ae
dnn(test): fix Vulkan skip test tag
2019-12-02 18:22:10 +03:00
Dmitry Kurtaev
ca1ba7a53d
Backport for dnn input shape estimation
2019-12-02 16:28:59 +03:00
Alexander Alekhin
4b0132ed7a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-02 16:26:52 +03:00