Import wrapped Dropout subgraphs from TensorFlow

dkurt · dkurt · commit bdd8cc697a32 · 2017-09-20T13:30:25.000+03:00
diff --git a/modules/dnn/src/tensorflow/tf_importer.cpp b/modules/dnn/src/tensorflow/tf_importer.cpp
@@ -363,7 +363,7 @@ void RemoveIdentityOps(tensorflow::GraphDef& net) {
         const tensorflow::NodeDef &layer = net.node(li);
         String type = layer.op();
 
-        if (type == "Identity") {
+        if (type == "Identity" || type == "Dropout") {
             identity_ops_idx.push_back(li);
             identity_ops[layer.name()] = layer.input(0);
         }
diff --git a/modules/dnn/test/test_tf_importer.cpp b/modules/dnn/test/test_tf_importer.cpp
@@ -138,6 +138,11 @@ TEST(Test_TensorFlow, matmul)
     runTensorFlowNet("matmul");
 }
 
+TEST(Test_TensorFlow, defun)
+{
+    runTensorFlowNet("defun_dropout");
+}
+
 TEST(Test_TensorFlow, fp16)
 {
     const float l1 = 1e-3;

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ void RemoveIdentityOps(tensorflow::GraphDef& net) {`
`363`	`363`	`const tensorflow::NodeDef &layer = net.node(li);`
`364`	`364`	`String type = layer.op();`
`365`	`365`
`366`		`- if (type == "Identity") {`
	`366`	`+ if (type == "Identity" \|\| type == "Dropout") {`
`367`	`367`	`identity_ops_idx.push_back(li);`
`368`	`368`	`identity_ops[layer.name()] = layer.input(0);`
`369`	`369`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,11 @@ TEST(Test_TensorFlow, matmul)`
`138`	`138`	`runTensorFlowNet("matmul");`
`139`	`139`	`}`
`140`	`140`
	`141`	`+TEST(Test_TensorFlow, defun)`
	`142`	`+{`
	`143`	`+ runTensorFlowNet("defun_dropout");`
	`144`	`+}`
	`145`	`+`
`141`	`146`	`TEST(Test_TensorFlow, fp16)`
`142`	`147`	`{`
`143`	`148`	`const float l1 = 1e-3;`