OpenCV Developers
d9a444ca1a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-05-14 11:23:21 +00:00
Yulv-git
15ac54d5d6
Fix some typos in modules/.
2022-04-30 13:40:07 +08:00
Zihao Mu
64ded50bbf
parsing depth2space and space2depth of ONNX importer
2022-04-29 10:17:02 +08:00
rogday
9cd5a0a1e6
Merge pull request #21884 from rogday:cuda_cleanup
...
Fix CUDA compilation issues and adjust thresholds.
* Fix CUDA compilation issues and adjust thresholds.
* add conformance tests to denylist
2022-04-19 16:40:25 +00:00
OpenCV Developers
2985739b8c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-04-16 14:41:15 +00:00
rogday
a2b84e9897
add assert to tf graph simplifier to address security concerns
2022-04-13 22:50:27 +03:00
zihaomu
e36948cfbc
add ONNX OP sign, shrink and reciprocal
2022-04-07 15:32:12 +08:00
Alexander Alekhin
a233982931
Merge pull request #20938 from JulieBar:lstm_cuda2
2022-04-01 22:10:08 +00:00
Zihao Mu
7b582b71ba
Merge pull request #21036 from fengyuentau:timvx_backend_support
...
dnn: TIM-VX NPU backend support
* Add TimVX NPU backend for DNN module.
* use official branch from tim-vx repo; fix detecting viv sdk
Co-authored-by: fytao <yuantao.feng@outlook.com>
2022-03-31 21:42:11 +00:00
Smirnov Egor
abebbf04b1
Add CUDA support for LSTM.
...
Co-authored-by: Julia Bareeva <jbareeva@gmail.com>
2022-03-31 16:38:22 +03:00
Alexander Alekhin
5e434073d4
Merge pull request #21796 from alalek:dnn_reduce_fixup_21601
2022-03-30 22:26:28 +00:00
Alexander Alekhin
6f5cf8c15f
dnn: fix ReduceLayer implementation, update OpenVINO tests
2022-03-30 20:03:41 +00:00
Alexander Alekhin
1339ebaa84
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-03-26 16:00:28 +00:00
Alexander Alekhin
c9b90884da
Merge pull request #21601 from zihaomu:add_reduceLayer
2022-03-26 10:20:10 +00:00
luz paz
8e8e4bbabc
dnn: fix various dnn related typos
...
Fixes source comments and documentation related to dnn code.
2022-03-23 18:12:12 -04:00
Alexander Alekhin
4c79318694
dnn: fix index access
2022-03-19 06:54:07 +00:00
Zihao Mu
b6b5c27cec
Support for some reduce layers for onnx
2022-03-18 10:19:13 +08:00
Alexander Alekhin
685797f403
Merge pull request #21662 from alalek:dnn_split
2022-03-17 16:09:17 +00:00
rogday
93353aea70
Merge pull request #21522 from rogday:lstm
...
Fix LSTM support in ONNX
* fix LSTM and add peephole support
* disable old tests
* turn lambdas into functions
* more hacks for c++98
* add assertions
* slice fixes
* backport of cuda-related fixes
* address review comments
2022-03-15 09:14:05 +03:00
Alexander Alekhin
5bf3c1df24
Merge pull request #21715 from ilyachur:change_type_info_creation
2022-03-14 09:18:58 +00:00
Ilya Churaev
419918076e
Changed call of NodeTypeInfo constructor
2022-03-14 10:55:33 +03:00
Alexander Alekhin
a120adde63
dnn: add dnn.cpp file with information about git commits history
2022-03-08 19:22:47 +00:00
Alexander Alekhin
a80af177b6
dnn: split dnn.cpp code
...
base commit: 19926e2979
original dnn.cpp content: 19926e2979/modules/dnn/src/dnn.cpp
2022-03-08 19:22:46 +00:00
Tsukasa Sugiura
8db7d435b9
Merge pull request #21692 from UnaNancyOwen:add_softmax
...
* add apply softmax option to ClassificationModel
* remove default arguments of ClassificationModel::setSoftMax()
* fix build for python
* fix docs warning for setSoftMax()
* add impl for ClassficationModel()
* fix failed build for docs by trailing whitespace
* move to implement classify() to ClassificationModel_Impl
* move to implement softmax() to ClassificationModel_Impl
* remove softmax from public method in ClassificationModel
2022-03-07 20:26:15 +00:00
Alexander Alekhin
901e0ddfe4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-03-05 19:46:28 +00:00
Alexander Alekhin
5cc27fd3b5
Merge pull request #21542 from rogday:split_expand
2022-02-28 22:38:24 +00:00
Egor Smirnov
375fe81311
fix slice and expand
2022-02-28 17:18:07 +03:00
Yuantao Feng
f77c3574af
Merge pull request #21607 from fengyuentau:fix_FaceDetectorYN_dynamic_shape
...
Use YuNet of fixed input shape to fix not-supported-dynamic-zero-shape for FaceDetectorYN
* use yunet with input of fixed shape
* update yunet used in face recognition regression
2022-02-21 13:49:07 +00:00
Alexander Alekhin
19926e2979
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-02-11 17:32:37 +00:00
Alexander Alekhin
effce0573b
dnn: drop legacy Inference Engine NN builder API
2022-02-10 11:55:24 +00:00
Alexander Alekhin
57d3002ee1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-02-06 16:10:43 +00:00
Alexander Alekhin
1da48beeec
dnn(ngraph): fix output names
2022-02-06 13:08:53 +00:00
Alexander Alekhin
b57ff73086
dnn(ngraph): fix outputs handling, drop 'unconnected' logic
2022-02-06 13:08:53 +00:00
Alexander Alekhin
67978b5746
dnn(ngraph): add debuging messages
2022-02-06 13:08:53 +00:00
Alexander Alekhin
062f305d1a
dnn: don't fuse 'outputs' with OpenVINO backend
2022-02-06 13:08:53 +00:00
Alexander Alekhin
aa5bc20c83
dnn(ngraph): fixup get_output_as_single_output_node() replacement patch
2022-02-06 10:35:59 +00:00
Alexander Alekhin
d573472a86
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-01-31 12:53:45 +00:00
Alexander Alekhin
85719a0a5d
dnn: support outputs registration under new names
...
- fixed ONNX importer
2022-01-29 23:29:51 +00:00
Alexander Alekhin
dc35633aa4
Merge pull request #21521 from alalek:dnn_ignore_denormals
2022-01-28 15:31:44 +00:00
Zihao Mu
9e3ba487fa
Merge pull request #21518 from zihaomu:resize_onnx_opset13
...
Add resize layer compatible with ONNX opset13 version
2022-01-28 17:55:01 +03:00
Alexander Alekhin
9188ce68aa
Merge pull request #21490 from rogday:optional_outputs
2022-01-26 15:18:07 +00:00
Alexander Alekhin
70b0274c8e
dnn: apply hint to ignore denormals processing
2022-01-26 11:28:35 +00:00
Alexander Alekhin
b796ededae
Merge pull request #21437 from alalek:dnn_api_explicit_const_4.x
2022-01-21 20:19:50 +00:00
Alexander Alekhin
eb7b45d26b
dnn: fix API - explicit ctors, const methods
2022-01-21 12:38:51 +00:00
Smirnov Egor
17b2d92a3d
add optional outputs support and fix graph links
2022-01-21 12:31:46 +03:00
Alexander Alekhin
6ffa2b01e1
Merge pull request #21357 from rogday:model_diag
2022-01-18 15:50:11 +00:00
rogday
0fe7420638
fix model diagnostic tool
2022-01-18 01:22:22 +03:00
Alexander Alekhin
b304730225
dnn: fix API - explicit ctors, const methods
2022-01-17 21:45:29 +00:00
Maksim Shabunin
d5f73f89d8
Fixed issues found by static analysis
2022-01-13 14:51:25 +03:00
Alexander Alekhin
aebb65e983
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-01-12 13:26:10 +00:00
Alexander Alekhin
80d9f624d0
dnn: don't use aligned load without alignment checks
...
- weights are unaligned in dasiamprn sample (comes from numpy)
2022-01-12 05:11:18 +00:00
Alexander Alekhin
76fb3652fc
dnn(ocl): fix fp16 kernel compilation
2021-12-29 19:58:25 +00:00
Alexander Alekhin
9699e2b483
dnn(onnx): handle non-default ONNX domains
...
- re-enable quantized models tests
2021-12-25 01:38:52 +00:00
Alexander Alekhin
217fea9667
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-12-24 16:48:07 +00:00
Alexander Alekhin
cdd4354256
Merge pull request #21336 from alalek:dnn_pooling_check_array_indexes
2021-12-24 08:35:11 +00:00
Alexander Alekhin
6385511e88
dnn: add checks in pooling layer implementation
...
- to avoid out of buffer access
2021-12-24 00:15:30 +00:00
Alexander Alekhin
ed4becf007
dnn(onnx): debug dump of inputs/outputs/initializers in importer
2021-12-23 21:11:40 +00:00
Alexander Alekhin
f5589445b9
Merge pull request #21322 from alalek:dnn_catch_errors
2021-12-23 20:09:22 +00:00
Alexander Alekhin
88a18c8b6a
dnn(onnx): emit error in Shape for dynamic input
2021-12-23 15:42:59 +00:00
Alexander Alekhin
51e65db715
dnn(onnx): fix Resize inputs handling
2021-12-23 15:42:59 +00:00
Alexander Alekhin
cc02fcd889
dnn: improve debug messages, add ONNX opset version
2021-12-23 15:42:59 +00:00
Alexander Alekhin
c408157a4d
dnn: do not try to rebuilt network during setInput()
...
- this doesn't make sense in case of multiple inputs
2021-12-23 02:40:33 +00:00
Alexander Alekhin
9777fbacf6
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-12-22 15:57:02 +00:00
rogday
0a178a687a
fix const/x in Div
2021-12-20 19:53:37 +03:00
Alexander Alekhin
80492d663e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-12-18 16:19:06 +00:00
Smirnov Egor
71a22e45b0
add celu, hardsigmoid, selu, thresholdedrelu layers
2021-12-18 03:19:54 +03:00
Smirnov Egor
1bd382c1d0
Add acos, acosh, asin, asinh, atan, atanh, cos, cosh, erf, hardswish, sin, sinh, softplus, softsign, tan layers
2021-12-17 18:19:40 +03:00
Smirnov Egor
fec2c7e715
fix Flatten layer
2021-12-17 16:29:56 +03:00
Alexander Alekhin
622b9d9276
Merge pull request #21267 from mshabunin:fix-kw-2021-12
2021-12-16 18:51:47 +00:00
Gruhuang
b4bb98ea60
Merge pull request #21268 from pccvlab:tf_Arg
...
add argmax and argmin parsing for tensorflow
* add argmax and argmin for tf
* remove whitespace
* remove whitespace
* remove static_cast
Signed-off-by: Crayon-new <1349159541@qq.com>
2021-12-16 17:06:02 +00:00
Maksim Shabunin
792b7e0629
(3.4) Fixed several issues found by static analysis
...
original commit: a079c2eb7c
2021-12-16 17:02:58 +00:00
Maksim Shabunin
a079c2eb7c
Fixed several issues found by static analysis
2021-12-16 19:21:25 +03:00
Alexander Alekhin
6d677bbd63
dnn(test): update ONNX conformance filters (4.x)
2021-12-16 12:09:31 +00:00
Alexander Alekhin
299f9837b7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-12-15 16:38:56 +00:00
Smirnov Egor
e97c7e042b
fix max_unpool missing attributes, add default value of keepdims in reducemean/max/sum, add support for keepdims=true in full reduction branch, add new padding type to Pad
2021-12-14 22:09:27 +03:00
rogday
4827fe86bb
Merge pull request #21088 from rogday:onnx_tests
...
Onnx conformance tests
* Add ONNX conformance tests
* dnn(test): add filters for ONNX conformance tests
* add filter lists for OCV backend
* address review comments
* move test_clip_inbounds to all_denylist
* address clip issue
* avoid empty lists
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2021-12-14 16:58:06 +00:00
cqn2219076254
252ce0b581
add square layer
2021-12-13 21:43:13 +08:00
Alexander Alekhin
6e50e4b9ee
Merge pull request #21161 from rogday:elu_alpha_4x
2021-12-10 16:04:01 +00:00
HAN Liutong
1599f9f0c0
Merge pull request #21086 from hanliutong:rvv-dnn
...
Further optimize DNN for RISC-V Vector.
* Optimize DNN on RVV by using vsetvl.
* Rename vl.
* Update fastConv by using setvl instead of mask.
* Fix fastDepthwiseConv
2021-12-10 16:03:22 +00:00
Gruhuang
17bc8565f6
Merge pull request #21154 from pccvlab:MatMul_with_two_inputs
...
Add BatchMatMul layer support for tf_importer
* two inputs
* support batch_matmul
* refactor: remove useless code
* refactor: decrease nesting
2021-12-10 14:44:27 +03:00
Smirnov Egor
e608adea60
add ArgMax and ArgMin layers
2021-12-06 20:49:54 +03:00
HAN Liutong
4935b14539
Merge pull request #21012 from hanliutong:rvv_clang
...
Update RVV backend for using Clang.
* Update cmake file of clang.
* Modify the RVV optimization on DNN to adapt to clang.
* Modify intrin_rvv: Disable some existing types.
* Modify intrin_rvv: Reinterpret instead of load&cast.
* Modify intrin_rvv: Update load&store without cast.
* Modify intrin_rvv: Rename vfredsum to fredosum.
* Modify intrin_rvv: Rewrite Check all/any by using vpopc.
* Modify intrin_rvv: Use reinterpret instead of c-style casting.
* Remove all macros which is not used in v_reinterpret
* Rename vpopc to vcpop according to spec.
2021-12-03 15:13:24 +00:00
Alexander Alekhin
8b4fa2605e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-12-03 12:32:49 +00:00
Alexander Alekhin
35ff9af6ce
Merge pull request #21162 from rogday:softmax_simplification
2021-12-02 17:14:48 +00:00
Alexander Alekhin
dad2b9aac8
Merge pull request #21160 from rogday:elu_alpha
2021-12-02 17:13:57 +00:00
rogday
1613d30544
Merge pull request #21159 from rogday:ceil_mode
...
fix ceil_mode for Average/MaxPooling
* fix ceil_mode
* add a comment
2021-12-02 20:11:11 +03:00
Alexander Alekhin
5da69c0b9a
Merge pull request #21164 from rogday:sum_identity
2021-12-01 22:49:02 +00:00
Alexander Alekhin
a806e8cc58
Merge pull request #21163 from rogday:transpose_default
2021-12-01 22:47:57 +00:00
Smirnov Egor
33e97e994d
add sum of 1 input
2021-11-30 15:42:20 +03:00
Smirnov Egor
11e6848bb9
add default order to transpose
2021-11-30 15:34:34 +03:00
Smirnov Egor
829410729c
add new (Log)SoftMax simplification passes
2021-11-30 15:20:52 +03:00
Smirnov Egor
4995aecd62
add alpha parameter to ELU
2021-11-30 14:43:18 +03:00
Smirnov Egor
0e2a3686c0
add alpha parameter to ELU layer
2021-11-30 12:20:35 +03:00
Alexander Alekhin
0d2857a242
Merge pull request #21152 from rogday:fix_defaults
2021-11-29 22:39:27 +00:00
Alexander Alekhin
17d99e6266
Merge pull request #21142 from alalek:dnn_two_inputs_ocl_fp16_3.4
2021-11-29 21:44:59 +00:00
Andrew Ryrie
ea7d4be3f8
Merge pull request #20658 from smbz:lstm_optimisation
...
* dnn: LSTM optimisation
This uses the AVX-optimised fastGEMM1T for matrix multiplications where available, instead of the standard cv::gemm.
fastGEMM1T is already used by the fully-connected layer. This commit involves two minor modifications:
- Use unaligned access. I don't believe this involves any performance hit in on modern CPUs (Nehalem and Bulldozer onwards) in the case where the address is actually aligned.
- Allow for weight matrices where the number of columns is not a multiple of 8.
I have not enabled AVX-512 as I don't have an AVX-512 CPU to test on.
* Fix warning about initialisation order
* Remove C++11 syntax
* Fix build when AVX(2) is not available
In this case the CV_TRY_X macros are defined to 0, rather than being undefined.
* Minor changes as requested:
- Don't check hardware support for AVX(2) when dispatch is disabled for these
- Add braces
* Fix out-of-bounds access in fully connected layer
The old tail handling in fastGEMM1T implicitly rounded vecsize up to the next multiple of 8, and the fully connected layer implements padding up to the next multiple of 8 to cope with this. The new tail handling does not round the vecsize upwards like this but it does require that the vecsize is at least 8. To adapt to the new tail handling, the fully connected layer now rounds vecsize itself at the same time as adding the padding(which makes more sense anyway).
This also means that the fully connected layer always passes a vecsize of at least 8 to fastGEMM1T, which fixes the out-of-bounds access problems.
* Improve tail mask handling
- Use static array for generating tail masks (as requested)
- Apply tail mask to the weights as well as the input vectors to prevent spurious propagation of NaNs/Infs
* Revert whitespace change
* Improve readability of conditions for using AVX
* dnn(lstm): minor coding style changes, replaced left aligned load
2021-11-29 21:43:00 +00:00
Smirnov Egor
05db8784ae
fix Clip, LeakyReLU, LRN, Split defaults
2021-11-29 20:20:34 +03:00
Supernovae
b594ed99b8
Merge pull request #20933 from shubham-shahh:master
...
Improved overall readability of the code
* grid_nms.cu: minor fix-ups
* Update grid_stride_range.hpp
* Update tf_importer.cpp
2021-11-28 12:54:29 +00:00
Alexander Alekhin
58b06222ff
dnn(DataLayer): fix CPU/OpenCL code paths for FP16 handling
2021-11-28 07:44:05 +00:00
yuki takehara
a6277370ca
Merge pull request #21107 from take1014:remove_assert_21038
...
resolves #21038
* remove C assert
* revert C header
* fix several points in review
* fix test_ds.cpp
2021-11-27 18:34:52 +00:00