Merge pull request opencv#9762 from dkurt:fix_tensorflow_split_layer

vpisarev · vpisarev · commit 5f6ce6f4b0a6 · 2017-10-05T10:51:49.000Z
diff --git a/modules/dnn/src/layers/slice_layer.cpp b/modules/dnn/src/layers/slice_layer.cpp
@@ -116,7 +116,7 @@ class SliceLayerImpl : public SliceLayer
         }
         else  // Divide input blob on equal parts by axis.
         {
-            CV_Assert(0 < axis && axis < inpShape.size());
+            CV_Assert(0 <= axis && axis < inpShape.size());
             CV_Assert(requiredOutputs > 0 && inpShape[axis] % requiredOutputs == 0);
             inpShape[axis] /= requiredOutputs;
             outputs.resize(requiredOutputs, inpShape);
diff --git a/modules/dnn/src/tensorflow/tf_importer.cpp b/modules/dnn/src/tensorflow/tf_importer.cpp
@@ -866,8 +866,6 @@ void TFImporter::populateNet(Net dstNet)
             CV_Assert(layer.input_size() == 2);
             // num_split
             // 1st blob is dims tensor
-            layerParams.set("slice_point", DictValue::arrayReal((double*)0, 0));
-
             int axis = getConstBlob(layer, value_id, 0).int_val().Get(0);
             layerParams.set("axis", toNCHW[axis]);
 
diff --git a/modules/dnn/test/test_tf_importer.cpp b/modules/dnn/test/test_tf_importer.cpp
@@ -170,4 +170,9 @@ TEST(Test_TensorFlow, lstm)
     runTensorFlowNet("lstm");
 }
 
+TEST(Test_TensorFlow, split)
+{
+    runTensorFlowNet("split_equals");
+}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ class SliceLayerImpl : public SliceLayer`
`116`	`116`	`}`
`117`	`117`	`else // Divide input blob on equal parts by axis.`
`118`	`118`	`{`
`119`		`- CV_Assert(0 < axis && axis < inpShape.size());`
	`119`	`+ CV_Assert(0 <= axis && axis < inpShape.size());`
`120`	`120`	`CV_Assert(requiredOutputs > 0 && inpShape[axis] % requiredOutputs == 0);`
`121`	`121`	`inpShape[axis] /= requiredOutputs;`
`122`	`122`	`outputs.resize(requiredOutputs, inpShape);`
Original file line number	Diff line number	Diff line change
`@@ -170,4 +170,9 @@ TEST(Test_TensorFlow, lstm)`
`170`	`170`	`runTensorFlowNet("lstm");`
`171`	`171`	`}`
`172`	`172`
	`173`	`+TEST(Test_TensorFlow, split)`
	`174`	`+{`
	`175`	`+ runTensorFlowNet("split_equals");`
	`176`	`+}`
	`177`	`+`
`173`	`178`	`}`