Skip to content

Merge 3.4 #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 19, 2019
Merged

Merge 3.4 #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b146cb1
Test data for TensorFlow Squeeze and Softmax from slim
dkurt Apr 12, 2019
a4eca64
add data for PR 14332
LaurentBerger Apr 15, 2019
1524ee6
Merge pull request #597 from LaurentBerger:loadknearest
alalek Apr 17, 2019
8869985
Merge pull request #595 from dkurt:tf_squeeze_and_slim_softmax_v2
alalek Apr 18, 2019
a54bd6c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Apr 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions testdata/dnn/tensorflow/generate_tf_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Binary file added testdata/dnn/tensorflow/slim_softmax_v2_in.npy
View file
Open in desktop
Binary file not shown.
Binary file added testdata/dnn/tensorflow/slim_softmax_v2_net.pb
View file
Open in desktop
Binary file not shown.
Binary file added testdata/dnn/tensorflow/slim_softmax_v2_out.npy
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions testdata/ml/opencv_ml_knn.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>