Merge pull request opencv#10445 from pengli:dnn

alalek · alalek · commit 3542c98d4524 · 2017-12-28T04:43:41.000Z
diff --git a/modules/dnn/src/dnn.cpp b/modules/dnn/src/dnn.cpp
@@ -1123,13 +1123,13 @@ struct Net::Impl
         {
             if (use_umat)
             {
+                std::vector<Mat> input_mats(ld.umat_inputBlobs.size());;
                 std::vector<Mat*> inputs(ld.umat_inputBlobs.size());;
                 std::vector<Mat> outputs(ld.umat_outputBlobs.size());
-                Mat mat;
                 for (int i = 0; i < inputs.size(); i++)
                 {
-                    mat = ld.umat_inputBlobs[i].getMat(ACCESS_READ);
-                    inputs[i] = &mat;
+                    input_mats[i] = ld.umat_inputBlobs[i].getMat(ACCESS_READ);
+                    inputs[i] = &input_mats[i];
                 }
                 for (int i = 0; i < outputs.size(); i++)
                 {
diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp
@@ -600,4 +600,30 @@ TEST(Layer_Test_FasterRCNN_Proposal, Accuracy)
         EXPECT_EQ(countNonZero(out.rowRange(numDets, out.size[0])), 0);
 }
 
+OCL_TEST(Layer_Test_FasterRCNN_Proposal, Accuracy)
+{
+    Net net = readNetFromCaffe(_tf("net_faster_rcnn_proposal.prototxt"));
+
+    net.setPreferableBackend(DNN_BACKEND_DEFAULT);
+    net.setPreferableTarget(DNN_TARGET_OPENCL);
+
+    Mat scores = blobFromNPY(_tf("net_faster_rcnn_proposal.scores.npy"));
+    Mat deltas = blobFromNPY(_tf("net_faster_rcnn_proposal.deltas.npy"));
+    Mat imInfo = (Mat_<float>(1, 3) << 600, 800, 1.6f);
+    Mat ref = blobFromNPY(_tf("net_faster_rcnn_proposal.npy"));
+
+    net.setInput(scores, "rpn_cls_prob_reshape");
+    net.setInput(deltas, "rpn_bbox_pred");
+    net.setInput(imInfo, "im_info");
+
+    Mat out = net.forward();
+
+    const int numDets = ref.size[0];
+    EXPECT_LE(numDets, out.size[0]);
+    normAssert(out.rowRange(0, numDets), ref);
+
+    if (numDets < out.size[0])
+        EXPECT_EQ(countNonZero(out.rowRange(numDets, out.size[0])), 0);
+}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -1123,13 +1123,13 @@ struct Net::Impl`
`1123`	`1123`	`{`
`1124`	`1124`	`if (use_umat)`
`1125`	`1125`	`{`
	`1126`	`+ std::vector<Mat> input_mats(ld.umat_inputBlobs.size());;`
`1126`	`1127`	`std::vector<Mat*> inputs(ld.umat_inputBlobs.size());;`
`1127`	`1128`	`std::vector<Mat> outputs(ld.umat_outputBlobs.size());`
`1128`		`- Mat mat;`
`1129`	`1129`	`for (int i = 0; i < inputs.size(); i++)`
`1130`	`1130`	`{`
`1131`		`- mat = ld.umat_inputBlobs[i].getMat(ACCESS_READ);`
`1132`		`- inputs[i] = &mat;`
	`1131`	`+ input_mats[i] = ld.umat_inputBlobs[i].getMat(ACCESS_READ);`
	`1132`	`+ inputs[i] = &input_mats[i];`
`1133`	`1133`	`}`
`1134`	`1134`	`for (int i = 0; i < outputs.size(); i++)`
`1135`	`1135`	`{`