Alexander Alekhin
aea25e7f90
Merge pull request #9676 from jrobble:fix_caffe_swaprb
2017-09-25 16:05:11 +00:00
Alexander Alekhin
78788e1efb
dnn(perf): update perf tests
2017-09-25 15:32:37 +03:00
jrobble
c67ad49378
Set swapRB to false in Caffe tests and examples.
2017-09-22 09:58:48 -04: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
Alexander Alekhin
6a5298a532
Merge pull request #9664 from tomoaki0705:fixBuildVS2013
2017-09-19 12:25:18 +00:00
Tomoaki Teshima
48c4bea57c
fix build on Visual Studio 2013 and earlier
2017-09-19 19:08:23 +09:00
Vadim Pisarevsky
f7df5dd32c
Merge pull request #9305 from dkurt:public_dnn_importer_is_deprecated
2017-09-18 09:35:35 +00:00
Vadim Pisarevsky
e012ccda4a
Merge pull request #9517 from dkurt:tf_mobilenet
2017-09-18 09:31:19 +00:00
Vadim Pisarevsky
3358b8910b
Merge pull request #9591 from dkurt:feature_dnn_caffe_importer_fp16
2017-09-18 09:26:23 +00:00
Dmitry Kurtaev
bd8e6b7e14
Make external cv::dnn::Importer usage is deprecated
2017-09-18 08:52:36 +03:00
Vadim Pisarevsky
4196543cd5
Merge pull request #9313 from dkurt:dnn_perf_test
2017-09-16 19:39:23 +00:00
Dmitry Kurtaev
d891e9b1d8
Layers for MobileNet from TensorFlow
2017-09-15 20:17:30 +03:00
Dmitry Kurtaev
8646d5fb84
FP16 Caffe models import and export
2017-09-15 18:06:34 +03:00
Vadim Pisarevsky
6bf8fe815d
Merge pull request #9384 from dkurt:torch_split
2017-09-15 13:05:05 +00:00
Vadim Pisarevsky
a391871cce
Merge pull request #9301 from dkurt:dnn_npy
2017-09-15 12:42:02 +00:00
Vadim Pisarevsky
41b23fde9f
Merge pull request #9524 from dkurt:dnn_torch_openface
2017-09-15 12:38:12 +00:00
Vadim Pisarevsky
cb0d695984
Merge pull request #9616 from dkurt:feature_dnn_tf_importer_atrous_conv
2017-09-15 10:24:05 +00:00
Dmitry Kurtaev
0ce7c33bc8
Torch's Concat and ConcatTable doesn't use Split layer
2017-09-14 09:26:57 +03:00
Dmitry Kurtaev
7dc6b1d7d4
Layers for OpenFace face recognition network
2017-09-14 09:11:31 +03:00
Dmitry Kurtaev
58b890b9f7
Dilated convolution import from TensorFlow
2017-09-13 18:44:14 +03:00
Dmitry Kurtaev
6639348c5e
Disable SSD on CPU Halide test
2017-09-13 18:19:54 +03:00
Vadim Pisarevsky
8c7f19850f
Merge pull request #9576 from dkurt:feature_dnn_tf_importer_fp16
2017-09-13 13:57:38 +00:00
Vadim Pisarevsky
93c3f20deb
Merge pull request #9569 from dkurt:test_dnn_ssd_halide
2017-09-13 13:29:50 +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
cad7c4d51d
MobileNet-SSD and VGG-SSD topologies in Halide
2017-09-08 09:55:53 +03:00
Alexander Alekhin
01519313d7
dnn: invalid bindings
2017-08-31 19:35:48 +03:00
Dmitry Kurtaev
5c43a394c5
Added performance test for Caffe framework
2017-08-27 19:40:58 +03:00
Alexander Alekhin
3202bbe17c
Merge pull request #9349 from dkurt:tf_deconv
2017-08-24 15:58:38 +00:00
Alexander Alekhin
8e7e24ac80
Merge pull request #9394 from dkurt:fix_halide_wrapper
2017-08-24 15:56:54 +00:00
Alexander Alekhin
25a4559565
Merge pull request #9294 from arrybn:layers_perf
2017-08-24 09:37:49 +00:00
Aleksandr Rybnikov
8b1146deb2
Added function to get timings for layers
2017-08-23 13:40:05 +03:00
Dmitry Kurtaev
e74c475162
Removed 3rdparty serialized NumPy arrays parser
2017-08-22 18:14:32 +03:00
Dmitry Kurtaev
54f0616a13
Deconvolution layer from TensorFlow
2017-08-21 21:38:07 +03:00
Dmitry Kurtaev
4e28c00e7b
Fix Halide buffer behavior in case of OpenCL device memory allocation
2017-08-17 13:27:54 +03:00
dkurt
339793143c
Unit tests for TensorFlow importer
2017-08-03 11:29:48 +03:00
Alexander Alekhin
0bd357e7ec
Merge pull request #9296 from dkurt:halide_device_interface
2017-08-02 20:26:30 +00:00
dkurt
b1ef44b1ac
Replace halide_opencl_device_interface
2017-08-02 20:38:30 +03:00
Aleksandr Rybnikov
8d6b8b45b6
Added ELU and test for it
2017-08-02 11:13:59 +03:00
Alexander Alekhin
bab4bc0968
Merge pull request #9284 from ipuustin:dnn-opencl-fixes
2017-08-01 13:06:01 +00:00
Ismo Puustinen
c2de5cf735
dnn: force floating point literals to be float.
...
In OpenCL code in activations.cl, make the type of floating point
literals to be float. Otherwise the values will be interpreted as
doubles, causing Beignet to have type conversion issues.
2017-08-01 15:02:24 +03:00
Alexander Alekhin
2959e7aba9
Merge pull request #9188 from arrybn:mobilenet_ssd_sample
2017-08-01 11:12:54 +00:00
Aleksandr Rybnikov
ce1cc352d9
MobileNet SSD sample
2017-08-01 12:30:27 +03:00
Alexander Alekhin
cbced23de4
cmake: don't include protobuf on disabled DNN module
2017-07-31 14:18:59 +03:00
Alexander Alekhin
34f9c039c5
Merge pull request #9238 from alalek:valgrind_fixes
2017-07-27 14:33:01 +00:00
Alexander Alekhin
06407b4d14
Merge pull request #9233 from LaurentBerger:dnndoc
2017-07-26 16:25:28 +00:00
Alexander Alekhin
3f102e5d3a
dnn: protobuf shutdown
2017-07-26 17:21:46 +03:00
LaurentBerger
69fd57bc96
update tutorial link for dnn
2017-07-25 19:32:17 +02:00
Alexander Alekhin
878a6906cc
dnn: fix torch importer memory leaks
2017-07-25 12:20:55 +03:00
dkurt
70ff3804e9
Fix SqueezeNet Halide performance test
2017-07-24 10:45:04 +03:00
Tomoaki Teshima
0f91faddae
fix linker error when trying CPU_BASELINE=AVX
2017-07-21 21:13:47 +09:00
Alexander Alekhin
ce6b06efb9
Merge pull request #9203 from tomoaki0705:eliminateRandFromTest
2017-07-20 15:31:41 +00:00
Alexander Alekhin
ab58cac236
Merge pull request #9194 from tomoaki0705:fixBuildErrorDnn
2017-07-20 15:27:07 +00:00
Tomoaki Teshima
e63d628677
remove some rand functions
...
* make test more reproducible
2017-07-20 22:43:11 +09:00
Alexander Alekhin
08c94aa5c0
build: reuse int32_t workaround from softfloat.hpp
2017-07-20 14:01:21 +03:00
Tomoaki Teshima
1989bc33a7
fix build error on Visual Studio 2012
2017-07-20 11:00:04 +09:00
Aleksandr Rybnikov
7d1140340e
Rewrote googlenet tests
2017-07-18 18:49:14 +03:00
Alexander Alekhin
dc59476c34
Merge pull request #9078 from arrybn:resnet_squeezenet_tests
...
Added tests for ResNet-50 and SqueezeNet v1.1
2017-07-14 16:50:25 +00:00
Vadim Pisarevsky
0488d9bdb2
optimize out scaleLayer & concatLayer whenever possible
...
fixed problem in concat layer by disabling memory re-use in layers with multiple inputs
trying to fix the tests when Halide is used to run deep nets
another attempt to fix Halide tests
see if the Halide tests will pass with concat layer fusion turned off
trying to fix failures in halide tests; another try
one more experiment to make halide_concat & halide_enet tests pass
continue attempts to fix halide tests
moving on
uncomment parallel concat layer
seemingly fixed failures in Halide tests and re-enabled concat layer fusion; thanks to dkurt for the patch
2017-07-14 18:30:53 +03:00
Alexander Alekhin
4784c7be5f
dnn: cleanup dispatched code, fix SIMD128 types
2017-07-13 19:00:34 +03:00
Alexander Alekhin
c3e6de293f
dnn: code cleanup, refactor detection output layer
2017-07-13 19:00:34 +03:00
Alexander Alekhin
544908d06c
dnn: some minor fixes in docs, indentation, unused code
2017-07-13 15:33:49 +03:00
Alexander Alekhin
520da7aaaf
Merge pull request #9111 from vpisarev:dnn_optim_avx1
2017-07-13 12:27:05 +00:00
dkurt
3203635765
Eltwise layer fixes
2017-07-10 12:58:11 +03:00
Vadim Pisarevsky
ed9564106c
reuse AVX2-optimized kernels for AVX1 CPUs (like IvyBridge)
2017-07-06 21:36:59 +03:00
Aleksandr Rybnikov
d3c14ce3ea
Added tests for ResNet-50 and SqueezeNet v1.1
2017-07-04 12:19:27 +03:00
Alexander Alekhin
9aaf6a66a3
Merge pull request #9073 from berak:dnn_fix_tutorial_links
2017-07-03 16:11:10 +00:00
Alexander Alekhin
32d1eb36df
dnn: fix links
2017-07-03 12:44:27 +03:00
berak
34c0ab5878
dnn: fix some tutorial links
2017-07-02 10:09:27 +02:00
abratchik
8f7181429f
add java wrappers to dnn module
2017-07-02 11:46:20 +04:00
Alexander Alekhin
6ea6e4bceb
binding: fix headers processing
2017-06-30 14:53:21 +03:00
Maksim Shabunin
638a01a014
Merge pull request #9038 from mshabunin:fix-static-4
2017-06-30 10:39:36 +00:00
Maksim Shabunin
90d2f8b5fe
Merge pull request #9035 from alalek:dnn_fix_halide_tests
2017-06-30 10:29:13 +00:00
Maksim Shabunin
e0393f8557
Fixed some issues found by static analysis (4th round)
2017-06-30 12:26:53 +03:00
Aleksandr Rybnikov
fab4f4b9d5
Disabled logging in caffe parser in release
2017-06-29 17:36:48 +03:00
Alexander Alekhin
72a765d766
dnn: fix compilation of Halide tests
2017-06-29 16:36:34 +03:00
Vadim Pisarevsky
ac49a17a82
Merge pull request #9022 from dkurt:keep_conv_weights_for_halide
2017-06-29 11:09:17 +00:00
Vadim Pisarevsky
fb1dcdd17d
Merge pull request #9029 from alalek:dnn_cleanup_torch
2017-06-29 11:07:35 +00:00
Maksim Shabunin
f1a56cb4b7
Merge pull request #9028 from alalek:dnn_experimental_namespace
2017-06-29 07:37:04 +00:00
Maksim Shabunin
ace0701a46
Merge pull request #9019 from alalek:dnn_trace
2017-06-29 07:33:46 +00:00
Alexander Alekhin
511e50c19c
dnn: cleanup torch integration code
2017-06-28 21:49:37 +00:00
Alexander Alekhin
324851882a
Merge pull request #9025 from mshabunin:fix-static-3
2017-06-28 20:50:21 +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
Maksim Shabunin
a769d69a9d
Fixed several issues found by static analysis
2017-06-28 18:06:18 +03:00
dkurt
b46f5b1b38
Align convolutional layer weights separately from origin ones
2017-06-28 17:05:56 +03:00
Alexander Alekhin
ed10383359
dnn: added trace macros
2017-06-28 14:57:26 +03:00
Vadim Pisarevsky
c5faa9aefa
Merge pull request #9013 from arrybn:ssd_last_layers_optim
2017-06-28 10:38:55 +00:00
Vadim Pisarevsky
bbb14d3746
Merge pull request #9003 from dkurt:halide_bug_fixes
2017-06-28 08:48:27 +00:00
Aleksandr Rybnikov
ec321e651f
Removed usage of std::map in DetectionOutput layer
2017-06-28 11:31:38 +03:00
Vadim Pisarevsky
2ae849091c
Merge pull request #9009 from alalek:fix_dnn_initialization
2017-06-28 08:26:29 +00:00
Vadim Pisarevsky
8b3d6603d5
another round of dnn optimization ( #9011 )
...
* another round of dnn optimization:
* increased malloc alignment across OpenCV from 16 to 64 bytes to make it AVX2 and even AVX-512 friendly
* improved SIMD optimization of pooling layer, optimized average pooling
* cleaned up convolution layer implementation
* made activation layer "attacheable" to all other layers, including fully connected and addition layer.
* fixed bug in the fusion algorithm: "LayerData::consumers" should not be cleared, because it desctibes the topology.
* greatly optimized permutation layer, which improved SSD performance
* parallelized element-wise binary/ternary/... ops (sum, prod, max)
* also, added missing copyrights to many of the layer implementation files
* temporarily disabled (again) the check for intermediate blobs consistency; fixed warnings from various builders
2017-06-28 11:15:22 +03:00
Alexander Alekhin
00dd433368
dnn: fix LayerFactory initialization
2017-06-27 23:19:53 +03:00
Alexander Alekhin
f8a75c4361
dispatch: added CV_TRY_${OPT} macro, fix dnn build
...
- 1: OPT is available directly or via dispatcher
- 0: optimization is not compiled at all
2017-06-27 17:05:15 +03:00
dkurt
121789f78e
Fixed some bugs from Halide tests
2017-06-27 14:52:46 +03:00
Alexander Alekhin
16d1bbf2ea
dnn: fix build
...
- winpack
- opencv_world
2017-06-27 09:07:01 +03:00
Alexander Alekhin
986d27e49c
dnn: fix failed Torch tests
...
"Torch invalid argument 2: position must be smaller than LLONG_MAX"
These conditions are always true for "long position" argument.
2017-06-26 22:02:22 +03:00
Alexander Alekhin
93091ba203
dnn: AVX2 fix invalid unaligned read
2017-06-26 19:48:42 +03:00
Alexander Alekhin
623de337e8
dnn: fix build warnings
2017-06-26 19:48:42 +03:00
Alexander Alekhin
ee54bafe6b
dnn: fix dnn python test files
2017-06-26 15:13:00 +03:00
Alexander Alekhin
e03569f3a8
dnn: remove obsolete "build opencv_contrib with dnn module" tutorial
2017-06-26 15:12:00 +03:00
Alexander Alekhin
382e38941c
dnn: fix documentation links
2017-06-26 15:10:50 +03:00
Alexander Alekhin
14de8ac951
dnn: move samples
2017-06-26 14:51:12 +03:00
Alexander Alekhin
6031c79197
dnn: remove unused README
2017-06-26 14:51:12 +03:00
Alexander Alekhin
7f12836df9
dnn: fix public headers guards
2017-06-26 14:21:33 +03:00
Alexander Alekhin
93729784bb
dnn: move module from opencv_contrib
...
e6f63c7a38/modules/dnn
2017-06-26 13:41:51 +03:00