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

Merge pull request #12775 from radomsak:radomsak_dnn_fix_caffe_importer_reused_layers

Browse Source
This commit is contained in:
Alexander Alekhin 2018-10-15 14:44:23 +00:00
commit f8a27d2603
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/dnn/src/caffe/caffe_importer.cpp
View File

@ -278,11 +278,13 @@ public:
int li; int li;
for (li = 0; li != netBinary.layer_size(); li++) for (li = 0; li != netBinary.layer_size(); li++)
{ {
if (netBinary.layer(li).name() == name) const caffe::LayerParameter& binLayer = netBinary.layer(li);
// Break if the layer name is the same and the blobs are not cleared
if (binLayer.name() == name && binLayer.blobs_size() != 0)
break; break;
} }
if (li == netBinary.layer_size() || netBinary.layer(li).blobs_size() == 0) if (li == netBinary.layer_size())
return; return;
caffe::LayerParameter* binLayer = netBinary.mutable_layer(li); caffe::LayerParameter* binLayer = netBinary.mutable_layer(li);

22
modules/dnn/test/test_caffe_importer.cpp
View File

@ -454,6 +454,28 @@ TEST(Test_Caffe, multiple_inputs)
normAssert(out, first_image + second_image); normAssert(out, first_image + second_image);
} }
TEST(Test_Caffe, shared_weights)
{
const string proto = findDataFile("dnn/layers/shared_weights.prototxt", false);
const string model = findDataFile("dnn/layers/shared_weights.caffemodel", false);
Net net = readNetFromCaffe(proto, model);
Mat input_1 = (Mat_<float>(2, 2) << 0., 2., 4., 6.);
Mat input_2 = (Mat_<float>(2, 2) << 1., 3., 5., 7.);
Mat blob_1 = blobFromImage(input_1);
Mat blob_2 = blobFromImage(input_2);
net.setInput(blob_1, "input_1");
net.setInput(blob_2, "input_2");
Mat sum = net.forward();
EXPECT_EQ(sum.at<float>(0,0), 12.);
EXPECT_EQ(sum.at<float>(0,1), 16.);
}
typedef testing::TestWithParam<tuple<std::string, Target> > opencv_face_detector; typedef testing::TestWithParam<tuple<std::string, Target> > opencv_face_detector;
TEST_P(opencv_face_detector, Accuracy) TEST_P(opencv_face_detector, Accuracy)
{ {