1
0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-24 20:01:12 +08:00
Commit Graph

9 Commits

Author SHA1 Message Date
Vadim Pisarevsky
3f5b465501 refactored DNN (#1102)
* the first commit in the merged dnn: convert some public API from Blob's to Mat's

* temporarily or permantently removed OpenCL optimizations, which are not always stable nor usually very efficient; we'll likely use Halide instead

* got rid of Blob and BlobShape completely; use cv::Mat and std::vector<int> instead

* fixed a few compile errors

* got rid of separate .hpp files with layer declarations; instead, put everything into the respective .cpp files

* normalized all the layers' constructors; we concentrate on loading deep networks layers from files instead of constructing them from scratch, so we retained only SomeLayer::SomeLayer(const LayerParams& params); constructors

* fixed sample compilation

* suppress doxygen warnings

* trying to fix python bindings generation for DNN module

* temporarily disable python bindings while we refactor the module

* fix win32/win64 compile errors; remove trailing whitespaces

* fix win32/win64 compile errors; remove trailing whitespaces
2017-04-25 09:33:51 +03:00
Vitaliy Lyudvichenko
8dcc2610eb Merge remote-tracking branch 'origin/master' into dnn-python-bindings
# Conflicts:
#	modules/dnn/samples/fcn_semsegm.cpp
#	modules/dnn/src/caffe/caffe.proto
#	modules/dnn/src/caffe/compiled/caffe.tar.gz
#	modules/dnn/src/layers/crop_layer.cpp
#	modules/dnn/src/layers/crop_layer.hpp
#	modules/dnn/src/layers/eltwise_layer.cpp
#	modules/dnn/src/layers/eltwise_layer.hpp
2016-08-18 18:22:40 +03:00
Vitaliy Lyudvichenko
8e68d837de Merge branch 'object_detection_sample_ssd' into dnn*
# Conflicts:
#	modules/dnn/include/opencv2/dnn/blob.hpp
#	modules/dnn/src/init.cpp
#	modules/dnn/src/layers/concat_layer.cpp
#	modules/dnn/src/layers/convolution_layer.cpp
#	modules/dnn/src/layers/convolution_layer.hpp
#	modules/dnn/src/layers/layers_common.cpp
#	modules/dnn/src/layers/layers_common.hpp
#	modules/dnn/src/layers/op_im2col.hpp
#	modules/dnn/src/layers/pooling_layer.cpp
#	modules/dnn/src/layers/pooling_layer.hpp
2016-08-18 00:41:26 +03:00
apetrovichev
e88b06183c Fixed warning in the sample 2016-08-01 19:59:33 +03:00
Anna Petrovicheva
083616d05f Fixed warnings 2016-07-22 16:15:45 +03:00
Anna Petrovicheva
1f020151c3 Finalized the sample 2016-07-22 15:39:47 +03:00
Anna Petrovicheva
740ca1d26a Finalized the sample 2016-07-22 15:39:47 +03:00
Anna Petrovicheva
355d07ecef Network initialized successfully 2016-07-22 15:37:04 +03:00
Anna Petrovicheva
b65a84fac0 Modified the sample 2016-07-22 15:37:04 +03:00