Alexander Smorkalov
4930516652
Merge pull request #22898 from fengyuentau:slice_neg_steps
...
dnn: support ONNX Slice with negative steps by adding and using cv::flipND
2022-12-23 14:15:06 +03:00
Vincent Rabaud
ad568edd7f
Remove references to deprecated NumPy type aliases.
...
This change replaces references to a number of deprecated NumPy
type aliases (np.bool, np.int, np.float, np.complex, np.object,
np.str) with their recommended replacement (bool, int, float,
complex, object, str).
Those types were deprecated in 1.20 and are removed in 1.24,
cf https://github.com/numpy/numpy/pull/22607 .
2022-12-23 13:53:49 +03:00
Alexander Alekhin
1f41d06f9a
Merge pull request #23008 from mshabunin:fix-yolov4-tiny-hash
2022-12-23 10:14:25 +00:00
fengyuentau
34a0897f90
add cv::flipND; support onnx slice with negative steps via cv::flipND
2022-12-23 16:39:53 +08:00
Maksim Shabunin
d35fbe6bfc
dnn: updated YOLOv4-tiny model and tests
2022-12-22 15:49:21 +03:00
Alexander Alekhin
6b4f3e5fab
Merge pull request #22993 from alalek:fixup_21738
2022-12-21 19:50:51 +00:00
Yuantao Feng
a2b3acfc6e
dnn: add the CANN backend ( #22634 )
...
* cann backend impl v1
* cann backend impl v2: use opencv parsers to build models for cann
* adjust fc according to the new transA and transB
* put cann net in cann backend node and reuse forwardLayer
* use fork() to create a child process and compile cann model
* remove legacy code
* remove debug code
* fall bcak to CPU backend if there is one layer not supoorted by CANN backend
* fix netInput forward
2022-12-21 09:04:41 +03:00
Alexander Alekhin
cdbb893b27
dnn: disable OpenCL code path in MatMul processing
...
- this mode is not supported by 22828
2022-12-20 09:46:48 +00:00
Alexander Alekhin
1102b7eff8
dnn: fix gather layer implementation
...
- support FP16 data
2022-12-20 06:09:34 +00:00
zoom
4891818114
make MatMul support 3D or 4D with broadcast
2022-12-15 10:36:08 +08:00
Alexander Alekhin
8ba44e7d55
Merge pull request #22882 from zihaomu:gemm_first_const
2022-12-08 14:18:33 +00:00
Zihao Mu
0a650b573b
Merge pull request #22840 from zihaomu:optimze_conv_memory_usage
...
DNN: reduce the memory used in convolution layer
* reduce the memory in winograd and disabel the test when usage memory is larger than 2gb.
* remove VERY_LOG tag
2022-12-08 12:57:13 +00:00
Alexander Alekhin
b16f76eede
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-12-03 12:39:41 +00:00
Alexander Alekhin
d16b3b2487
dnn(test): restore openvino tests with 'Cannot get memory' message
2022-12-03 01:34:48 +00:00
Alexander Smorkalov
e14ca39fd7
Merge pull request #22857 from fengyuentau:batched_nms
...
dnn: add batched nms
2022-11-30 12:37:49 +03:00
Alexander Smorkalov
421ba8730a
Merge pull request #22809 from fengyuentau:tile
...
dnn: support ONNX Tile
2022-11-29 14:42:28 +03:00
zihaomu
0d56524b72
gemm support transA and transB, and first input is constance.
2022-11-29 17:13:36 +08:00
fengyuentau
9fded9ca53
batched nms impl
2022-11-29 15:32:34 +08:00
fengyuentau
441624a5fb
tile impl
2022-11-29 11:15:38 +08:00
zoom
5044af69d1
let MatMul can work when both two inputs are const
2022-11-27 17:32:41 +08:00
zoom
ef2677b0a6
Make MatMul layer support 3d or 4d operation with const input
2022-11-10 11:41:44 +08:00
Zihao Mu
903bf0147e
Merge pull request #22666 from zihaomu:support_onnx_qdq_model
...
DNN: let Quant and Dequant of ONNX_importer support the Constant input.
* let Quant and Dequant support the Constant input.
* fix negative value of axis.
2022-10-31 16:06:31 +00:00
Alexander Smorkalov
22f8fb4d5c
Do not fail tests in Yolo v7 model was not found.
2022-10-24 17:59:18 +03:00
Dmitry Kurtaev
35b2cff295
Merge pull request #22656 from dkurt:halide_fixes
...
* Fixes for Halide
* Enable some Halide tests
2022-10-21 17:49:49 +03:00
Alexander Smorkalov
5d292826b2
Merge pull request #22593 from zihaomu:optimize_wino
...
optimize winograd futher more
2022-10-19 13:08:32 +03:00
Alexander Smorkalov
f378f02954
Merge pull request #22652 from rogday:cuda_test_fixes
...
Address CUDA-related errors
2022-10-19 09:37:12 +03:00
Smirnov Egor
dd14cf6a9c
address CUDA-related errors and enable cuda in elementwise ops
2022-10-18 16:54:42 +03:00
Alexander Smorkalov
ec7fc5adca
Merge pull request #22529 from fengyuentau:scatter_scatternd
...
DNN: supports Scatter and ScatterND from ONNX
2022-10-17 14:57:46 +03:00
fengyuentau
d24d8f2abe
implementation of scatter and scatternd with conformance tests enabled
2022-10-17 11:30:32 +08:00
zoom
d816442e4d
Make Unsqueeze layer support negative axes.
2022-10-14 18:00:19 +08:00
Zihao Mu
0fa43e3aac
Optimize the winograd futher more.
2022-10-14 10:15:45 +08:00
Alexander Smorkalov
ec26541771
Merge pull request #22577 from zihaomu:Disable_winograd_branch_in_tryquantize
...
DNN: add enableWinograd API for Net
2022-10-11 09:44:00 +03:00
Alexander Smorkalov
3419e64dcf
Merge pull request #22611 from zihaomu:greaterOrEqual
...
DNN: support GreaterOrEqual and LessOrEqual op in ONNX
2022-10-10 11:43:44 +03:00
Zihao Mu
1e2ceca4df
add enableWinograd API for Net.
2022-10-09 09:33:07 +08:00
Alexander Alekhin
347246901e
Merge pull request #21745 from alalek:dnn_plugin_openvino
2022-10-08 22:32:25 +00:00
Zihao Mu
9821fae59d
add greater_or_equal and less_or_equal ONNX support
2022-10-08 15:51:40 +08:00
Alexander Alekhin
43b2bb2c25
dnn: plugin support for OpenVINO
2022-10-07 16:57:31 +00:00
zoom
4557971481
enhance slice layer
...
refactor the code for parsing Slice layer
add test for Slice layer
let 'begin' and 'end' resize to dims
add opset message comment
2022-10-01 17:12:07 +08:00
Alexander Smorkalov
a6274647a4
Merge pull request #21738 from rogday:gather
...
add Gather implementation
2022-09-19 16:21:14 +03:00
Egor Smirnov
65f71ce2eb
add Gather implementation
2022-09-19 15:06:44 +03:00
Alexander Smorkalov
6aefb8e86f
Merge pull request #22290 from fengyuentau:naive_yolov7
...
Support for YOLOv7 ONNX (not simplified)
2022-09-19 14:43:18 +03:00
fengyuentau
4aef9b1c93
dnn: support yolov7 (not simplified)
2022-09-19 18:38:03 +08:00
anton
337452b4c0
changed names of permutations if Reshpe is in NHWC
2022-09-03 19:02:41 +02:00
Alexander Smorkalov
d2c48b898c
Merge pull request #22306 from zihaomu:qgemm_and_squeeze_opset13_onnximporter
2022-08-30 06:33:57 +00:00
Zihao Mu
2d837efba7
add qgemm and squeeze op13 supported on ONNXImporter
2022-08-30 09:50:29 +08:00
Alexander Smorkalov
2619099fe5
Merge pull request #22337 from zihaomu:load_ONNX_fp16_as_fp32
...
DNN: load fp16 ONNX model as fp32
2022-08-29 09:32:25 +03:00
Zihao Mu
bb64db98d8
Further optimization of Conv2D, fused Conv_Add_Activation, bring latest code from ficus OpConv.fx. ( #22401 )
2022-08-26 12:57:25 +03:00
Zihao Mu
7eaec9dd22
load fp16 as fp32 and align fp16 and double in onnx_graph_simplifie
2022-08-26 10:04:44 +08:00
Alexander Alekhin
2ebdc04787
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-08-14 15:50:42 +00:00
Alexander Smorkalov
bb71cb200e
Merge pull request #22199 from zihaomu:bug_fix_22195
...
DNN: Reduce Layer (add dynamic batch and ReduceSum support)
2022-08-11 12:59:51 +03:00
Alexander Smorkalov
b2b7193374
Merge pull request #22311 from zihaomu:layer_fused_optmized_mish
...
DNN: add another two Mish activation to onnx_graph_simplifier
2022-08-05 14:22:06 +03:00
Zihao Mu
0614c40b42
add more skip for very long test case in test_dnn.
2022-08-02 14:58:05 +08:00
Zihao Mu
d4640f4647
support ReduceLayer without reshape layer.
2022-08-02 10:32:31 +08:00
Zihao Mu
3c5377ca1b
add another Mish graph simplifier.
2022-07-28 11:21:29 +08:00
rogday
ed69bcae2d
Merge pull request #21865 from rogday:nary_eltwise_layers
...
Reimplementation of Element-wise layers with broadcasting support
* init
* semi-working initial version
* add small_vector
* wip
* remove smallvec
* add nary function
* replace auto with Mat in lambda expr used in transform
* uncomment asserts
* autobuffer shape_buf & step_buf
* fix a missing bracket
* fixed a missing addLayer in parseElementWise
* solve one-dimensional broadcast
* remove pre_broadcast_transform for the case of two constants; fix missing constBlobsExtraInfo when addConstant is called
* one autobuffer for step & shape
* temporal fix for the missing original dimension information
* fix parseUnsqueeze when it gets a 1d tensor constant
* support sum/mean/min/max with only one input
* reuse old code to handle cases of two non-constant inputs
* add condition to handle div & mul of two non-constant inputs
* use || instead of or
* remove trainling spaces
* enlarge buf in binary_forward to contain other buffer
* use autobuffer in nary_forward
* generate data randomly and add more cases for perf
* add op and, or & xor
* update perf_dnn
* remove some comments
* remove legacy; add two ONNX conformance tests in filter
* move from cpu_denylist to all_denylist
* adjust parsing for inputs>=2
Co-authored-by: fengyuentau <yuantao.feng@opencv.org.cn>
2022-07-19 06:14:05 +03:00
Zihao Mu
1b8fba8e26
support ReduceSum with two input and dynamic shape batch size in ReduceLayer.
2022-07-13 13:46:16 +08:00
Zihao Mu
45fbb67aba
fix scale layer can not handle 1x1 weight correctly.
2022-07-13 11:25:27 +08:00
Zihao Mu
a80fcacd90
Merge pull request #21372 from zihaomu:dnn_quantize_per_tensor
...
Add per_tensor_quantize to int8 quantize
* add per_tensor_quantize to dnn int8 module.
* change api flag from perTensor to perChannel, and recognize quantize type and onnx importer.
* change the default to hpp
2022-07-05 19:14:42 +03:00
Zihao Mu
59b870a87a
Merge pull request #21910 from zihaomu:fast_conv_ARM
...
DNN: Accelerating convolution
* Fast Conv of ARM, X86 and universal intrinsics.
* improve code style.
* error fixed.
* improve the License
* optimize memory allocated and Adjust the threshold.
* change FasterRCNN_vgg16 to 2GB memory.
2022-07-01 13:03:15 +03:00
Zihao Mu
ef94275eb6
bug fixed of GEMM node in ONNX_importer
2022-06-22 21:08:48 +08:00
Wanli
a6ca48a1c2
Merge pull request #22100 from WanliZhong:issue_22015
...
Fix issue 22015, let Clip layer support 1-3 inputs
* Fix issue 22015.
Let layer Clip support 1-3 inputs.
* Resolve other problems caused by modifications
* Update onnx_importer.cpp
added extra checks to min/max handling in Clip
* Add assertions to check the size of the input
* Add test for clip with min and max initializers
* Separate test for "clip_init_min_max". Change the check method for input_size to provide a clearer message in case of problem.
* Add tests for clip with min or max initializers
* Change the implementation of getting input
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
2022-06-22 14:21:16 +03:00
Zihao Mu
2411b825b4
bug fixed of GEMM node in ONNX_importer
2022-06-22 15:00:17 +08:00
Alexander Alekhin
583bd1a6e2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-06-04 19:10:35 +00:00
Alexander Alekhin
978dc76653
Merge pull request #22006 from rogday:21947_fix
2022-05-24 19:26:02 +00:00
rogday
a2ad997e97
fix vector access in TF::sortByExecutionOrder
2022-05-24 00:05:13 +03:00
Alexander Alekhin
d9bf522b27
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-05-23 16:06:14 +00:00
rogday
93dc0679ec
Merge pull request #21818 from rogday:revert_renaming
...
* add prefixes to layer names and layer output names
* dnn: OPENCV_DNN_ONNX_USE_LEGACY_NAMES runtime parameter
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2022-05-23 14:50:42 +00:00
Alexander Alekhin
bb5462e327
Merge pull request #21991 from fengyuentau:qconv_asympad
2022-05-19 17:20:04 +00:00
fengyuentau
ff88132620
support asymmetric paddings for qconv
2022-05-16 19:01:37 +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
OpenCV Pushbot
66f3c2673c
Merge pull request #21831 from zihaomu:sign_layer_onnx
...
DNN: Add sign, shrink and reciprocal for onnx_impoter
2022-04-13 17:08:30 +00:00
OpenCV Pushbot
03c9648f2e
Merge pull request #21854 from opencv-pushbot:dnn_test_update_checks_face_detector_4.x
2022-04-12 17:20:22 +00:00
OpenCV Developers
e3a55af336
dnn(test): update opencv_face_detector checks
...
original commit: be4a432bea
2022-04-11 20:27:06 +00:00
OpenCV Developers
be4a432bea
dnn(test): update opencv_face_detector checks
2022-04-11 20:26:25 +00:00
zihaomu
e36948cfbc
add ONNX OP sign, shrink and reciprocal
2022-04-07 15:32:12 +08:00
Alexander Alekhin
08d44f588f
dnn(test): update OpenVINO tests 2022.1.0 (OpenCV 4.x)
2022-04-05 14:13:38 +00:00
Alexander Alekhin
13a995cc1d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-04-02 19:45:44 +00:00
Alexander Alekhin
4d927e73f1
dnn(test): update OpenVINO tests 2022.1.0
2022-04-02 17:42:53 +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
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
b687bc807a
dnn(test): update OpenVINO tests 2021.4.2
2022-03-30 18:58:35 +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
Zihao Mu
b6b5c27cec
Support for some reduce layers for onnx
2022-03-18 10:19:13 +08: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
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
Maksim Shabunin
a251474144
Update filters in ONNX tests
2022-02-15 11:56:28 +03:00
Maksim Shabunin
45cbf70265
Update filters in ONNX tests
2022-02-14 17:16:49 +03: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
1f70d4e2a5
dnn(test): re-enable ONNX split tests for OpenVINO
2022-02-06 10:36:15 +00:00
Alexander Alekhin
870c8d3c4e
dnn(test): fix int8 tolerances
2022-01-31 12:54:01 +00:00