Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2019-11-11 18:24:05 +00:00
parent 5dd3e6052e ba58bba4e8
commit b6a58818bb
20 changed files with 354 additions and 299 deletions
@@ -86,6 +86,8 @@ TEST_P(dump, Regression)
    Net net = readNet(findDataFile("dnn/squeezenet_v1.1.prototxt"),
                      findDataFile("dnn/squeezenet_v1.1.caffemodel", false));

+    ASSERT_EQ(net.getLayerInputs(net.getLayerId("fire2/concat")).size(), 2);
+
    int size[] = {1, 3, 227, 227};
    Mat input = cv::Mat::ones(4, size, CV_32F);
    net.setInput(input);