Skip to content
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

Jump to bottom

[BugFix]Fix ppmobileseg #3443

Merged
merged 1 commit into from
Aug 10, 2023
Merged

[BugFix]Fix ppmobileseg #3443

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 9 additions & 19 deletions paddleseg/models/backbones/strideformer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,11 @@ def __init__(self,
self.inj_type = inj_type
if self.inj_type == "AAM":
self.inj_module = InjectionMultiSumallmultiallsum(
in_channels=out_feat_chs,
activations=act_layer,
out_channels=out_channels)
in_channels=out_feat_chs, out_channels=out_channels)
self.feat_channels = [out_channels, ]
elif self.inj_type == "AAMSx8":
self.inj_module = InjectionMultiSumallmultiallsumSimpx8(
in_channels=out_feat_chs,
activations=act_layer,
out_channels=out_channels)
in_channels=out_feat_chs, out_channels=out_channels)
self.feat_channels = [out_channels, ]
elif self.inj_type == 'origin':
for i in range(len(dims)):
Expand Down Expand Up @@ -641,11 +637,11 @@ def forward(self, x):


class Fusion_block(nn.Layer):
def __init__(self, inp, oup, embed_dim, activations=None) -> None:
def __init__(self, inp, oup, embed_dim) -> None:
super(Fusion_block, self).__init__()
self.local_embedding = ConvBNAct(inp, embed_dim, kernel_size=1)
self.global_act = ConvBNAct(oup, embed_dim, kernel_size=1)
self.act = activations()
self.act = nn.Sigmoid()

def forward(self, x_l, x_g):
'''
Expand All @@ -669,10 +665,7 @@ def forward(self, x_l, x_g):


class InjectionMultiSumallmultiallsum(nn.Layer):
def __init__(self,
in_channels=(64, 128, 256, 384),
activations=None,
out_channels=256):
def __init__(self, in_channels=(64, 128, 256, 384), out_channels=256):
super(InjectionMultiSumallmultiallsum, self).__init__()
self.embedding_list = nn.LayerList()
self.act_embedding_list = nn.LayerList()
Expand All @@ -684,7 +677,7 @@ def __init__(self,
self.act_embedding_list.append(
ConvBNAct(
in_channels[i], out_channels, kernel_size=1))
self.act_list.append(activations())
self.act_list.append(nn.Sigmoid())

def forward(self, inputs): # x_x8, x_x16, x_x32, x_x64
low_feat1 = F.interpolate(inputs[0], scale_factor=0.5, mode="bilinear")
Expand Down Expand Up @@ -713,10 +706,7 @@ def forward(self, inputs): # x_x8, x_x16, x_x32, x_x64


class InjectionMultiSumallmultiallsumSimpx8(nn.Layer):
def __init__(self,
in_channels=(64, 128, 256, 384),
activations=None,
out_channels=256):
def __init__(self, in_channels=(64, 128, 256, 384), out_channels=256):
super(InjectionMultiSumallmultiallsumSimpx8, self).__init__()
self.embedding_list = nn.LayerList()
self.act_embedding_list = nn.LayerList()
Expand All @@ -730,7 +720,7 @@ def __init__(self,
self.act_embedding_list.append(
ConvBNAct(
in_channels[i], out_channels, kernel_size=1))
self.act_list.append(activations())
self.act_list.append(nn.Sigmoid())

def forward(self, inputs):
# x_x8, x_x16, x_x32
Expand Down Expand Up @@ -815,4 +805,4 @@ def MobileSeg_Tiny(**kwargs):
act_layer=nn.ReLU6,
**kwargs)

return model
return model