Commit 22cb65ad authored by Dmitry Kurtaev's avatar Dmitry Kurtaev

Update face detection network in samples

parent f056c0f1
...@@ -35,11 +35,55 @@ node { ...@@ -35,11 +35,55 @@ node {
input: "data_scale/Mul" input: "data_scale/Mul"
input: "data_scale/add" input: "data_scale/add"
} }
node {
name: "SpaceToBatchND/block_shape"
op: "Const"
attr {
key: "value"
value {
tensor {
dtype: DT_INT32
tensor_shape {
dim {
size: 2
}
}
int_val: 1
int_val: 1
}
}
}
}
node {
name: "SpaceToBatchND/paddings"
op: "Const"
attr {
key: "value"
value {
tensor {
dtype: DT_INT32
tensor_shape {
dim {
size: 2
}
dim {
size: 2
}
}
int_val: 3
int_val: 3
int_val: 3
int_val: 3
}
}
}
}
node { node {
name: "Pad" name: "Pad"
op: "Pad" op: "SpaceToBatchND"
input: "data_scale/BiasAdd" input: "data_scale/BiasAdd"
input: "Pad/paddings" input: "SpaceToBatchND/block_shape"
input: "SpaceToBatchND/paddings"
} }
node { node {
name: "conv1_h/Conv2D" name: "conv1_h/Conv2D"
...@@ -81,10 +125,15 @@ node { ...@@ -81,10 +125,15 @@ node {
input: "conv1_h/Conv2D" input: "conv1_h/Conv2D"
input: "conv1_h/bias" input: "conv1_h/bias"
} }
node {
name: "BatchToSpaceND"
op: "BatchToSpaceND"
input: "conv1_h/BiasAdd"
}
node { node {
name: "conv1_bn_h/FusedBatchNorm" name: "conv1_bn_h/FusedBatchNorm"
op: "FusedBatchNorm" op: "FusedBatchNorm"
input: "conv1_h/BiasAdd" input: "BatchToSpaceND"
input: "conv1_bn_h/gamma" input: "conv1_bn_h/gamma"
input: "conv1_bn_h/beta" input: "conv1_bn_h/beta"
input: "conv1_bn_h/mean" input: "conv1_bn_h/mean"
...@@ -439,10 +488,28 @@ node { ...@@ -439,10 +488,28 @@ node {
input: "layer_256_1_scale1/BiasAdd" input: "layer_256_1_scale1/BiasAdd"
} }
node { node {
name: "Pad_1" name: "SpaceToBatchND_1/paddings"
op: "Pad" op: "Const"
input: "Relu_4" attr {
input: "Pad_1/paddings" key: "value"
value {
tensor {
dtype: DT_INT32
tensor_shape {
dim {
size: 2
}
dim {
size: 2
}
}
int_val: 1
int_val: 1
int_val: 1
int_val: 1
}
}
}
} }
node { node {
name: "layer_256_1_conv_expand/Conv2D" name: "layer_256_1_conv_expand/Conv2D"
...@@ -580,6 +647,13 @@ node { ...@@ -580,6 +647,13 @@ node {
op: "Flatten" op: "Flatten"
input: "conv4_3_norm_mbox_conf/BiasAdd" input: "conv4_3_norm_mbox_conf/BiasAdd"
} }
node {
name: "Pad_1"
op: "SpaceToBatchND"
input: "Relu_4"
input: "SpaceToBatchND/block_shape"
input: "SpaceToBatchND_1/paddings"
}
node { node {
name: "layer_256_1_conv1/Conv2D" name: "layer_256_1_conv1/Conv2D"
op: "Conv2D" op: "Conv2D"
...@@ -620,10 +694,15 @@ node { ...@@ -620,10 +694,15 @@ node {
input: "layer_256_1_conv1/Conv2D" input: "layer_256_1_conv1/Conv2D"
input: "layer_256_1_conv1/Conv2D_bn_offset" input: "layer_256_1_conv1/Conv2D_bn_offset"
} }
node {
name: "BatchToSpaceND_1"
op: "BatchToSpaceND"
input: "layer_256_1_bn2/FusedBatchNorm"
}
node { node {
name: "layer_256_1_scale2/Mul" name: "layer_256_1_scale2/Mul"
op: "Mul" op: "Mul"
input: "layer_256_1_bn2/FusedBatchNorm" input: "BatchToSpaceND_1"
input: "layer_256_1_scale2/mul" input: "layer_256_1_scale2/mul"
} }
node { node {
...@@ -806,12 +885,6 @@ node { ...@@ -806,12 +885,6 @@ node {
input: "Relu_7" input: "Relu_7"
input: "layer_512_1_conv2_h/convolution/SpaceToBatchND/block_shape" input: "layer_512_1_conv2_h/convolution/SpaceToBatchND/block_shape"
input: "layer_512_1_conv2_h/convolution/SpaceToBatchND/paddings" input: "layer_512_1_conv2_h/convolution/SpaceToBatchND/paddings"
attr {
key: "Tblock_shape"
value {
type: DT_INT32
}
}
} }
node { node {
name: "layer_512_1_conv2_h/convolution" name: "layer_512_1_conv2_h/convolution"
...@@ -853,18 +926,6 @@ node { ...@@ -853,18 +926,6 @@ node {
input: "layer_512_1_conv2_h/convolution" input: "layer_512_1_conv2_h/convolution"
input: "layer_512_1_conv2_h/convolution/BatchToSpaceND/block_shape" input: "layer_512_1_conv2_h/convolution/BatchToSpaceND/block_shape"
input: "layer_512_1_conv2_h/convolution/BatchToSpaceND/crops" input: "layer_512_1_conv2_h/convolution/BatchToSpaceND/crops"
attr {
key: "Tblock_shape"
value {
type: DT_INT32
}
}
attr {
key: "Tcrops"
value {
type: DT_INT32
}
}
} }
node { node {
name: "add_3" name: "add_3"
...@@ -1041,9 +1102,10 @@ node { ...@@ -1041,9 +1102,10 @@ node {
} }
node { node {
name: "Pad_2" name: "Pad_2"
op: "Pad" op: "SpaceToBatchND"
input: "conv7_1_h/Relu" input: "conv7_1_h/Relu"
input: "Pad_2/paddings" input: "SpaceToBatchND/block_shape"
input: "SpaceToBatchND_1/paddings"
} }
node { node {
name: "conv7_2_h/Conv2D" name: "conv7_2_h/Conv2D"
...@@ -1085,10 +1147,15 @@ node { ...@@ -1085,10 +1147,15 @@ node {
input: "conv7_2_h/Conv2D" input: "conv7_2_h/Conv2D"
input: "conv7_2_h/bias" input: "conv7_2_h/bias"
} }
node {
name: "BatchToSpaceND_2"
op: "BatchToSpaceND"
input: "conv7_2_h/BiasAdd"
}
node { node {
name: "conv7_2_h/Relu" name: "conv7_2_h/Relu"
op: "Relu" op: "Relu"
input: "conv7_2_h/BiasAdd" input: "BatchToSpaceND_2"
} }
node { node {
name: "conv8_1_h/Conv2D" name: "conv8_1_h/Conv2D"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment