Alexander Alekhin
0e4eed0ba1
Merge pull request #10867 from dkurt:dnn_fix_ave_pooling_area
2018-02-16 11:17:32 +00:00
Alexander Alekhin
c020a7bb67
build: portable integer types
2018-02-15 23:43:02 +03:00
Dmitry Kurtaev
f8d0d6365e
Add a flag to manage average pooling with padding
2018-02-14 16:56:31 +03:00
Alexander Alekhin
cff79609c8
Merge pull request #10854 from pengli:dnn
2018-02-14 12:49:53 +00:00
Vadim Pisarevsky
ef70b0baa4
Merge pull request #10865 from dkurt:dnn_inf_engine_getInputsInfo
2018-02-14 12:25:18 +00:00
Dmitry Kurtaev
a66b5e2c13
Add const getInputsInfo
2018-02-14 14:17:44 +03:00
Vadim Pisarevsky
6dfd7e3da2
Merge pull request #10850 from dkurt:dnn_tf_deconv_tests
2018-02-14 10:35:14 +00:00
Li Peng
80d1f2ddfa
re-enable tensor flow mobilenet ssd ocl test
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-14 01:04:58 +08:00
Li Peng
5992c46606
add fallback case for ocl convolution
...
The ocl convolution doesn't support tensorflow padMode well.
Add fallback check if we meet this situation, it could fix the
tensorflow MobileNet SSD failure.
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-14 00:04:38 +08:00
Li Peng
00d2f34888
ocl fix for detection_output and prior_box layer
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-13 23:09:14 +08:00
Dmitry Kurtaev
514e6df460
Refactored deep learning layers fusion
2018-02-13 14:35:58 +03: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
Alexander Alekhin
66f3c1ae79
Merge pull request #10843 from luzpaz:misc-modules-typos
2018-02-12 13:47:12 +00:00
Sui Libin
1ad814a191
fix faster_rcnn sample crashed at PoolingInvoker on Windows7(x64). ( #10724 )
...
* fix faster_rcnn sample crashed at PoolingInvoker operator() of pooling_layer.
* find_odj onmouse bug about find matched point status.
* reverted AutoBuffer back to std::vector
2018-02-12 16:07:56 +03:00
luz.paz
5718d09e39
Misc. modules/ typos
...
Found via `codespell`
2018-02-12 07:09:43 -05:00
Rémi Ratajczak
b67523550f
dnn : Added an imagesFromBlob method to the dnn module ( #10607 )
...
* Added the imagesFromBlob method to the dnn module.
* Rewritten imagesFromBlob based on first dkurt comments
* Updated code with getPlane()
* Modify comment of imagesFromBlob() in dnn module
* modified comments, removed useless assertions & added OutputArrayOfArray
* replaced tabs with whitespaces & put vectorOfChannels instantiation outside the loop
* Changed pre-commit.sample to pre-commit in .git/hooks/
* Added a test for imagesFromBlob in test_misc.cpp (dnn)
* Changed nbOfImages, robustified test with cv::randu, modified assertion
2018-02-12 14:51:07 +03:00
Alexander Alekhin
5a791e6e06
cmake: update reporting of excluded dispatching files ( #10711 )
...
* cmake: add ocv_get_smart_file_name() macro
* cmake: avoid adding files for unavailable dispatch modes
2018-02-12 14:48:20 +03:00
Dmitry Kurtaev
7fe97376c2
MobileNet-SSD from TensorFlow 1.3 and Inception-V2-SSD using Inference Engine backend
2018-02-09 13:45:45 +03:00
Vadim Pisarevsky
835acd3f31
Merge pull request #10799 from dkurt:dnn_inference_engine_face_detection
2018-02-07 13:42:08 +00:00
Dmitry Kurtaev
ed94136548
OpenCV face detection network using Inference Engine backend
2018-02-06 17:53:24 +03:00
Alexander Alekhin
c973aaabc5
Merge pull request #10787 from dkurt:dnn_tutorial_face_detection
2018-02-06 14:37:09 +00:00
Dmitry Kurtaev
8817907647
Test for FP16 version of OpenCV face detection network
2018-02-06 13:16:07 +03:00
Alexander Alekhin
398ebbac98
Merge pull request #10795 from pengli:dnn
2018-02-06 10:04:29 +00:00
Li Peng
c43498c6ad
check vector emptiness before access it
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-06 22:59:51 +08:00
Li Peng
389fa5d38e
slice layer ocl update
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-06 22:59:47 +08:00
Alexander Alekhin
2a1f46c42d
Merge pull request #9770 from alalek:refactor_test_files
2018-02-06 09:33:58 +00:00
Dmitry Kurtaev
10e1de74d2
Intel Inference Engine deep learning backend ( #10608 )
...
* Intel Inference Engine deep learning backend.
* OpenFace network using Inference Engine backend
2018-02-06 11:57:35 +03:00
Alexander Alekhin
4a297a2443
ts: refactor OpenCV tests
...
- removed tr1 usage (dropped in C++17)
- moved includes of vector/map/iostream/limits into ts.hpp
- require opencv_test + anonymous namespace (added compile check)
- fixed norm() usage (must be from cvtest::norm for checks) and other conflict functions
- added missing license headers
2018-02-03 19:39:47 +00:00
Alexander Alekhin
3d6659112f
cmake: fix includes processing
2018-02-02 21:52:54 +03:00
Maksim Shabunin
e56d6054aa
Do not build protobuf without dnn ( #10689 )
...
* Do not build protobuf if dnn is disabled
* Added BUILD_LIST cmake option to the cache
* Moved protobuf to the top level
* Fixed static build
* Fixed world build
* fixup! Fixed world build
2018-02-01 16:30:23 +03:00
Vadim Pisarevsky
36222c9eed
Merge pull request #10730 from dkurt:dnn_faster_rcnn_rfcn_tests
2018-02-01 13:28:10 +00:00
Vadim Pisarevsky
713ec7be45
Merge pull request #10746 from dkurt:dnn_batch_norm_from_nvidia_caffe
2018-02-01 13:22:09 +00:00
Alexander Alekhin
42569cfd61
Merge pull request #10748 from dkurt:fix_dnn_slice_layer
2018-02-01 13:21:17 +00:00
Alexander Alekhin
9d25bd583f
Merge pull request #10754 from dkurt:dnn_ocl_gemv_min_globalsize
2018-02-01 12:39:27 +00:00
Dmitry Kurtaev
65a6674c6e
ocl4dnnGEMV in case of row_size < 4
2018-02-01 14:06:47 +03:00
Alexander Alekhin
9698b93d10
Merge pull request #10717 from pengli:dnn
2018-02-01 10:49:54 +00:00
Li Peng
6aec71d7ee
mvn layer ocl update
...
it fuse ocl kernels to reduce kernel enqueue
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-01 17:48:12 +08:00
Li Peng
83b16ab7b7
fix extra spaces in build option
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-01 17:46:11 +08:00
Li Peng
54c81cbde4
eltwise layer SUM op update
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-01 17:46:06 +08:00
Dmitry Kurtaev
184862582c
Fix slice layer from TensorFlow
2018-01-31 19:12:37 +03:00
Arjan van de Ven
a75840d19c
Merge pull request #10468 from fenrus75:avx512-2
...
* Add a 512 bit codepath to the AVX512 fastConv function
this patch adds a 512 wide codepath to the fastConv() function for
AVX512 use.
The basic idea is to process the first N * 16 elements of the vector
with avx512, and then run the rest of the vector using the traditional
AVX2 codepath.
* dnn: use unaligned AVX512 load (OpenCV aligns data on 32-byte boundary)
* dnn: change "vecsize" condition for AVX512
* dnn: fix indentation
2018-01-31 16:34:12 +03:00
Alexander Alekhin
f06c44f1f1
Merge pull request #10701 from dkurt:tf_ave_pooling
2018-01-31 13:28:09 +00:00
Dmitry Kurtaev
844f1d0281
Fix Batch Normalization layer imported from NVIDIA Caffe.
2018-01-31 16:25:45 +03:00
Dmitry Kurtaev
a2e9bfbaf4
Fix padding for average pooling from TensorFlow
2018-01-31 15:54:30 +03:00
Dmitry Kurtaev
ae2e4af4a1
Faster-RCNN and RFCN tests
...
https://github.com/rbgirshick/py-faster-rcnn
https://github.com/YuwenXiong/py-R-FCN
2018-01-30 13:17:35 +03:00
Li Peng
7a4c5e9421
slice layer ocl support
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-29 22:34:32 +08:00
Alexander Alekhin
2876670de3
dnn(ocl): fix build options for Apple OpenCL
2018-01-28 01:54:25 +00:00
Alexander Alekhin
104502c5be
Merge pull request #10676 from dkurt:dnn_for_newer_mobilenet_ssd
2018-01-26 04:02:21 +00:00
Li Peng
2493083935
mvn, batch_norm and relu layer fusion
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-25 18:57:05 +08:00
Li Peng
e15928b49e
convolution and tanh layer fusion
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-25 17:45:33 +08:00