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
7e5b5390ba
Fix comments
2020-01-22 14:57:54 +03:00
Liubov Batanina
35c24480ae
Fix axis
2020-01-22 13:36:29 +03:00
Liubov Batanina
08ba63da02
Add global pool flags
2020-01-20 15:37:11 +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
Dmitry Kurtaev
c1c84d2fd1
ONNX graphs simplifier
2020-01-14 12:45:49 +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
4625337179
Add docs reduce mean
2020-01-10 12:49:06 +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
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
Dmitry Kurtaev
76cfa65d55
AddV2 from TensorFlow
2019-12-30 20:06:58 +03:00
Liubov Batanina
752653c70b
Update global pooling
2019-12-28 18:03:40 +03:00
Liubov Batanina
543e0302d3
Support global pooling by axis
2019-12-24 16:16:58 +03:00
Liubov Batanina
6e33769e56
Add human parsing demo
2019-12-23 15:47:20 +03:00
Alexander Alekhin
4b0132ed7a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-02 16:26:52 +03:00
Lubov Batanina
7523c777c5
Merge pull request #15537 from l-bat:ngraph
...
* Support nGraph
* Fix resize
2019-12-02 16:16:06 +03:00
Alexander Alekhin
01a28db949
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-29 18:57:33 +03:00
Dmitry Kurtaev
6e14cc2189
Resolve https://github.com/opencv/opencv/issues/15863
2019-11-24 21:59:25 +03:00
Alexander Alekhin
1661e83939
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-30 16:22:42 +03:00
Dmitry Kurtaev
57676cf64d
Fix https://github.com/opencv/opencv/issues/15141
2019-08-24 23:14:26 +03:00
Alexander Alekhin
a7b954f655
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-23 19:24:37 +03:00
Alexander Alekhin
84b8a2fb05
Merge pull request #15303 from dkurt:fix_15296
2019-08-21 16:59:20 +00:00
luz.paz
fcc7d8dd4e
Fix modules/ typos
...
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
backporting of commit: ec43292e1e
2019-08-16 17:34:29 +03:00
luz.paz
ec43292e1e
Fix modules/ typos
...
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
2019-08-15 18:02:09 -04:00
Dmitry Kurtaev
e4a80aee09
Fix #15296
2019-08-14 19:44:05 +03:00
Alexander Alekhin
199ddff13b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-18 20:25:25 +00:00
Liubov Batanina
0d2bc7b5fd
Fix TF Split layer
2019-07-17 15:50:50 +03:00
Alexander Alekhin
43eba3d750
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-04 18:44:13 +03:00
gal0is
206b546e5a
tensroflow support maxpoolgrad
2019-07-03 09:53:17 +08:00
Alexander Alekhin
b95e93c20a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-26 20:19:04 +00:00
Feng Chen
5620306c70
Merge pull request #14845 from vonchenplus:ocv_mirrorpad
...
* tensorflow support mirror pad
* revert macro define
* revert macro define
* reduce code duplication
* revert macro define
2019-06-24 12:27:42 +03:00
Alexander Alekhin
66d7956e67
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-15 16:25:11 +00:00
Dmitry Kurtaev
dfdc91f8c9
dnn: fix MVN layer (issue 14683)
2019-06-14 18:38:05 +03:00
Alexander Alekhin
f3de2b4be7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-05 19:11:52 +03:00
Dmitry Kurtaev
081d9bc73f
Fix Identity Switch from Keras
2019-05-29 17:13:21 +03:00
Alexander Alekhin
166ecaeda8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-23 19:50:20 +03:00
Dmitry Kurtaev
26e426adb1
StridedSlice from TensorFlow
2019-05-22 12:45:52 +03:00
Alexander Alekhin
b2abd8ca41
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-07 16:04:54 +00:00
Alexander Alekhin
5ba8aa781c
Merge pull request #14460 from dkurt:dnn_tf_no_extra_clone
2019-05-07 14:48:50 +00:00
Alexander Alekhin
e28e3c9491
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-01 08:27:45 +00:00
Alexander Alekhin
1c092a181d
Merge pull request #14454 from dkurt:dnn_tf_subgraph_fusion
2019-04-30 16:24:32 +00:00
Dmitry Kurtaev
a6ed8f268a
Remove extra weights cloning from TensorFlow importer
2019-04-30 19:18:41 +03:00
Lubov Batanina
77fa59c3da
Merge pull request #14301 from l-bat:conv3d
...
Support Convolution3D layer on IE backend (#14301 )
* Add Convolution3D layer
* Disable CXX11
* Fixed tests
* Add Pooling3D layer
* Merge Conv2d with Conv3d and Pool2d with Pool3d layers
* Split pads
* Add Deconvolution layer
* Refactoring
* Deduplication
* Refactoring
* Add utils for Convolution and Pooling layers
2019-04-30 17:08:17 +03:00
Dmitry Kurtaev
9408c3e640
Refactored TensorFlow subgraphs fusion
2019-04-30 09:21:05 +03:00
Alexander Alekhin
c024edb9a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-19 15:43:58 +03:00
Alexander Alekhin
4f764b812e
Merge pull request #14315 from dkurt:tf_squeeze_and_slim_softmax_v2
2019-04-18 16:01:24 +00:00
Alexander Alekhin
4635356435
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-13 20:00:54 +00:00
Dmitry Kurtaev
0cfd95c097
Fix TensorFlow's Squeeze and a new fusion for SoftMax from slim backend
2019-04-13 17:04:31 +03:00
Dmitry Kurtaev
7ce2397b62
Fix a bug in FusedBatchNorm (TensorFlow) layer importer
2019-04-09 13:35:34 +03:00
Alexander Alekhin
c9fc27b337
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-05 19:08:23 +00:00
Dmitry Kurtaev
ec41a4897a
Remove Switch and Merge nodes from TensorFlow networks
2019-04-05 12:32:35 +03:00
Alexander Alekhin
5dc606097c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-02 20:54:41 +00:00
zuoshaobo
a34c02a001
add support for tf.add_n operation
2019-04-02 03:20:53 -04:00
Alexander Alekhin
7442100caa
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-29 19:29:36 +00:00
Dmitry Kurtaev
9cfd219d70
Fix Mobilenet v2 from TensorFlow slim
2019-03-27 15:10:57 +03:00
Alexander Alekhin
ea64e860de
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-09 13:21:58 +00:00
Dmitry Kurtaev
8422dda2c7
Element-wise subtraction from TensorFlow
2018-12-07 13:38:05 +03:00
Alexander Alekhin
e82e672a93
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-06 07:06:58 +00:00
Dmitry Kurtaev
c9e0c77d73
Concat layer from TensorFlow with constant inputs
2018-12-04 19:41:40 +03:00
Alexander Alekhin
22dbcf98c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-17 14:17:35 +00:00
Alexander Alekhin
96c71dd3d2
dnn: reduce set of ignored warnings
2018-11-15 13:15:59 +03:00
Alexander Alekhin
a8b0db4e5d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-28 14:14:47 +03:00
Dmitry Kurtaev
c8f3579f93
Fix #12542 ( #12603 )
...
* Fix #12542
* Remove ignore of non-virtual-dtor error
2018-09-26 16:08:51 +03:00
Alexander Alekhin
808ba552c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-14 23:44:35 +00:00
George Mironov
cb5da8983f
Rename tensorflow namespace
2018-09-12 21:33:11 +03:00
Alexander Alekhin
d74b98c3d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-04 18:39:03 +00:00
Alexander Alekhin
f10fd64630
dnn: update "guard" inline namespace
...
- differ from 3.4 branch
2018-09-03 20:46:57 +00:00
Dmitry Kurtaev
c7cf8fb35c
Import SSDs from TensorFlow by training config ( #12188 )
...
* Remove TensorFlow and protobuf dependencies from object detection scripts
* Create text graphs for TensorFlow object detection networks from sample
2018-09-03 17:08:40 +03:00
Dmitry Kurtaev
3e027df583
Enable more deep learning tests using Intel's Inference Engine backend
2018-08-27 18:37:35 +03:00
Alexander Alekhin
d2e08a524e
core: repair CV_Assert() messages
...
Multi-argument CV_Assert() is accessible via CV_Assert_N() (with malformed messages).
2018-08-15 17:43:10 +03:00
Alexander Alekhin
b9b66ca437
Merge pull request #12205 from dkurt:dnn_update_tf_face_detection
2018-08-14 10:53:12 +00:00
Dmitry Kurtaev
f056c0f137
UINT8 face detection network using Intel's Inference Engine backend
2018-08-13 18:38:47 +03:00
Alexander Alekhin
615883977f
Merge pull request #12128 from dkurt:dnn_fix_12066
2018-08-10 14:14:16 +00:00
Vadim Pisarevsky
7c8ab271fc
Merge pull request #12125 from dkurt:dnn_mobilenet_ppn
2018-08-06 14:40:50 +00:00
Dmitry Kurtaev
449696f1e5
Enable reshape-as-shape layer from TensorFlow
2018-08-06 17:35:06 +03:00
Dmitry Kurtaev
4fb086d6c3
MobileNet-SSD v1 from TensorFlow with shared convolution weights
2018-08-01 16:16:48 +03:00
Dmitry Kurtaev
8e034053af
Faster-RCNN from TensorFlow on CPU with Intel's Inference Engine backend
2018-08-01 11:29:58 +03:00
Alexander Alekhin
c37d1a53b5
Merge pull request #12025 from Triplesalt:tfimport-relu
2018-07-26 15:08:05 +00:00
Triplesalt
9eb79926df
Allow a different input order for Mul+Maximum.
...
Squashed : ReLU operand order tests.
2018-07-26 14:19:11 +02:00
Dmitry Kurtaev
c213a3823e
Run entire SSDs from TensorFlow using Intel's Inference Engine
2018-07-19 17:05:56 +03:00
Dmitry Kurtaev
8b5f061dae
Replace std::vector<char> to std::vector<uchar> for Java bindings of dnn importers
2018-07-11 18:58:56 +03:00
Dmitry Kurtaev
d57e5406f0
Add readNet* functions which parse models from byte arrays
2018-07-10 11:12:01 +03:00
Alexander Alekhin
ccd2370bb7
Merge pull request #11890 from dkurt:keras_resize_nearest
2018-07-05 09:57:24 +00:00
Dmitry Kurtaev
36288eebe7
Nearest neighbor resize from Keras
2018-07-04 11:53:24 +03:00
Dmitry Kurtaev
7ed5d85f25
Add Reshape layer tests
2018-07-03 08:26:43 +03:00
Dmitry Kurtaev
d971678add
Add a planar data layout tracking for TensorFlow importer
2018-06-29 09:50:14 +03:00
Dmitry Kurtaev
dbeb4a11be
Parse strides and convolution kernel shapes considering data layout
2018-06-26 16:18:21 +03:00
Vadim Pisarevsky
e87425f047
Merge pull request #11835 from dkurt:dnn_tf_two_inputs
2018-06-26 12:12:24 +00:00
Dmitry Kurtaev
9510551c63
Multiple inputs for TensorFlow models
2018-06-26 14:03:59 +03:00
Dmitry Kurtaev
715f40a48d
Use layers consumers to predict data layout
2018-06-25 18:25:40 +03:00
Dmitry Kurtaev
693a7663e7
Import ClipByValue from Keras
2018-06-14 13:30:30 +03:00
David
7175f257b5
Added ResizeBilinear op for tf ( #11050 )
...
* Added ResizeBilinear op for tf
Combined ResizeNearestNeighbor and ResizeBilinear layers into Resize (with an interpolation param).
Minor changes to tf_importer and resize layer to save some code lines
Minor changes in init.cpp
Minor changes in tf_importer.cpp
* Replaced implementation of a custom ResizeBilinear layer to all layers
* Use Mat::ptr. Replace interpolation flags
2018-06-07 16:29:04 +03:00
Kuang Fangjun
9ae28415ec
fix doc.
2018-06-03 17:44:24 +08:00
Alexander Alekhin
799b4f48e7
fix missing precomp.hpp
2018-05-31 16:53:44 +03:00
Dmitry Kurtaev
bf87a43185
Faster-RCNN object detection models from TensorFlow
2018-05-30 17:12:36 +03:00
Dmitry Kurtaev
085be6a445
Fix dilated convolution from Keras
2018-05-29 12:15:47 +03:00
Dmitry Kurtaev
2c3c59d018
Remove Shift deep learning layer
2018-05-28 18:18:56 +03:00
Dmitry Kurtaev
8488f2e265
EAST: An Efficient and Accurate Scene Text Detector ( https://arxiv.org/abs/1704.03155v2 )
2018-05-11 14:55:42 +03:00
Dmitry Kurtaev
777d77848c
Free Convolution and MatMul weights after TensorFlow layers import
2018-05-04 11:20:14 +03:00
Alexander Alekhin
576d2dbac0
refactor: don't use CV_ErrorNoReturn() internally
2018-04-24 15:38:42 +03:00
Dmitry Kurtaev
4ec456f0a0
Custom layers for deep learning networks ( #11129 )
...
* Custom deep learning layers support
* Stack custom deep learning layers
2018-04-24 14:59:59 +03:00
Dmitry Kurtaev
d959d7b9f0
Fuse deconvolution layer subgraphs from Keras
2018-04-20 16:51:38 +03:00
Dmitry Kurtaev
1ba72ca0d3
Fuse tf.nn.l2_normalize layer
2018-04-10 10:12:44 +03:00
Alexander Alekhin
e8a67de0d2
Merge pull request #11182 from dkurt:fix_11102_part_2
2018-03-30 13:11:01 +00:00
Alexander Alekhin
1060c0f439
dnn: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Dmitry Kurtaev
e039fc3a63
Replace protobuf's ReleaseLast to RemoveLast to deallocate memory.
...
Change an order of PriorBox layer operations.
2018-03-28 17:27:36 +03:00
Dmitry Kurtaev
69a8f110b6
Fuse subgraphs from Keras
2018-03-12 10:53:06 +03:00
Dmitry Kurtaev
9457bf10ab
Fuse batch normalization and flatten TensorFlow subgraphs in runtime
2018-03-12 10:51:35 +03:00
Alexander Alekhin
a838a97092
dnn: fix precomp.hpp usage
2018-02-28 17:06:26 +03:00
Dmitry Kurtaev
eab556e1e0
OpenCV face detection network in TensorFlow
2018-02-21 19:58:24 +03:00
Alexander Alekhin
0e4eed0ba1
Merge pull request #10867 from dkurt:dnn_fix_ave_pooling_area
2018-02-16 11:17:32 +00:00
Dmitry Kurtaev
f8d0d6365e
Add a flag to manage average pooling with padding
2018-02-14 16:56:31 +03:00
Vadim Pisarevsky
6dfd7e3da2
Merge pull request #10850 from dkurt:dnn_tf_deconv_tests
2018-02-14 10:35:14 +00:00
Dmitry Kurtaev
a6baedd02c
Fix deconvolution layer. Add batch norm layer with mean-variance normalization from TensorFlow.
2018-02-13 11:00:27 +03:00
luz.paz
5718d09e39
Misc. modules/ typos
...
Found via `codespell`
2018-02-12 07:09:43 -05:00
Dmitry Kurtaev
184862582c
Fix slice layer from TensorFlow
2018-01-31 19:12:37 +03:00
Dmitry Kurtaev
9e9926a2f0
PriorBox layer with explicit normalized sizes
2018-01-24 14:01:42 +03:00
Alexander Alekhin
019b7c5a66
Merge pull request #10402 from dkurt:dnn_tf_quantized
2017-12-22 15:58:56 +00:00
Dmitry Kurtaev
bcc669f3f7
TensorFlow weights dequantization
2017-12-22 17:25:10 +03:00
Maksim Shabunin
aa46e31c6d
Replaced incorrect CV_Assert calls with CV_Error
2017-12-22 15:20:13 +03:00
Dmitry Kurtaev
7e48fa58eb
Manage TensorFlow's NHWC data layout is smoother
2017-12-20 14:13:40 +03:00
Dmitry Kurtaev
6aabd6cc7a
Remove cv::dnn::Importer
2017-12-18 18:08:28 +03:00
David Geldreich
f723cede2e
add loading TensorFlow/Caffe net from memory buffer
...
add a corresponding test
2017-11-20 16:28:22 +01:00
Alexander Alekhin
436a1f72a5
dnn: fix sporadic crashes in getUMat()
...
Incorrect "total" buffer size calculated in StdMatAllocator::allocate() due wrong step values.
2017-10-25 18:07:05 +03:00
Dmitry Kurtaev
e4aa39f9e5
Text TensorFlow graphs parsing. MobileNet-SSD for 90 classes.
2017-10-08 22:25:29 +03:00
Dmitry Kurtaev
b9f94c9315
Nearest neighbor resize layer
2017-10-06 14:33:26 +03:00
Dmitry Kurtaev
2a21c10837
Fix TensorFlow split layer
2017-10-02 22:44:42 +03:00
Vadim Pisarevsky
5e93c82023
Merge pull request #9491 from dkurt:tf_lstm
2017-09-28 21:04:06 +00:00
Vadim Pisarevsky
68cc2e292d
Merge pull request #9734 from dkurt:fix_deconv_layer_kernel_layout
2017-09-28 11:42:57 +00:00
Dmitry Kurtaev
6e593cd1f0
Swap dimensions of deconvolution kernel
2017-09-27 22:38:34 +03:00
Dmitry Kurtaev
84cec17913
LSTM layer for TensorFlow importer
2017-09-26 12:59:36 +03:00
Dmitry Kurtaev
222149b9c6
Refactored Padding layer
2017-09-22 12:39:00 +03:00
Dmitry Kurtaev
17a85b16fc
Remove reorder_dims attribute of Reshape layer
2017-09-21 16:42:03 +03:00
Dmitry Kurtaev
bdd8cc697a
Import wrapped Dropout subgraphs from TensorFlow
2017-09-20 13:30:25 +03:00
Vadim Pisarevsky
f7df5dd32c
Merge pull request #9305 from dkurt:public_dnn_importer_is_deprecated
2017-09-18 09:35:35 +00:00
Dmitry Kurtaev
bd8e6b7e14
Make external cv::dnn::Importer usage is deprecated
2017-09-18 08:52:36 +03:00
Dmitry Kurtaev
d891e9b1d8
Layers for MobileNet from TensorFlow
2017-09-15 20:17:30 +03:00
Dmitry Kurtaev
58b890b9f7
Dilated convolution import from TensorFlow
2017-09-13 18:44:14 +03:00
Vadim Pisarevsky
8c7f19850f
Merge pull request #9576 from dkurt:feature_dnn_tf_importer_fp16
2017-09-13 13:57:38 +00:00
Dmitry Kurtaev
ce41a15437
Import and convert FP16 weights from TensorFlow
2017-09-12 09:50:55 +03:00
Maksim Shabunin
248e2c7d47
Fixed some issues found by static analysis
2017-09-08 12:22:12 +03:00
Dmitry Kurtaev
54f0616a13
Deconvolution layer from TensorFlow
2017-08-21 21:38:07 +03:00
dkurt
339793143c
Unit tests for TensorFlow importer
2017-08-03 11:29:48 +03:00
Aleksandr Rybnikov
8d6b8b45b6
Added ELU and test for it
2017-08-02 11:13:59 +03:00
Maksim Shabunin
f1a56cb4b7
Merge pull request #9028 from alalek:dnn_experimental_namespace
2017-06-29 07:37:04 +00:00
Alexander Alekhin
da0960321b
dnn: added "hidden" experimental namespace
...
Main purpose of this namespace is to avoid using of incompatible
binaries that will cause applications crashes.
This additional namespace will not impact "Source code API".
This change allows to maintain ABI checks (with easy filtering out).
2017-06-28 20:36:57 +00:00