Alexander Alekhin
1c88a566e0
dnn: rename caffe protobuf package
2017-11-22 18:34:07 +03:00
Vadim Pisarevsky
f8ad289311
Merge pull request #10092 from alalek:dnn_rename_caffe_proto
2017-11-22 08:16:20 +00:00
Alexander Alekhin
438e456ce9
Merge pull request #10113 from wzw-intel:fusion
2017-11-20 18:13:33 +00:00
Alexander Alekhin
f19f2bbcde
dnn: autogenerated files
...
rename caffe.proto => opencv-caffe.proto
2017-11-20 19:04:02 +03:00
Alexander Alekhin
f6d927ef3b
dnn: avoid conflicts with original caffe.proto
...
rename caffe.proto => opencv-caffe.proto
2017-11-20 19:04:00 +03:00
Dmitry Kurtaev
6c5dd5cf6d
Replace caffe::NormalizedBBox to local structure
2017-11-20 18:03:31 +03:00
Wu Zhiwen
45d11dde57
dnn(ocl4dnn): add fusion support for Power activation and eltwise add
...
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2017-11-20 14:58:53 +08:00
Wu Zhiwen
394101d6ed
dnn(ocl4dnn): Fix relu fusion bug
...
Incorrect type of negative_slope result in this bug.
Also and OCL test for darknet to validate this patch.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2017-11-17 16:21:56 +08:00
Jcrist99
0608227e10
Merge pull request #9698 from abratchik:parse.doxygen
...
Support @deprecated tag in java wrappers (#9698 )
2017-11-16 16:48:12 +03:00
Wu Zhiwen
88e6daa315
dnn(ocl4dnn): Fix wrong measurement for tuning time
...
convolution kernel use default queue to run, so that ocl::Timer
, to measure the kernel run time, should use the default queue too.
Also remove useless parameter for convolve()
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2017-11-16 13:09:57 +08:00
Alexander Alekhin
bafdc44d37
Merge pull request #10061 from Sahloul:dnn_torch_fix
2017-11-10 05:05:52 +00:00
Alexander Alekhin
8a3a75cc16
Merge pull request #9882 from pengli:ocl4dnn
2017-11-09 18:54:43 +00:00
Hamdi Sahloul
06bda58a2c
DNN Torch - workaround when torch importer is disabled
2017-11-10 00:44:06 +09:00
Li Peng
8f99083726
Add new layer forward interface
...
Add layer forward interface with InputArrayOfArrays and
OutputArrayOfArrays parameters, it allows UMat buffer to be
processed and transferred in the layers.
Signed-off-by: Li Peng <peng.li@intel.com>
2017-11-09 15:59:39 +08:00
Alexander Alekhin
97181a90ba
dnn(ocl4dnn/conv): bailout on missing kernel configuration
2017-11-07 17:02:17 +03:00
Alexander Alekhin
6e4f9433d0
Merge pull request #9998 from alalek:ocl_fix_dnn_softmax_9991
2017-11-03 09:16:39 +00:00
Alexander Alekhin
bacc96f4e8
dnn(ocl): fix softmax global/local size consistency
2017-11-02 17:08:40 +03:00
Dmitry Kurtaev
14af2a0c0c
Fixed Halide's copy_to_device invocation
2017-11-01 14:01:54 +03:00
Vadim Pisarevsky
bc348eb8ab
Merge pull request #9963 from dkurt:fix_caffe_shrinker
2017-10-31 12:27:19 +00:00
Dmitry Kurtaev
e1ebc4e991
Specify layer types for Caffe FP32->FP16 weights converter
2017-10-31 12:31:40 +03:00
Dmitry Kurtaev
03cefa7bfe
Set zero confidences in case of no detections
2017-10-30 10:17:57 +03:00
Vadim Pisarevsky
e0e40405ed
Merge pull request #9847 from wzw-intel:ocl4dnn_fusion
2017-10-27 13:59:46 +00:00
Vadim Pisarevsky
ff037ebe5f
Merge pull request #9845 from dkurt:fast_neural_style_models
2017-10-27 13:59:02 +00:00
Vadim Pisarevsky
5384d2f090
Merge pull request #9880 from dkurt:caffe_ceil_mode
2017-10-27 11:51:46 +00:00
Dmitry Kurtaev
4b52b8df34
Layers for fast-neural-style models: https://github.com/jcjohnson/fast-neural-style
2017-10-27 14:26:45 +03:00
Vadim Pisarevsky
bc93775385
Merge pull request #9862 from sovrasov:dnn_nms
2017-10-27 11:19:57 +00:00
Vadim Pisarevsky
825c0ffdb4
Merge pull request #9874 from dkurt:fix_identity_permute_layer
2017-10-27 11:11:48 +00:00
Vadim Pisarevsky
69f2590359
Merge pull request #9921 from dkurt:fix_prelu_after_fully_connected
2017-10-27 11:10:59 +00:00
Vadim Pisarevsky
7b8fb64f21
Merge pull request #9939 from alalek:fix_dnn_getUMat_crash
2017-10-27 11:06:22 +00:00
Vladislav Sovrasov
5bf39ceb5d
dnn: handle 4-channel images in blobFromImage ( #9944 )
2017-10-27 14:06:53 +03: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
Vladislav Sovrasov
7e3e9144de
dnn: add an accuracy test for NMS
2017-10-25 13:40:56 +03:00
Vladislav Sovrasov
c704942b8a
dnn: add a documentation for NMS, fix missing experimantal namespace
2017-10-25 13:35:49 +03:00
Vladislav Sovrasov
acedb4a579
dnn: make NMS function public
2017-10-25 13:35:49 +03:00
Alexander Alekhin
a871f9e4f7
Merge branch 'update_version' into release
2017-10-23 18:41:12 +03:00
Dmitry Kurtaev
a36ebaecdc
PReLU layer for multidimensional input
2017-10-23 16:13:03 +03:00
Dmitry Kurtaev
410d44d67d
Binary data for batch normalization test from Torch
2017-10-20 12:01:42 +03:00
Alexander Alekhin
185faf99bd
ocl: simplify ocl::Timer interface
2017-10-18 16:01:21 +03:00
Dmitry Kurtaev
b903ff8992
Ceil mode from experimental version of Caffe, https://github.com/BVLC/caffe/pull/3057
2017-10-18 14:04:53 +03:00
Dmitry Kurtaev
a3a446c197
Output blobs shapes initialization in case of identity permutation (NCHW->NCHW)
2017-10-17 17:15:25 +03:00
Alexander Alekhin
110af09bf9
Merge pull request #9853 from catree:fix_dnn_samples_python3
2017-10-16 16:18:22 +00:00
Wu Zhiwen
2d8f2c2aea
dnn(ocl4dnn): add fusion support
...
ocl4dnn supports following fusion styles:
Conv + [BN] + [Scale] + [ReLU/PReLU]
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2017-10-16 19:18:36 +08:00
Maksim Shabunin
b066dd36ff
Fixed uninitialized class fields
2017-10-16 13:47:43 +03:00
catree
22dece8146
Fix DNN samples for compatibility with Python 3.
...
Add PyInt_Check in pyopencv_dnn.hpp.
2017-10-15 20:24:56 +02:00
Igor Wodiany
e2499e5b2f
Move vector_size_t and vector_vector_Mat
...
These two typdefs are not compiled when BUILD_opencv_dnn is set to
false, however there are other modules that uses these typedef so
it may cause build errors. Moving typedef to the python module
ensures they are always defined.
2017-10-14 19:06:15 +01:00
Alexander Alekhin
4857cae6ed
dnn: don't use "experimental_dnn_v1" namespace directly
2017-10-12 18:16:53 +03:00
Alexander Alekhin
df5b2224d7
Merge pull request #9829 from pengli:ocl4dnn
2017-10-12 11:26:20 +00:00
Li Peng
937b8e4277
dnn(ocl4dnn): support log softmax in ocl4dnn
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-10-12 09:51:13 +08:00
Vadim Pisarevsky
e356ca2369
Merge pull request #9835 from sovrasov:blob_from_img_crop_opt
2017-10-11 17:18:40 +00:00
Vadim Pisarevsky
8b168175ec
Merge pull request #9636 from dkurt:duplicate_lp_norm_layer
2017-10-11 13:36:14 +00:00
