Merge pull request opencv#9384 from dkurt:torch_split

vpisarev · vpisarev · commit 6bf8fe815d32 · 2017-09-15T13:05:05.000Z
diff --git a/modules/dnn/src/layers/split_layer.cpp b/modules/dnn/src/layers/split_layer.cpp
@@ -75,7 +75,7 @@ class SplitLayerImpl : public SplitLayer
 
         Layer::getMemoryShapes(inputs, max(1, outputsCount >= 0 ? outputsCount : requiredOutputs),
                                outputs, internals);
-        return true;
+        return false;
     }
 
     void forward(std::vector<Mat*> &inputs, std::vector<Mat> &outputs, std::vector<Mat> &internals)
@@ -86,8 +86,7 @@ class SplitLayerImpl : public SplitLayer
         for (size_t i = 0; i < outputs.size(); i++)
         {
             CV_Assert(inputs[0]->total() == outputs[i].total());
-            if (outputs[i].data != inputs[0]->data)
-                inputs[0]->copyTo(outputs[i]);
+            inputs[0]->copyTo(outputs[i]);
         }
     }
 };
diff --git a/modules/dnn/src/torch/torch_importer.cpp b/modules/dnn/src/torch/torch_importer.cpp
@@ -934,20 +934,18 @@ struct TorchImporter : public ::cv::dnn::Importer
             }
             else if (module->thName == "Concat")
             {
-                int newId, splitId, mergeId;
-                LayerParams mergeParams, splitParams;
+                int newId, mergeId;
+                LayerParams mergeParams;
                 mergeParams.set("axis", module->params.get<int>("dimension") - 1);
 
-                splitId = net.addLayer(generateLayerName("torchSplit"), "Split", splitParams);
-                net.connect(prevLayerId, prevOutNum, splitId, 0);
-
                 std::vector<int> branchIds;
                 for (int i = 0; i < (int)module->modules.size(); i++)
                 {
-                    newId = fill(module->modules[i], addedModules, splitId, i);
+                    newId = fill(module->modules[i], addedModules, prevLayerId, prevOutNum);
                     branchIds.push_back(newId);
                 }
 
+                moduleCounter += 1;  // Skip split layer creation. See https://github.com/opencv/opencv/pull/9384.
                 mergeId = net.addLayer(generateLayerName("torchMerge"), "Concat", mergeParams);
 
                 for (int i = 0; i < branchIds.size(); i++)
@@ -1015,19 +1013,12 @@ struct TorchImporter : public ::cv::dnn::Importer
                 return mergeId;
             }
             else if (module->thName == "ConcatTable") {
-                int newId = -1, splitId;
-                LayerParams splitParams;
-
-                splitId = net.addLayer(generateLayerName("torchSplit"), "Split", splitParams);
-                net.connect(prevLayerId, prevOutNum, splitId, 0);
-
-                addedModules.push_back(std::make_pair(splitId, module));
-
+                int newId = -1;
+                moduleCounter += 1;  // Skip split layer creation. See https://github.com/opencv/opencv/pull/9384.
                 for (int i = 0; i < (int)module->modules.size(); i++)
                 {
-                    newId = fill(module->modules[i], addedModules, splitId, i);
+                    newId = fill(module->modules[i], addedModules, prevLayerId, prevOutNum);
                 }
-
                 return newId;
             }
             else if (module->thName == "JoinTable") {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class SplitLayerImpl : public SplitLayer`
`75`	`75`
`76`	`76`	`Layer::getMemoryShapes(inputs, max(1, outputsCount >= 0 ? outputsCount : requiredOutputs),`
`77`	`77`	`outputs, internals);`
`78`		`- return true;`
	`78`	`+ return false;`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`void forward(std::vector<Mat*> &inputs, std::vector<Mat> &outputs, std::vector<Mat> &internals)`
`@@ -86,8 +86,7 @@ class SplitLayerImpl : public SplitLayer`
`86`	`86`	`for (size_t i = 0; i < outputs.size(); i++)`
`87`	`87`	`{`
`88`	`88`	`CV_Assert(inputs[0]->total() == outputs[i].total());`
`89`		`- if (outputs[i].data != inputs[0]->data)`
`90`		`- inputs[0]->copyTo(outputs[i]);`
	`89`	`+ inputs[0]->copyTo(outputs[i]);`
`91`	`90`	`}`
`92`	`91`	`}`
`93`	`92`	`};`
Original file line number	Diff line number	Diff line change
`@@ -934,20 +934,18 @@ struct TorchImporter : public ::cv::dnn::Importer`
`934`	`934`	`}`
`935`	`935`	`else if (module->thName == "Concat")`
`936`	`936`	`{`
`937`		`- int newId, splitId, mergeId;`
`938`		`- LayerParams mergeParams, splitParams;`
	`937`	`+ int newId, mergeId;`
	`938`	`+ LayerParams mergeParams;`
`939`	`939`	`mergeParams.set("axis", module->params.get<int>("dimension") - 1);`
`940`	`940`
`941`		`- splitId = net.addLayer(generateLayerName("torchSplit"), "Split", splitParams);`
`942`		`- net.connect(prevLayerId, prevOutNum, splitId, 0);`
`943`		`-`
`944`	`941`	`std::vector<int> branchIds;`
`945`	`942`	`for (int i = 0; i < (int)module->modules.size(); i++)`
`946`	`943`	`{`
`947`		`- newId = fill(module->modules[i], addedModules, splitId, i);`
	`944`	`+ newId = fill(module->modules[i], addedModules, prevLayerId, prevOutNum);`
`948`	`945`	`branchIds.push_back(newId);`
`949`	`946`	`}`
`950`	`947`
	`948`	`+ moduleCounter += 1; // Skip split layer creation. See https://github.com/opencv/opencv/pull/9384.`
`951`	`949`	`mergeId = net.addLayer(generateLayerName("torchMerge"), "Concat", mergeParams);`
`952`	`950`
`953`	`951`	`for (int i = 0; i < branchIds.size(); i++)`
`@@ -1015,19 +1013,12 @@ struct TorchImporter : public ::cv::dnn::Importer`
`1015`	`1013`	`return mergeId;`
`1016`	`1014`	`}`
`1017`	`1015`	`else if (module->thName == "ConcatTable") {`
`1018`		`- int newId = -1, splitId;`
`1019`		`- LayerParams splitParams;`
`1020`		`-`
`1021`		`- splitId = net.addLayer(generateLayerName("torchSplit"), "Split", splitParams);`
`1022`		`- net.connect(prevLayerId, prevOutNum, splitId, 0);`
`1023`		`-`
`1024`		`- addedModules.push_back(std::make_pair(splitId, module));`
`1025`		`-`
	`1016`	`+ int newId = -1;`
	`1017`	`+ moduleCounter += 1; // Skip split layer creation. See https://github.com/opencv/opencv/pull/9384.`
`1026`	`1018`	`for (int i = 0; i < (int)module->modules.size(); i++)`
`1027`	`1019`	`{`
`1028`		`- newId = fill(module->modules[i], addedModules, splitId, i);`
	`1020`	`+ newId = fill(module->modules[i], addedModules, prevLayerId, prevOutNum);`
`1029`	`1021`	`}`
`1030`		`-`
`1031`	`1022`	`return newId;`
`1032`	`1023`	`}`
`1033`	`1024`	`else if (module->thName == "JoinTable") {`