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
24166ac402
Fix indentation
2020-01-27 17:59:58 +03:00
Liubov Batanina
4a19ac5aca
Move instruction
2020-01-27 16:18:32 +03:00
Liubov Batanina
5790810c3a
Change link
2020-01-27 12:34:57 +03:00
Liubov Batanina
4b35112022
Update sample
2020-01-24 16:30:10 +03:00
Alexander Alekhin
d0e02cccba
samples(dnn): avoid 'async' keyword (Python 3.7+)
2020-01-23 18:43:36 +03:00
Liubov Batanina
832ca0734d
Refactoring
2020-01-22 10:52:40 +03:00
Liubov Batanina
bb91e6999b
Fix demo
2020-01-20 10:22:01 +03:00
Liubov Batanina
ea31a14cc5
Update sample
2020-01-10 16:33:17 +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
76cfa65d55
AddV2 from TensorFlow
2019-12-30 20:06:58 +03:00
Liubov Batanina
ffa72fc979
Refactoring
2019-12-24 09:45:27 +03:00
Liubov Batanina
6e33769e56
Add human parsing demo
2019-12-23 15:47:20 +03:00
Alexander Alekhin
ba7b0f4c54
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-15 11:23:46 +00:00
Alexander Alekhin
a45928045a
Merge pull request #16150 from alalek:cmake_avoid_deprecated_link_private
...
* cmake: avoid deprecated LINK_PRIVATE/LINK_PUBLIC
see CMP0023 (CMake 2.8.12+)
* cmake: fix 3rdparty list
- don't include OpenCV modules
2019-12-13 17:52:40 +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
ad0ab4109a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-22 22:47:13 +00:00
Lorenzo Lucignano
c40fbad12e
Samples DNN: tf_text_graph_sd.py loads box coder variance and box NMS params from config file
2019-11-20 10:45:57 +01:00
Alexander Alekhin
055ffc0425
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-24 18:21:19 +00:00
anton-potapov
471b40040a
Merge pull request #15735 from anton-potapov:gapi_async_documentaion
...
* G-API: Doxygen documentatation for Async API
* G-API: Doxygen documentatation for Async API
- renamed local variable (reading parameter async) async ->
asyncNumReq in object_detection DNN sample
to avoid Doxygen erroneous linking the sample to cv::gapi::wip::async
documentation
2019-10-21 22:33:18 +03:00
Alexander Alekhin
0e40c8a031
fix pylint warnings
...
pylint 1.8.3
2019-10-16 18:49:33 +03:00
Alexander Alekhin
a74fe2ec01
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-20 21:11:49 +00:00
Dmitry Kurtaev
741aee6901
Fix dnn object detection sample
2019-09-13 11:50:50 +03:00
luz.paz
57ccf14952
FIx misc. source and comment typos
...
Found via `codespell -q 3 -S ./3rdparty,./modules -L amin,ang,atleast,dof,endwhile,hist,uint`
backporting of commit: 32aba5e64b
2019-08-15 13:09:52 +03:00
luz.paz
32aba5e64b
FIx misc. source and comment typos
...
Found via `codespell -q 3 -S ./3rdparty,./modules -L amin,ang,atleast,dof,endwhile,hist,uint`
2019-08-14 13:33:49 -04:00
Alexander Alekhin
174b4ce29d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-05 18:11:43 +00:00
Alexander Alekhin
b584c23061
Merge pull request #15158 from dkurt:fix_tf_ssd_configs
2019-08-02 16:08:55 +00:00
Maksim Shabunin
5ef7325874
Merge pull request #15176 from dkurt:fix_14993
2019-07-30 14:26:33 +00:00
Maksim Shabunin
e90438fe3c
Merge pull request #14938 from LaurentBerger:face_clip
2019-07-30 14:18:51 +00:00
Dmitry Kurtaev
59864a3bbc
Fix #14993
2019-07-28 22:32:37 +03:00
Dmitry Kurtaev
47c5ee5d9c
Fixes for OpenCV face detection network
2019-07-27 17:25:09 +02:00
Dmitry Kurtaev
a0c3bb70a9
Modify SSD from TensorFlow graph generation script to enable MyriadX
2019-07-26 13:57:08 +03:00
Alexander Alekhin
0cf479dd5c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-25 19:21:47 +00:00
Dmitry Kurtaev
a2125594ea
Fix false positives of face detection network for large faces
2019-07-25 20:09:59 +03:00
LaurentBerger
97681d0607
Add clip to deploy.prototxt
2019-06-30 18:39:05 +02:00
Alexander Alekhin
6fdce865b8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-29 17:27:48 +00:00
Dmitry Kurtaev
a04ab2298b
Fix JS sample of dnn
2019-06-29 19:21:14 +03:00
Alexander Alekhin
b95e93c20a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-26 20:19:04 +00:00
Dmitry Kurtaev
411ca87a86
Remove extra ")"
2019-06-26 17:27:56 +03:00
Dmitry Kurtaev
d17d3b66aa
Fix face recognition JS sample
2019-06-24 16:41:37 +03:00
Dmitry Kurtaev
d75a089690
Fix face recognition sample for JS
2019-06-21 21:53:52 -07:00
Alexander Alekhin
f33f88de31
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-21 17:27:14 +03:00
wenzhao
3f5c85e933
opencv.js: fix the loading issue of opencv.js(WASM) in face recognition
2019-06-13 11:26:27 +08:00
Alexander Alekhin
11b020b9f9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-10 19:05:28 +00:00
Alexander Alekhin
6d916c5bb4
Merge pull request #14440 from alalek:async_array
2019-06-08 20:57:15 +00:00
Alexander Alekhin
f3de2b4be7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-05 19:11:52 +03:00
Lubov Batanina
f94253b82b
Merge pull request #14627 from l-bat:demo_kinetics
...
* Support 3D ResNet-34-kinetics
* Update sample
* Remove preprocess
* Change test
* Fix sample
2019-05-30 17:36:00 +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
132253c9f3
dnn: use AsyncArray
2019-05-18 19:32:23 +00:00
Alexander Alekhin
e21262deba
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-16 04:40:39 +00:00
Alexander Alekhin
18151e79bb
cmake(samples): use LINK_PRIVATE in target_link_libraries
2019-05-15 18:38:00 +03:00
Dmitry Kurtaev
63bb97cc19
Asynchronous C++ sample
2019-05-14 19:09:07 +03:00
Dmitry Kurtaev
c3b0a68a2b
Async mode for dnn's object detection sample
2019-05-14 09:58:47 +03:00
Alexander Alekhin
b2abd8ca41
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-07 16:04:54 +00:00
LaurentBerger
fa8e301c69
extends regex matching for conv group of layers
2019-05-07 16:17:25 +02:00
Alexander Alekhin
c024edb9a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-19 15:43:58 +03:00
Dmitry Kurtaev
a304069687
Remove preprocessing parameters from README
2019-04-16 13:29:33 +03:00
Alexander Alekhin
332c37f332
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-06 11:43:16 +03:00
Alexander Alekhin
5fd47352cf
Merge pull request #13904 from cftang0827:dnn_tf_text_graph_common_bug
2019-02-27 16:32:40 +00:00
Alexander Alekhin
c3cf35ab63
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-26 17:34:42 +03:00
cftang
98d8436440
fix tf_text_graph_common tensor_content type bug
2019-02-26 01:20:54 +08:00
Dmitry Kurtaev
fe7c93cc05
Fix priors boxes generation in case of non square inputs for TensorFlow SSDs
2019-02-25 12:43:42 +03:00
Alexander Alekhin
f414c16c13
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-08 17:18:56 +00:00
Dmitry Kurtaev
6ad3bf3130
Enable ResNet-based Mask-RCNN models from TensorFlow Object Detection API
2019-02-06 13:05:11 +03:00
Alexander Alekhin
fcec053d59
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-05 19:12:41 +03:00
Alexander Alekhin
f46cd9dbf5
Merge pull request #13670 from allnes:dnn_fix_obj_detect_sample
2019-02-05 12:37:53 +00:00
Alexander Alekhin
665408e57f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-01 13:17:32 +03:00
Dmitry Kurtaev
252fd63194
Align TensorFlow and OpenCV paths to create a text graph
2019-01-31 13:40:54 +03:00
Alexander Nesterov
cca2c4b314
Update obj. detect sample
2019-01-30 16:44:42 -01:00
Alexander Alekhin
631b246881
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-01-22 18:00:34 +00:00
Dmitry Kurtaev
67e6a6077d
Create text graphs for Faster-RCNN from TensorFlow with dilated convolutions
2019-01-18 18:46:52 +03:00
Alexander Alekhin
bbc6b95c02
Merge pull request #13644 from berak:dnn_samples_googlenet
2019-01-17 12:34:53 +00:00
berak
6596eab66c
dnn/samples: add googlenet to model zoo
2019-01-17 12:14:35 +01:00
Alexander Alekhin
6e39856623
Merge pull request #13614 from dkurt:dnn_tf_ssd_fpn
2019-01-13 09:33:05 +00:00
Dmitry Kurtaev
4ae5df5509
SSD with FPN proposals from TensorFlow
2019-01-11 12:20:03 +03:00
Alexander Alekhin
7e2ebecd52
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-01-10 12:29:41 +03:00
Dmitry Kurtaev
62199df815
Fix edge_detection.py sample for Python 3
2019-01-09 15:28:10 +03:00
Alexander Alekhin
85ade61ef7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-27 18:15:50 +03:00
Alexander Nesterov
a208c3bf04
Fix openpose samples
2018-12-25 14:12:44 -01:00
Alexander Alekhin
7fb70e1701
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-18 19:07:43 +00:00
vishwesh5
715f8fcce0
Merge pull request #13432 from vishwesh5:patch-1
...
* Create text_detection.py
#12270 #13429
**Deep Learning text detection sample (Python)**
- Tested on **Ubuntu 18.04** - OpenCV 3.4.3, OpenCV 3.4.4, OpenCV 4.0 (master branch)
- Python version supported - Python 2 and Python 3
* Fix trailing whitespaces
* Update text_detection.py
* Remove whitespace
* Remove comments
* Remove unused packages
* Update description
2018-12-18 13:40:04 +03:00
Alexander Alekhin
7fa7fa0226
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-21 08:33:39 +00:00
Alexander Alekhin
94d7c0f7f5
Merge pull request #13144 from dkurt:update_tf_mask_rcnn
2018-11-19 15:55:35 +00: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
e8e2197032
samples: use findFile() in dnn
2018-11-16 18:08:22 +00:00
Dmitry Kurtaev
1a27ff4518
Update Mask-RCNN networks generator
2018-11-13 13:22:39 +03:00
Alexander Alekhin
1913482cf5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-10 20:50:26 +00:00
Dmitry Kurtaev
dc9e6d3af8
Update a script to generate text graphs for Faster-RCNN networks from TensorFlow
2018-11-07 18:33:01 +03:00
Alexander Alekhin
50bec53afc
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-26 17:56:55 +03:00
berak
ad356e3239
dnn/samples: handle not set env vars gracefully
2018-10-24 12:37:01 +02:00
Alexander Alekhin
5115e5decb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-13 16:19:05 +00:00
Alexander Alekhin
0f41daeba5
Merge pull request #12641 from dkurt:dnn_samples_args_autofill
2018-10-13 12:28:08 +00: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
ad5898224d
Add a file with preprocessing parameters for deep learning networks
2018-09-25 18:28:37 +03:00
Dmitry Kurtaev
f8398d80bc
add Net::getUnconnectedOutLayersNames method
2018-09-25 18:10:45 +03:00
Maksim Shabunin
e0f524d3b7
Fixed several incorrect printf format specifiers
2018-09-24 11:31:40 +03:00
Alexander Alekhin
861415133e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-19 10:58:43 +03:00
Dmitry Kurtaev
b0ad7f759a
Import tensorflow to create text graphs if import cv is failed
2018-09-18 09:11:51 +03:00
Alexander Alekhin
73bfe68821
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-07 12:40:27 +03:00
Dmitry Kurtaev
d486204a0d
Merge pull request #12264 from dkurt:dnn_remove_forward_method
...
* Remove a forward method in dnn::Layer
* Add a test
* Fix tests
* Mark multiple dnn::Layer::finalize methods as deprecated
* Replace back dnn's inputBlobs to vector of pointers
* Remove Layer::forward_fallback from CV_OCL_RUN scopes
2018-09-06 13:26:47 +03:00
Alexander Alekhin
d74b98c3d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-04 18:39:03 +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
50bceea038
Include preprocessing nodes to object detection TensorFlow networks ( #12211 )
...
* Include preprocessing nodes to object detection TensorFlow networks
* Enable more fusion
* faster_rcnn_resnet50_coco_2018_01_28 test
2018-08-31 15:41:56 +03:00
Nobuo Tsukamoto
ade57c8bd0
Fixed that object_detection.py does not work in python3.
2018-08-31 00:21:54 +09:00
Alexander Alekhin
c1db75e0c7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-29 16:24:56 +03:00
Dmitry Kurtaev
472b71ecef
Merge pull request #12243 from dkurt:dnn_tf_mask_rcnn
...
* Support Mask-RCNN from TensorFlow
* Fix a sample
2018-08-24 14:47:32 +03:00
Alexander Alekhin
6356403964
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-22 17:38:51 +03:00
Alexander Alekhin
7d4bb9428b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-20 19:30:18 +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
Dmitry Kurtaev
22cb65ada9
Update face detection network in samples
2018-08-14 13:16:23 +03:00
Alexander Alekhin
4eb2966559
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-07 20:12:10 +03:00
Vadim Pisarevsky
7c8ab271fc
Merge pull request #12125 from dkurt:dnn_mobilenet_ppn
2018-08-06 14:40:50 +00:00
Vadim Pisarevsky
e0c93bcf6c
Merge pull request #12082 from dkurt:dnn_ie_faster_rcnn
2018-08-06 14:28:58 +00:00
Maksim Shabunin
df9efbbd1f
Install data for samples to correct directories, do not download face_detector models in cmake
2018-08-02 14:24:05 +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
82c477c9f7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-31 21:35:00 +03:00
luz.paz
2003eb1b9b
Misc. typos
...
Found via `codespell -q 3 -I ../opencv-whitelist.txt --skip="./3rdparty"`
2018-07-31 18:44:23 +03:00
Vadim Pisarevsky
fa466b022d
Merge pull request #12052 from dkurt:dnn_ie_torch_tests
2018-07-26 09:09:35 +00:00
Dmitry Kurtaev
faa6c4e1e1
Faster-RCNN anf RFCN models on CPU using Intel's Inference Engine backend.
...
Enable Torch layers tests with Intel's Inference Engine backend.
2018-07-25 19:04:55 +03:00
Alexander Alekhin
9787ab598b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-24 22:48:54 +03:00
Dmitry Kurtaev
c213a3823e
Run entire SSDs from TensorFlow using Intel's Inference Engine
2018-07-19 17:05:56 +03:00
Alexander Alekhin
4560909a5e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-17 19:27:48 +03:00
berak
1c75f3d037
dnn: fix typo in object_detection.cpp sample
2018-07-12 11:06:53 +02:00
Alexander Alekhin
3165baa1f1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-02 14:58:29 +03:00
Dmitry Kurtaev
346871e27f
Set output layers names and types for models in DLDT's intermediate representation
2018-06-28 10:21:45 +03:00
Alexander Alekhin
0d6518aaa0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
2018-06-13 19:34:44 +03:00
Dmitry Kurtaev
40765c5f8d
Enable SSD models from TensorFlow with OpenCL plugin of Intel's Inference Engine
2018-06-08 16:55:21 +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
Vadim Pisarevsky
3cbd2e2764
Merge pull request #11650 from dkurt:dnn_default_backend
2018-06-06 09:30:39 +00:00
Alexander Alekhin
45dd575ed2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb
.
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489
.
2018-06-04 19:26:10 +03:00
Dmitry Kurtaev
b781ac7346
Make Intel's Inference Engine backend is default if no preferable backend is specified.
2018-06-04 18:31:46 +03:00
Alexander Alekhin
dcb9bc2544
python: eliminate pylint warnings
...
Tested with:
- pylint 1.9.1
2018-06-04 17:58:06 +03:00
Alexander Alekhin
f185802489
documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)
...
Other links:
- https://raw.githubusercontent.com/opencv/opencv/master
- https://github.com/opencv/opencv/blob/master
2018-05-31 19:30:56 +03:00
Alexander Alekhin
9ba9358ecb
documentation: avoid links to 'master' branch from 3.4 maintenance branch
2018-05-31 16:45:18 +03:00
Vadim Pisarevsky
c58cc4c2ff
Merge pull request #11255 from dkurt:dnn_tf_faster_rcnn
2018-05-31 11:07:39 +00:00
Dmitry Kurtaev
f96f934426
Update Intel's Inference Engine deep learning backend ( #11587 )
...
* Update Intel's Inference Engine deep learning backend
* Remove cpu_extension dependency
* Update Darknet accuracy tests
2018-05-31 14:05:21 +03:00
Spark Echo
80770aacd7
Merge pull request #11631 from sparkecho:3.4
...
Typo fixes (#11631 )
2018-05-31 07:23:19 +00:00
Dmitry Kurtaev
bf87a43185
Faster-RCNN object detection models from TensorFlow
2018-05-30 17:12:36 +03:00
Dmitry Kurtaev
3346a7ac0a
Fix batch normalization fusion from TensorFlow's SSDs
2018-05-23 16:49:31 +03:00
Alexander Alekhin
085b27fc3d
Merge pull request #11390 from dkurt:east_text_detection
2018-05-21 13:02:29 +00:00
Dmitry Kurtaev
07dc6d2b45
Return a convex hull from rotatedRectangleIntersection
2018-05-18 14:20:17 +03:00
Alexander Alekhin
8356a6b6ab
Merge pull request #11442 from cclauss:print-function
2018-05-11 13:26:04 +00: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
Alexander Alekhin
314246d396
Merge pull request #11459 from dkurt:dnn_mobilenet_v2
2018-05-11 09:48:05 +00:00
cabelo
1b3e0783f4
select the device (video capture)
2018-05-09 17:20:02 +03:00
Dmitry Kurtaev
d381948cee
Update script to generate MobileNet-SSD V2 text graph
2018-05-04 07:55:18 +03:00