From b146cb169462812957704b4a182091095a1977b8 Mon Sep 17 00:00:00 2001
From: Dmitry Kurtaev <dmitry.kurtaev+github@gmail.com>
Date: Fri, 12 Apr 2019 18:41:58 +0300
Subject: [PATCH 1/2] Test data for TensorFlow Squeeze and Softmax from slim

---
 testdata/dnn/tensorflow/generate_tf_models.py |  21 ++++++++++++++++++
 .../dnn/tensorflow/slim_softmax_v2_in.npy     | Bin 0 -> 1360 bytes
 .../dnn/tensorflow/slim_softmax_v2_net.pb     | Bin 0 -> 2136 bytes
 .../dnn/tensorflow/slim_softmax_v2_out.npy    | Bin 0 -> 240 bytes
 4 files changed, 21 insertions(+)
 create mode 100644 testdata/dnn/tensorflow/slim_softmax_v2_in.npy
 create mode 100644 testdata/dnn/tensorflow/slim_softmax_v2_net.pb
 create mode 100644 testdata/dnn/tensorflow/slim_softmax_v2_out.npy

diff --git a/testdata/dnn/tensorflow/generate_tf_models.py b/testdata/dnn/tensorflow/generate_tf_models.py
index bbc4de449..20c2cb070 100644
--- a/testdata/dnn/tensorflow/generate_tf_models.py
+++ b/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:
diff --git a/testdata/dnn/tensorflow/slim_softmax_v2_in.npy b/testdata/dnn/tensorflow/slim_softmax_v2_in.npy
new file mode 100644
index 0000000000000000000000000000000000000000..574f8c5903c074617275a39f02ef5240dea3d0f2
GIT binary patch
literal 1360
zcmWm2c{tQ*8~|{(S{f<$7GXLxj$vbwn0dcHmC|Lg2%9HzBuCDsh@OT=jwDyb%2H2x
z(okr{;`e^15JD4Oq-QsaCl#xN@<g`%^Yh7ba^LIhB`>#K?gTF&FvdTcXUpXYf-HG_
zE-xq|IyTzx$bpFHfWZHMyI)vL;J1$n_KOVsW<zs6*W8-Vwd8ZHjQHF{E|<$0jK3*-
z>py|kBi7)#u!ij2y;gdnv>U!({E?p4`Vs7M3u&7%2Rvp2pvaBIthWR`pViY3=B4zu
zk_01PeJ^cj3`I$qDT?x4i7YMwBF_1P{~b+cPfi0kKP&-p(`%Af@Th5M**x|cXHn{9
z22WZGLDj?%%tR}M?{2)JEsPSAk<bF(Itk>X(SmSm%`&Jos6{a+6lyn>V~OYiMpUOD
z`Mj6;q8*F7-XCeKlsALB^CeXIc{f<}K877rmr<m&4jp!^2l=`T5~(c(eI;8ka;<}*
zb4Aqt44{Udp75~OdFm9@P9G~jCvz!cL48OY*_kUrpW+d!IJ-<bD&vp``|?ohpL7x<
zsHQ9V4@lw}M*4DUKcl0j2!D^{5Z%Hcm`OcK?Iv0v!R-Qjbh-$2b54=bXuvj;(=eZR
z2n~9|&`0e(x`?%<7viEZZc!4Lq}_rogE9#1D}dp9E>JL^3^QYh^*wFm>1Z(e{>ufe
z8Ev6T$3>zZ5yHM|-w5tk9+IDA0ra4PEm3UFL!%@c$oR#L?Dkv&eBBB`+1D&Mf8Zpl
z<aMB1H%q-GUuo+(HN0*Y1An>5C|$&nuCXx06hk?%Yf543(*~j8Pz1Q&FoNvkEjX^F
zgSX1^aZJwwY;z>oGnRz!?OVu~zE1dcCV@If*;AiRk+4549M!s28Fj^O!cFc#uX#;&
zsA2$n<K2;+m=p5E4Z?k*E?U=i2?iZM38JP5q_&xmp9gH&{_#v|vsPVtUsXm{&-9ZC
z@|8_@`;HME_lFlM8%V#$b!^a1W<5)1=(Ra5YF`;6EMp{eC^sMCq+Qs5EDe;+y2+%$
za(H29hP;I^jAF9sEr)*c#ybEycw0boV=+#ZI)hBp1QfS)(UV0#;OI3kVUg=D9F~NW
zKxI$xKC6zM9`!J4u#J_y&7{6_<K&{>V(B}J7ewa0g48XN#~PYP)bpo^xHps@rYj*K
zfQ9he9i(Jk6#6uL!pkOA7-t_2icyWMpXL$5zp25lniAs`S6@P6Q{jV_DaNJ@!>TMj
zW{pG+?p=ILkGGy+m(-<zVOKk~F>V%!=C)xKhYy!_-X?asS>$g0Q3!l;7G|$jLj71V
z6p<v%>{WsVO-pd@9-tc%uTj&Qd@`IkMazR-K<dkpZc@mF0|)ilWTK8f*hq}ojm)}^
zY+~M2hy#%+bat^7I(w<0!v66lfk0UhTzeg-pI0@Z)9+Yu$Oe@h%jx)t5@-#mqJs5O
zbgC<cfvjeFqi}%~Te#2<%OAqC`1{bx*#v)D$uW*n35W*V$SK(c7z^DDugM%1WeJ$-
z_D;6rq$x?)uON=AxL7wC27bVReuV@5T%dziF4=%;weUz@411Q!Nj=ueGraUn=olR&
z!Tp|aIj9cgQstzLs;lu$<4PLe=Lh$v>mkJNi7;|dgC<?gB~u#BFz9TK$|dErVUhvY
zkQU5%+KM%k)0F(N6<zG^K<#cGj2-(8U%u`^kM*5I>}x743tb_#8{XW+(NqHdTm(({
S6a|lHwQ$_BiaLD#Nd5yd7>$|$

literal 0
HcmV?d00001

diff --git a/testdata/dnn/tensorflow/slim_softmax_v2_net.pb b/testdata/dnn/tensorflow/slim_softmax_v2_net.pb
new file mode 100644
index 0000000000000000000000000000000000000000..97418cc1ba948e858b78b6c34fb0fc206827f04c
GIT binary patch
literal 2136
zcmah~ONi4@6m6P*@Aw&?<2c68h~kGRc18tdoVHpO9nqoKK@pMonmlKsnWQ%9*qN1r
z2#QNV5I2Gd3c3(nX<HZKa=@K};7T_x+~`6O^(9Tx=1r@C<h_LC-gC~q=LYt`lKeQa
zQnI1X>`GxpK|Og5%Vf&X6jBy@AgWliC4$03oPA?XVf$tz1n)TL^S|6J4X3UUb#lrw
zQS_jpo0j;HgXj#_Dg@o*a(B4|hk8+%UYn=A4{x~2{Wvk$csI5wyY&37#<Rnv><84F
zdGjloc|7_ueXRPRHY9(m{XD%fedptR`tHoz^sT*pnfd3hU!6I3uMt}LH2ayaW-r#R
zH|pD^n)&8zZQE__71__%zkeCcJe^lx-o`gFFNPo03xDKB@jcG|jy<Ve+i@p-|5K!X
zcKy0~fFMl6s!o(rWr7uy7*mLDsn)E}k+&EJZo-ji3&bQ@!={PW!fLciGvtx|ox;LV
zSRQy@RIy2X0oQu^_2m%NE#fGaSpPLy-}5z@2?D<e105o<xI1NQ!QSk{UIPLeSO~ib
z4_<Q&Y+CP`orh4Yxe81_3Ed?XS3puxHEgN0V^9KOLWHA73(^YcQLu%j3r2YwTPTJi
z<3~>)6qiHXw92YNwQ7CT54{zWNODEdb;;1B$x;P{w{jwac!{>Ps!yUgik>=feC!bD
zOzY;T@CRt?$K8z(RLUjRRpS2vhGT#N<taEWiaHC^O)dg)2_%e)CAr??{S>edmIY#+
z#QG)Ab8T+rDRI|-$y_|aqtFN!f#VEu2Z1z<{t3lzYz7mIva~A2)U1bPVR~nPc+-T3
zBhVWlQm7OWPcOnkegY$(oySvzhdk5#1x=Mnsz@eP9Yyk3z9cM2<bNyzL~vC#QFtI^
zKOCnU4i3Z0AT%eUsm>9PUB4&p;#?0E*ET0NLR+`J0x-wwV~3$y+Y3{6w-7?G$J&?(
z-4L~?(A;CXLaKBK@lb#@0SdCA%h*ae6WNr8JRXA{kN#Yr&jbE=2SX^wDD4Jy1a!xK
zy8s<pFa$T*@zD%|64YfB;i;X%KY_EY;Ak0Ctqql3-U(H4Bxwod);SEAvBODXI?jx{
z8>UE|r$aNH7o8IqL2RNK#;!w#Nl`E^Skt(Q;_ik?;U@N@K@s``b#z~#p6vqCi_2KX
z=H*9aFy>)#GlynMrLs|^;4W7PnIl4%+;ng+GMleRiaJeyS-=aNV<6`jh(dn>E(Kx)

literal 0
HcmV?d00001

diff --git a/testdata/dnn/tensorflow/slim_softmax_v2_out.npy b/testdata/dnn/tensorflow/slim_softmax_v2_out.npy
new file mode 100644
index 0000000000000000000000000000000000000000..3c1a3b5fdc158500f11a7bc4893cd18cf386bb24
GIT binary patch
literal 240
zcmbR27wQ`j$;jZwP_3SlTAW;@Zl$1ZlV+l>qoAIaUsO_*m=~X4l#&V(cT3DEP6dh=
zXCxM+0{I#yItr#b3Pzeb3bhIlz!efyXuXcF-hQ2_lHHV|aQm>oEVf!3%I$x$mDoJd
zud!!&ooN4P`3KuSij1}o-j>^o9uctJ|GCV5_RK`PSu@@3*B&gk*Lvz~%Ty|AvFdNV
z{eGEDThqKkdv~5J`}1?x+uqB`v+;GSvH#y~YR51)$bL(koOMNFz5Q8*TKlzU%x!8b
jO6}DvG;9S0?%RDY7qHKaSYvnkvZj5^8z&q8FE#c67TZ`a

literal 0
HcmV?d00001


From a4eca64f982a5ec4840606b154f7d3161b26a90e Mon Sep 17 00:00:00 2001
From: LaurentBerger <laurent.berger@univ-lemans.fr>
Date: Mon, 15 Apr 2019 17:16:05 +0200
Subject: [PATCH 2/2] add data for PR 14332

---
 testdata/ml/opencv_ml_knn.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 testdata/ml/opencv_ml_knn.xml

diff --git a/testdata/ml/opencv_ml_knn.xml b/testdata/ml/opencv_ml_knn.xml
new file mode 100644
index 000000000..96aea6f5e
--- /dev/null
+++ b/testdata/ml/opencv_ml_knn.xml
@@ -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>