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

Author: alalek

testdata/dnn/tensorflow/generate_tf_models.py

@@ -672,6 +672,11 @@ def pad_depth(x, desired_channels):
 sub = conv - inp
 save(inp, sub, 'eltwise_sub')
 ################################################################################
+inp = tf.placeholder(tf.float32, [None, 2, 3, 4], 'input')
+conv = tf.layers.conv2d(inp, filters=3, kernel_size=[1, 1])
+softmax = tf.contrib.slim.softmax(conv)
+save(inp, softmax, 'slim_softmax')
+################################################################################
 
 # Uncomment to print the final graph.
 # with tf.gfile.FastGFile('fused_batch_norm_net.pb') as f: