Skip to content

P
PaddleSeg

PaddlePaddle / PaddleSeg

通知 289
Star 8
Fork 1
P
PaddleSeg
提交 db8a896f 编写于 作者: W wuzewu
浏览文件
操作

Delete redundant code

上级 6d7433dd
隐藏空白更改
内联 并排
Showing with 0 addition and 18 deletion
pdseg/models/backbone/xception.py
浏览文件 @ db8a896f
...@@ -150,13 +150,11 @@ class Xception(): ...@@ -150,13 +150,11 @@ class Xception():
chns = self.bottleneck_params["entry_flow"][2] chns = self.bottleneck_params["entry_flow"][2]
strides = check_data(strides, block_num) strides = check_data(strides, block_num)
chns = check_data(chns, block_num) chns = check_data(chns, block_num)
#print("entry:", block_num, strides, chns)
# params to control your flow # params to control your flow
s = self.stride s = self.stride
block_point = self.block_point block_point = self.block_point
output_stride = self.output_stride output_stride = self.output_stride
#print("entry:", s, block_point, output_stride)
with scope("entry_flow"): with scope("entry_flow"):
for i in range(block_num): for i in range(block_num):
block_point = block_point + 1 block_point = block_point + 1
...@@ -167,13 +165,10 @@ class Xception(): ...@@ -167,13 +165,10 @@ class Xception():
data, chns[i], [1, 1, stride]) data, chns[i], [1, 1, stride])
s = s * stride s = s * stride
if check_points(block_point, self.decode_points): if check_points(block_point, self.decode_points):
#print("decode shortcut:", block_point)
self.short_cuts[block_point] = short_cuts[1] self.short_cuts[block_point] = short_cuts[1]
#print("entry:", i, data.shape)
self.stride = s self.stride = s
self.block_point = block_point self.block_point = block_point
#print("entry:", s, block_point, output_stride)
return data return data
def middle_flow(self, data): def middle_flow(self, data):
...@@ -183,12 +178,10 @@ class Xception(): ...@@ -183,12 +178,10 @@ class Xception():
strides = check_data(strides, block_num) strides = check_data(strides, block_num)
chns = check_data(chns, block_num) chns = check_data(chns, block_num)
#print("middle:", block_num, strides, chns)
# params to control your flow # params to control your flow
s = self.stride s = self.stride
block_point = self.block_point block_point = self.block_point
output_stride = self.output_stride output_stride = self.output_stride
#print("middle:", s, block_point, output_stride)
with scope("middle_flow"): with scope("middle_flow"):
for i in range(block_num): for i in range(block_num):
block_point = block_point + 1 block_point = block_point + 1
...@@ -199,13 +192,10 @@ class Xception(): ...@@ -199,13 +192,10 @@ class Xception():
data, chns[i], [1, 1, strides[i]], skip_conv=False) data, chns[i], [1, 1, strides[i]], skip_conv=False)
s = s * stride s = s * stride
if check_points(block_point, self.decode_points): if check_points(block_point, self.decode_points):
#print("decode shortcut:", block_point)
self.short_cuts[block_point] = short_cuts[1] self.short_cuts[block_point] = short_cuts[1]
#print("middle:", i, data.shape)
self.stride = s self.stride = s
self.block_point = block_point self.block_point = block_point
#print("middle:", s, block_point, output_stride)
return data return data
def exit_flow(self, data): def exit_flow(self, data):
...@@ -214,14 +204,12 @@ class Xception(): ...@@ -214,14 +204,12 @@ class Xception():
chns = self.bottleneck_params["exit_flow"][2] chns = self.bottleneck_params["exit_flow"][2]
strides = check_data(strides, block_num) strides = check_data(strides, block_num)
chns = check_data(chns, block_num) chns = check_data(chns, block_num)
#print("exit:", block_num, strides, chns)
assert (block_num == 2) assert (block_num == 2)
# params to control your flow # params to control your flow
s = self.stride s = self.stride
block_point = self.block_point block_point = self.block_point
output_stride = self.output_stride output_stride = self.output_stride
#print("exit:", s, block_point, output_stride)
with scope("exit_flow"): with scope("exit_flow"):
with scope('block1'): with scope('block1'):
block_point += 1 block_point += 1
...@@ -231,9 +219,7 @@ class Xception(): ...@@ -231,9 +219,7 @@ class Xception():
[1, 1, stride]) [1, 1, stride])
s = s * stride s = s * stride
if check_points(block_point, self.decode_points): if check_points(block_point, self.decode_points):
#print("decode shortcut:", block_point)
self.short_cuts[block_point] = short_cuts[1] self.short_cuts[block_point] = short_cuts[1]
#print("exit:", 0, data.shape)
with scope('block2'): with scope('block2'):
block_point += 1 block_point += 1
stride = strides[1] if check_stride(s * strides[1], stride = strides[1] if check_stride(s * strides[1],
...@@ -246,13 +232,10 @@ class Xception(): ...@@ -246,13 +232,10 @@ class Xception():
activation_fn_in_separable_conv=True) activation_fn_in_separable_conv=True)
s = s * stride s = s * stride
if check_points(block_point, self.decode_points): if check_points(block_point, self.decode_points):
#print("decode shortcut:", block_point)
self.short_cuts[block_point] = short_cuts[1] self.short_cuts[block_point] = short_cuts[1]
#print("exit:", 1, data.shape)
self.stride = s self.stride = s
self.block_point = block_point self.block_point = block_point
#print("exit:", s, block_point, output_stride)
return data return data
def xception_block(self, def xception_block(self,
...@@ -332,4 +315,3 @@ if __name__ == '__main__': ...@@ -332,4 +315,3 @@ if __name__ == '__main__':
image = fluid.layers.data(name='image', shape=image_shape, dtype='float32') image = fluid.layers.data(name='image', shape=image_shape, dtype='float32')
model = xception_65() model = xception_65()
logit = model.net(image) logit = model.net(image)
#print("logit:", logit.shape)
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或