From f081f7c8937e4d93bcea09486fd32eb1cd0b9007 Mon Sep 17 00:00:00 2001 From: Zihao Mu Date: Tue, 14 Sep 2021 17:16:39 +0800 Subject: [PATCH 1/3] add test data of ExpandDim layer of tf_importer. --- testdata/dnn/tensorflow/expand_dim_1_in.npy | Bin 0 -> 224 bytes testdata/dnn/tensorflow/expand_dim_1_net.pb | Bin 0 -> 288 bytes testdata/dnn/tensorflow/expand_dim_1_out.npy | Bin 0 -> 224 bytes testdata/dnn/tensorflow/expand_dim_2_in.npy | Bin 0 -> 224 bytes testdata/dnn/tensorflow/expand_dim_2_net.pb | Bin 0 -> 297 bytes testdata/dnn/tensorflow/expand_dim_2_out.npy | Bin 0 -> 224 bytes testdata/dnn/tensorflow/generate_tf_models.py | 10 ++++++++++ 7 files changed, 10 insertions(+) create mode 100644 testdata/dnn/tensorflow/expand_dim_1_in.npy create mode 100644 testdata/dnn/tensorflow/expand_dim_1_net.pb create mode 100644 testdata/dnn/tensorflow/expand_dim_1_out.npy create mode 100644 testdata/dnn/tensorflow/expand_dim_2_in.npy create mode 100644 testdata/dnn/tensorflow/expand_dim_2_net.pb create mode 100644 testdata/dnn/tensorflow/expand_dim_2_out.npy diff --git a/testdata/dnn/tensorflow/expand_dim_1_in.npy b/testdata/dnn/tensorflow/expand_dim_1_in.npy new file mode 100644 index 0000000000000000000000000000000000000000..63d6f8aabf0cd6f033c6a7beb727f94a50b67aa3 GIT binary patch literal 224 zcmbR27wQ`j$;eQ~P_3SlTAW;@Zl$1ZlV+l>qoAIaUsO_*m=~X4l#&V(cT3DEP6dh= zXCxM+0{I$-ItnH_3Pw5##+o_`wF+bau7_3YY^~oPu`jDgwvSJe-}@^0{r;MeX?xFC z*4QV!Q?UQCAi(~1-{F1v{mJ%X-=u6Cxw7r=1)krRxlh9W#|-KHTg_MQ-^a{#KtxW? aR_LstgT|Q?`*`QC+?N?Sb)PWDSvvsMRY_z3 literal 0 HcmV?d00001 diff --git a/testdata/dnn/tensorflow/expand_dim_1_net.pb b/testdata/dnn/tensorflow/expand_dim_1_net.pb new file mode 100644 index 0000000000000000000000000000000000000000..6b65663833a818a88823f728564ac5ea28744193 GIT binary patch literal 288 zcmZ9Gy$ZrG7)8^jLAi>^2QG1P&C=r7L9y!Y;0pv(u+Tqj6}$Q7np*q~TnK#Jb1oJT zNnW078thVih>t~T;***}R7YLLMB$j+zGLIsa2rnzAWYrZqZ>GwLuh0ChQzwat6EJU zE;>EOG>l+-OnHpmmcN}Dxa|;M86!Kp>>#QKXaB^mFxp;AotsUPRlZ5G7ynDn+nJq= hqOl#vLfl`^K?Hmd^!1mmUHqoAIaUsO_*m=~X4l#&V(cT3DEP6dh= zXCxM+0{I$-ItoB!q@!T0qhO+`qfo0rD&Si8yvzQD%|CmG*01&-KeX7-D_3$bD8FDY z7%pKibT-hzde2Aus(=^vCh=$N-^`S@zr|T*KgmMQUf|pbyD9^1`zy!e_U}0U(f-Q4 bCHs7WP3;RzbL}@?Z?UgopR%9TX|p{5U$#gC literal 0 HcmV?d00001 diff --git a/testdata/dnn/tensorflow/expand_dim_2_in.npy b/testdata/dnn/tensorflow/expand_dim_2_in.npy new file mode 100644 index 0000000000000000000000000000000000000000..2e749acdddbce29a778e5eec3b5e42b9d87cbbfc GIT binary patch literal 224 zcmbR27wQ`j$;eQ~P_3SlTAW;@Zl$1ZlV+l>qoAIaUsO_*m=~X4l#&V(cT3DEP6dh= zXCxM+0{I$-ItnH_3Pw5##+o_`wF+bau3G|XcFlIe`^}!3*_VEuz5iy|iv6+sciWv8 z)wW+X^S@p4Hc8mL7V9Z1hc82m7B^6TDEX6Ln9=ZNov%tpWbBH2QBX6ak=L_ zEa0ViQCIPldb>>Rlfx;~$ypA;%Y!NsqM%Q#W1BD&$HbLAa9!O@$tE^t@RZi^bbKSe zI^|{cQ_BJPMP+qDeh7oHq-$CCIY!{kikzj^qWwX%DCxnD8hn8M=31y+uhU~`EIK{5 m9%|9u&@-P|fz7_%4z}>Ww}j6nUV8Bdf14%XMo$}?81@6eSVT?$ literal 0 HcmV?d00001 diff --git a/testdata/dnn/tensorflow/expand_dim_2_out.npy b/testdata/dnn/tensorflow/expand_dim_2_out.npy new file mode 100644 index 0000000000000000000000000000000000000000..6d84a4adbd7433e16dd207feb665c1e33a569550 GIT binary patch literal 224 zcmbR27wQ`j$;eQ~P_3SlTAW;@Zl$1ZlV+l>qoAIaUsO_*m=~X4l#&V(cT3DEP6dh= zXCxM+0{I$-ItnH_3Pw5#K!&lVjzX;hsenuR&=mV$O*idk7u~jBu{wTVO7y~g*Wa(R zf6;Z-KI_?j`{Zq*4lbXT+W)yHX&<@S+um-IoWm>)4hOrpBK!BvUT=3hXOn$Grl$_Ms0&q&)lunF(i;LEXFa)o0*04|tGjsO4v literal 0 HcmV?d00001 diff --git a/testdata/dnn/tensorflow/generate_tf_models.py b/testdata/dnn/tensorflow/generate_tf_models.py index 06b88aaaa..435f5fde0 100644 --- a/testdata/dnn/tensorflow/generate_tf_models.py +++ b/testdata/dnn/tensorflow/generate_tf_models.py @@ -1019,6 +1019,16 @@ def pad_depth(x, desired_channels): input_down = tf.image.resize(conv, size=[hi, wi], method=0, name='resize_down') save(inp, input_down, 'resize_bilinear_down') ################################################################################ +inp = tf.placeholder(tf.float32, [1, 2, 3, 4], 'input') +expand_dim = inp + 1 +expand_dim = tf.expand_dims(expand_dim, -1) +save(inp, expand_dim, prefix + 'expand_dim_1', optimize=False) +################################################################################ +inp = tf.placeholder(tf.float32, [1, 2, 3, 4], 'input') +expand_dim = inp + 1 +expand_dim = tf.expand_dims(expand_dim, 2) +save(inp, expand_dim, prefix + 'expand_dim_2', optimize=False) +################################################################################ # Uncomment to print the final graph. # with tf.gfile.FastGFile('fused_batch_norm_net.pb', 'rb') as f: From 9e3d4272ad73244f8ff618eca49826ef201f90a0 Mon Sep 17 00:00:00 2001 From: Zihao Mu Date: Mon, 27 Sep 2021 16:44:50 +0800 Subject: [PATCH 2/3] add dim=-2 and 5-dim data. --- testdata/dnn/tensorflow/expand_dim_1_net.pb | Bin 288 -> 288 bytes testdata/dnn/tensorflow/expand_dim_1_out.npy | Bin 224 -> 224 bytes testdata/dnn/tensorflow/expand_dim_2_in.npy | Bin 224 -> 608 bytes testdata/dnn/tensorflow/expand_dim_2_net.pb | Bin 297 -> 301 bytes testdata/dnn/tensorflow/generate_tf_models.py | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testdata/dnn/tensorflow/expand_dim_1_net.pb b/testdata/dnn/tensorflow/expand_dim_1_net.pb index 6b65663833a818a88823f728564ac5ea28744193..48b838e1c8c00f25061a04f0fe8b2f47dde87d10 100644 GIT binary patch delta 88 zcmZ3$w18=XxEnVYYf4FFL8=gw0i%{Q7i)1wB9J3wB_PDa!3e}mK+FupEL=uhtcfWp c`jtYg&iQ%8C0fWjCkBX5EQw+KH}RrB01^EY_5c6? delta 89 zcmZ3$w18=XxTQ1~YjH+mL8_3Dm4FZv2O|(O0WmWWvuJU1v8I$%0wtLY7`cqNSQArH c^ecr}o%8dGOD4vO^P(u2SQ5kdf8s@d0RHF{1ONa4 diff --git a/testdata/dnn/tensorflow/expand_dim_1_out.npy b/testdata/dnn/tensorflow/expand_dim_1_out.npy index 46a4a89153687d50d64134d1f20cffeaafcfd961..0883120568e2e63425eaa6a75b572c7115fd6d4d 100644 GIT binary patch delta 120 zcmV-;0EhqJ0pJ0UKn^r4ATlfK2b90@ a@Pt1S%~3$?nHxWPFe^VyQ#C&YLbE?8;W42A delta 120 zcmV-;0EhqJ0pJ0UKn^i1ATlfLzq>w6 zk-9&HC;&gO3M@ZOOCrGF$S^-$y7#}b^7X#QD~3OtQcAy8A^|{2lB>T#t#duOH2^@Z z0WLo$fx12U1U0|dDvrL8c*MW?q^&>C6)QhAQIJ1QX2`zTR;a(7GEu&7v4y``{T00` zy)Zyf&YyojJG_OxoJq4jd!WrfRie&5p)0VzKD0x>{gY?EVVztVbDzcIX-zmu5Iyt-#^Kf$F|I delta 120 zcmV-;0EhqJ1mFRXKnpZ1ATlfxq6)Qigng2dxwiQ4S$(KF|Ld?FMGEu&KWW7H%QIJ2McFMmYGAO@ov&lZc616`# aD#JXw@<2aMX2`xEgUP>k{6xP}YQ(>8{51ps diff --git a/testdata/dnn/tensorflow/expand_dim_2_net.pb b/testdata/dnn/tensorflow/expand_dim_2_net.pb index bf61776e2671c60803fb00680dbcd84257943c6a..8a2c75cfc90f50bd3850d2e57925f7faa8fc851d 100644 GIT binary patch delta 78 zcmZ3w35k*%YlnMGq0euB;HVnJ0K@9IW;3cCndE=OPY(dI3uwjRY=H6K!}Nh5r~<9 Ym>Gy!w79ugQ%Wj Date: Mon, 27 Sep 2021 17:35:23 +0800 Subject: [PATCH 3/3] error fixed. --- testdata/dnn/tensorflow/expand_dim_2_net.pb | Bin 301 -> 0 bytes testdata/dnn/tensorflow/expand_dim_2_out.npy | Bin 224 -> 0 bytes ...expand_dim_1_in.npy => expand_dims_1_in.npy} | Bin ...expand_dim_1_net.pb => expand_dims_1_net.pb} | Bin 288 -> 288 bytes ...pand_dim_1_out.npy => expand_dims_1_out.npy} | Bin ...expand_dim_2_in.npy => expand_dims_2_in.npy} | Bin testdata/dnn/tensorflow/expand_dims_2_net.pb | Bin 0 -> 301 bytes testdata/dnn/tensorflow/expand_dims_2_out.npy | Bin 0 -> 608 bytes testdata/dnn/tensorflow/generate_tf_models.py | 4 ++-- 9 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 testdata/dnn/tensorflow/expand_dim_2_net.pb delete mode 100644 testdata/dnn/tensorflow/expand_dim_2_out.npy rename testdata/dnn/tensorflow/{expand_dim_1_in.npy => expand_dims_1_in.npy} (100%) rename testdata/dnn/tensorflow/{expand_dim_1_net.pb => expand_dims_1_net.pb} (86%) rename testdata/dnn/tensorflow/{expand_dim_1_out.npy => expand_dims_1_out.npy} (100%) rename testdata/dnn/tensorflow/{expand_dim_2_in.npy => expand_dims_2_in.npy} (100%) create mode 100644 testdata/dnn/tensorflow/expand_dims_2_net.pb create mode 100644 testdata/dnn/tensorflow/expand_dims_2_out.npy diff --git a/testdata/dnn/tensorflow/expand_dim_2_net.pb b/testdata/dnn/tensorflow/expand_dim_2_net.pb deleted file mode 100644 index 8a2c75cfc90f50bd3850d2e57925f7faa8fc851d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 301 zcmZXOzYBsu9L4qYu$~QZRD(-na7zhIE|D2DHn_*p2?=VF8nyMO_pPuWG`!&r@AG+x z;G{*_)H`3e+f40~!!gszNxI;=zLtq#GgFSitAnC43I>98ObVk|6q~{^hoiLK`O~Z5 zt7B2szxyHhS!GQkdLd|SNZT-O3rxVDD`73Q_Szp_i;@n^_~A!@{`yj?LPu#{kwvF@ n>k%!w8#;8z2u$|vwy;6(dn@p1-b?TO!QW;H*zv>0X2iY&NRLE+ diff --git a/testdata/dnn/tensorflow/expand_dim_2_out.npy b/testdata/dnn/tensorflow/expand_dim_2_out.npy deleted file mode 100644 index 6d84a4adbd7433e16dd207feb665c1e33a569550..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmbR27wQ`j$;eQ~P_3SlTAW;@Zl$1ZlV+l>qoAIaUsO_*m=~X4l#&V(cT3DEP6dh= zXCxM+0{I$-ItnH_3Pw5#K!&lVjzX;hsenuR&=mV$O*idk7u~jBu{wTVO7y~g*Wa(R zf6;Z-KI_?j`{Zq*4lbXT+W)yHX&<@S+um-IoWm>)4hOrpBK!BvUT=3hXOn$Grl$_Ms0&q&)lunF(i;LEXFa)o0*04|tGjsO4v diff --git a/testdata/dnn/tensorflow/expand_dim_1_in.npy b/testdata/dnn/tensorflow/expand_dims_1_in.npy similarity index 100% rename from testdata/dnn/tensorflow/expand_dim_1_in.npy rename to testdata/dnn/tensorflow/expand_dims_1_in.npy diff --git a/testdata/dnn/tensorflow/expand_dim_1_net.pb b/testdata/dnn/tensorflow/expand_dims_1_net.pb similarity index 86% rename from testdata/dnn/tensorflow/expand_dim_1_net.pb rename to testdata/dnn/tensorflow/expand_dims_1_net.pb index 48b838e1c8c00f25061a04f0fe8b2f47dde87d10..33f8309d542a8309390b4d37764318f4aff08ed9 100644 GIT binary patch delta 26 hcmZ3$w18a?U1ICFZYXD`-2bcf= delta 25 gcmZ3$w185JWGR9MRE27PUxYDO{t1RT?oyu(Yt3!wVRQF_Zu_e`>X5gBt%(pmJXn+0^-jny#dp~dqIGcxrkL_0rVs|p@M1KGP literal 0 HcmV?d00001 diff --git a/testdata/dnn/tensorflow/expand_dims_2_out.npy b/testdata/dnn/tensorflow/expand_dims_2_out.npy new file mode 100644 index 0000000000000000000000000000000000000000..a790445971c4ea2dc8edff8a6db90496bab65dd3 GIT binary patch literal 608 zcmb7&>r0by97iYV)38#r8D7vHYP2;L>bw-yexGk8UMNcnrFFrXn~ANa( z-J;mVEB0hWD%89p!)(d3q@7PSTMWj3KQ_&jYh3xcnQ7U^l~#tUd5xN1afF(WRP#~W z)O-p5Uw8)fS}}8T1gtfL8rNRIQrS4m`X<7rl+vk!Y1CLIk^VB7*iV@_J{SahQ>qZN z&;X&Pg%P(wG@N)OEPo8Zq^T83FB5akJD_Vj0R4?Xs&`7oAF$#{d@xOKkM6$E*N!-O z9lUip*eC0OsxBXm56y6YJ;Zzl&S{T%j6&6&O&3=yXr@#`vZghn?OwmA{O(PgmdnYX zD??b|WtMFiLqWV51G*iev&9{uZ_3e?XBN*4HzPq)kF(k>^uV`Ne9C!%4Q(ZUz7t7F zOzW6@uBTEmfzk&R&51}+iUTvZV~$TOSluKMQ0R|HHIU5a1iaU zbYUQ%P#l%Ga3p*k#`3GRb95i75hr}@m3Wq_LMu0isoR;*%yQ(lSjFViexxbvz(m74 ze2$KQb#^Csw=noDREu45y-5Bc0{=@YI{O1)N${kDU&mN;Z!L<4H