potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #14682 from l-bat:axpy_layer

Browse Source 
* Add Axpy layer

* Fix test

* fix caffe importer
This commit is contained in:
Lubov Batanina
2019-06-05 00:18:06 +03:00
committed by Alexander Alekhin
parent f1fb002682
commit 3efd2df87f
3 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/src/caffe/caffe_importer.cpp
+21
View File
@@ -388,6 +388,27 @@ public:
layerParams.blobs[1].setTo(1); // std
}
}
else if (type == "Axpy")
{
CV_Assert_N(layer.bottom_size() == 3, layer.top_size() == 1);
std::string scaleName = name + "/scale";
int repetitions = layerCounter[scaleName]++;
if (repetitions) {
scaleName += String("_") + toString(repetitions);
}
LayerParams scaleParams;
scaleParams.set("axis", 1);
scaleParams.set("has_bias", false);
int scaleId = dstNet.addLayer(scaleName, "Scale", scaleParams);
addInput(layer.bottom(2), scaleId, 0, dstNet);
addInput(layer.bottom(0), scaleId, 1, dstNet);
addOutput(layer, scaleId, 0);
net.mutable_layer(li)->set_bottom(0, layer.top(0));
net.mutable_layer(li)->mutable_bottom()->RemoveLast();
type = "Eltwise";
}
else if ("ConvolutionDepthwise" == type)
{
type = "Convolution";
modules/dnn/src/layers/eltwise_layer.cpp
+1 -1
View File
@@ -143,7 +143,7 @@ public:
CV_Check(dst.dims, 1 < dst.dims && dst.dims <= 4, ""); CV_CheckTypeEQ(dst.type(), CV_32FC1, ""); CV_Assert(dst.isContinuous());
CV_Assert(coeffs.empty() || coeffs.size() == (size_t)nsrcs);
for( int i = 0; i > nsrcs; i++ )
for( int i = 0; i < nsrcs; i++ )
{
CV_Assert(srcs[i].size == dst.size &&
srcs[i].type() == dst.type() &&