Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Author: alalek

testdata/dnn/tensorflow/generate_tf_models.py

@@ -703,6 +703,27 @@ def pad_depth(x, desired_channels):
         f.write(graph_def.SerializeToString())
 
 ################################################################################
+# issue https://github.com/opencv/opencv/issues/13839
+inp_node = 'PNet/conv3/add'
+out_node = 'PNet/cls_prob'
+with tf.Session(graph=tf.Graph()) as localSession:
+    localSession.graph.as_default()
+
+    with tf.gfile.FastGFile('PNet_pnet.pb') as f:
+        graph_def = tf.GraphDef()
+        graph_def.ParseFromString(f.read())
+        graph_def = TransformGraph(graph_def, [inp_node], [out_node], ['strip_unused_nodes'])
+
+    tf.import_graph_def(graph_def, name='')
+
+    inputData = gen_data(tf.placeholder(tf.float32, [1, 4, 5, 16], inp_node))
+    outputData = localSession.run(localSession.graph.get_tensor_by_name(out_node + ':0'),
+                                  feed_dict={inp_node + ':0': inputData})
+    writeBlob(inputData, 'slim_softmax_v2_in')
+    writeBlob(outputData, 'slim_softmax_v2_out')
+
+    with tf.gfile.FastGFile('slim_softmax_v2_net.pb', 'wb') as f:
+        f.write(graph_def.SerializeToString())
 
 # Uncomment to print the final graph.
 # with tf.gfile.FastGFile('fused_batch_norm_net.pb') as f:

testdata/dnn/tensorflow/slim_softmax_v2_in.npy

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<opencv_storage>
+<opencv_ml_knn>
+  <format>3</format>
+  <is_classifier>1</is_classifier>
+  <default_k>10</default_k>
+  <samples type_id="opencv-matrix">
+    <rows>3</rows>
+    <cols>2</cols>
+    <dt>f</dt>
+    <data>
+      1. 1. 3. 3. 10. 5.</data></samples>
+  <responses type_id="opencv-matrix">
+    <rows>3</rows>
+    <cols>1</cols>
+    <dt>f</dt>
+    <data>
+      0. 1. 2.</data></responses></opencv_ml_knn>
+</opencv_storage>