Vadim Pisarevsky
|
b59f3989f5
|
fixed some compile warnings in dnn & protobuf; improved convolution layer performance when blas is not available by parallelizing gemmCPU() function in dnn
|
2016-09-21 18:13:17 +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 |
|
VBystricky
|
cc8442e435
|
Add CropLayer and EltWise layer implementation. Add sample for semantic segmentation network.
|
2016-08-06 17:25:13 +03:00 |
|
vbystricky
|
12c9b0ea35
|
Add Eltwise layer. Add case of FCN8s into sample for semantic segmentation
|
2016-07-22 15:37:04 +03:00 |
|
vbystricky
|
048c3fab26
|
Add Crop layer. Add sample of using FCN32s network for semantic sementation
|
2016-07-22 15:37:04 +03:00 |
|