Limit Concat layer optimization

dkurt · dkurt · commit 70c605a03d02 · 2017-12-26T16:49:33.000+03:00
diff --git a/modules/dnn/src/dnn.cpp b/modules/dnn/src/dnn.cpp
@@ -1398,7 +1398,8 @@ struct Net::Impl
                         LayerPin pin = ld.inputBlobsId[i];
                         LayerData* inp_i_data = &layers[pin.lid];
                         while(inp_i_data->skipFlags[DNN_BACKEND_DEFAULT] &&
-                              inp_i_data->inputBlobsId.size() == 1)
+                              inp_i_data->inputBlobsId.size() == 1 &&
+                              inp_i_data->consumers.size() == 1)
                         {
                             pin = inp_i_data->inputBlobsId[0];
                             inp_i_data = &layers[pin.lid];
@@ -1428,15 +1429,11 @@ struct Net::Impl
                             Mat output_slice = output(chrange);
                             Mat& curr_output = inp_i_data->outputBlobs[pin.oid];
                             CV_Assert(output_slice.isContinuous() && output_slice.size == curr_output.size);
+                            Mat* oldPtr = &curr_output;
                             curr_output = output_slice;
-
-                            pin = ld.inputBlobsId[i];
-                            inp_i_data = &layers[pin.lid];
-                            for (int j = 0; j < inp_i_data->consumers.size(); ++j)
-                            {
-                                LayerPin consumer = inp_i_data->consumers[j];
-                                layers[consumer.lid].inputBlobs[consumer.oid] = &curr_output;
-                            }
+                            // Layers that refer old input Mat will refer to the
+                            // new data but the same Mat object.
+                            CV_Assert(curr_output.data == output_slice.data, oldPtr == &curr_output);
                         }
                         ld.skipFlags[DNN_BACKEND_DEFAULT] = true;
                         printf_(("\toptimized out Concat layer %s\n", concatLayer->name.c_str()));
diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp
@@ -314,6 +314,7 @@ TEST(Layer_Test_Fused_Concat, Accuracy)
     //
 
     testLayerUsingCaffeModels("layer_concat_optim", DNN_TARGET_CPU, true, false);
+    testLayerUsingCaffeModels("layer_concat_shared_input", DNN_TARGET_CPU, true, false);
 }
 
 TEST(Layer_Test_Eltwise, Accuracy)

Original file line number	Diff line number	Diff line change
`@@ -314,6 +314,7 @@ TEST(Layer_Test_Fused_Concat, Accuracy)`
`314`	`314`	`//`
`315`	`315`
`316`	`316`	`testLayerUsingCaffeModels("layer_concat_optim", DNN_TARGET_CPU, true, false);`
	`317`	`+ testLayerUsingCaffeModels("layer_concat_shared_input", DNN_TARGET_CPU, true, false);`
`317`	`318`	`}`
`318`	`319`
`319`	`320`	`TEST(Layer_Test_Eltwise, Accuracy)`