mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PReLU layer for multidimensional input

Browse Source
This commit is contained in:
Dmitry Kurtaev 2017-10-23 14:30:40 +03:00
parent cca99bf824
commit a36ebaecdc
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/dnn/src/layers/elementwise_layers.cpp
View File

@ -80,20 +80,19 @@ public:
void operator()(const Range &r) const
{
int nstripes = nstripes_, nsamples, outCn;
size_t planeSize;
int nstripes = nstripes_, nsamples = 1, outCn = 1;
size_t planeSize = 1;
if( src_->dims == 4 )
if (src_->dims > 1)
{
nsamples = src_->size[0];
outCn = src_->size[1];
planeSize = (size_t)src_->size[2]*src_->size[3];
}
else
{
nsamples = outCn = 1;
planeSize = (size_t)src_->total();
}
outCn = src_->size[0];
for (int i = 2; i < src_->dims; ++i)
planeSize *= src_->size[i];
size_t stripeSize = (planeSize + nstripes - 1)/nstripes;
size_t stripeStart = r.start*stripeSize;

3
modules/dnn/src/layers/fully_connected_layer.cpp
View File

@ -242,9 +242,8 @@ public:
}
}
// TODO: check whether this is correct in the case of ChannelsPReLU.
if(activ)
activ->forwardSlice(dptr, dptr, nw, 0, 0, 1);
activ->forwardSlice(dptr, dptr, 1, 1, delta, delta + nw);
ofs += nw;
}

2
modules/dnn/src/layers/prior_box_layer.cpp
View File

@ -177,7 +177,7 @@ public:
: _boxWidth(0), _boxHeight(0)
{
setParamsFrom(params);
_minSize = getParameter<unsigned>(params, "min_size");
_minSize = getParameter<float>(params, "min_size");
CV_Assert(_minSize > 0);
_flip = getParameter<bool>(params, "flip");

1
modules/dnn/test/test_layers.cpp
View File

@ -282,6 +282,7 @@ TEST(Layer_Test_Eltwise, Accuracy)
TEST(Layer_Test_PReLU, Accuracy)
{
testLayerUsingCaffeModels("layer_prelu", DNN_TARGET_CPU, true);
testLayerUsingCaffeModels("layer_prelu_fc", DNN_TARGET_CPU, true, false);
}
//template<typename XMat>