Skip to content

Commit

Permalink
Merge pull request #24 from glennmatlin/patch-2
Browse files Browse the repository at this point in the history 
PEXP -> PEPX
  • Loading branch information
@iliasprc
iliasprc authored Feb 7, 2022
2 parents 6c21e28 + 11d1312 commit 8f40dab
Showing 1 changed file with 51 additions and 51 deletions.
102 changes: 51 additions & 51 deletions lib/medzoo/COVIDNet.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ def forward(self, input):
return input.view(input.size(0), -1)


class PEXP(nn.Module):
class PEPX(nn.Module):
def __init__(self, n_input, n_out):
super(PEXP, self).__init__()
super(PEPX, self).__init__()

'''
• First-stage Projection: 1×1 convolutions for projecting input features to a lower dimension,
Expand Down Expand Up @@ -49,22 +49,22 @@ class CovidNet(nn.Module):
def __init__(self, model='large', n_classes=3):
super(CovidNet, self).__init__()
filters = {
'pexp1_1': [64, 256],
'pexp1_2': [256, 256],
'pexp1_3': [256, 256],
'pexp2_1': [256, 512],
'pexp2_2': [512, 512],
'pexp2_3': [512, 512],
'pexp2_4': [512, 512],
'pexp3_1': [512, 1024],
'pexp3_2': [1024, 1024],
'pexp3_3': [1024, 1024],
'pexp3_4': [1024, 1024],
'pexp3_5': [1024, 1024],
'pexp3_6': [1024, 1024],
'pexp4_1': [1024, 2048],
'pexp4_2': [2048, 2048],
'pexp4_3': [2048, 2048],
'pepx1_1': [64, 256],
'pepx1_2': [256, 256],
'pepx1_3': [256, 256],
'pepx2_1': [256, 512],
'pepx2_2': [512, 512],
'pepx2_3': [512, 512],
'pepx2_4': [512, 512],
'pepx3_1': [512, 1024],
'pepx3_2': [1024, 1024],
'pepx3_3': [1024, 1024],
'pepx3_4': [1024, 1024],
'pepx3_5': [1024, 1024],
'pepx3_6': [1024, 1024],
'pepx4_1': [1024, 2048],
'pepx4_2': [2048, 2048],
'pepx4_3': [2048, 2048],
}

self.add_module('conv1', nn.Conv2d(in_channels=3, out_channels=64, kernel_size=7, stride=2, padding=3))
Expand All @@ -73,7 +73,7 @@ def __init__(self, model='large', n_classes=3):
if ('pool' in key):
self.add_module(key, nn.MaxPool2d(filters[key][0], filters[key][1]))
else:
self.add_module(key, PEXP(filters[key][0], filters[key][1]))
self.add_module(key, pepx(filters[key][0], filters[key][1]))

if (model == 'large'):

Expand All @@ -98,40 +98,40 @@ def forward_large_net(self, x):
x = F.max_pool2d(F.relu(self.conv1(x)), 2)
out_conv1_1x1 = self.conv1_1x1(x)

pepx11 = self.pexp1_1(x)
pepx12 = self.pexp1_2(pepx11 + out_conv1_1x1)
pepx13 = self.pexp1_3(pepx12 + pepx11 + out_conv1_1x1)
pepx11 = self.pepx1_1(x)
pepx12 = self.pepx1_2(pepx11 + out_conv1_1x1)
pepx13 = self.pepx1_3(pepx12 + pepx11 + out_conv1_1x1)

out_conv2_1x1 = F.max_pool2d(self.conv2_1x1(pepx12 + pepx11 + pepx13 + out_conv1_1x1), 2)

pepx21 = self.pexp2_1(
pepx21 = self.pepx2_1(
F.max_pool2d(pepx13, 2) + F.max_pool2d(pepx11, 2) + F.max_pool2d(pepx12, 2) + F.max_pool2d(out_conv1_1x1,
2))
pepx22 = self.pexp2_2(pepx21 + out_conv2_1x1)
pepx23 = self.pexp2_3(pepx22 + pepx21 + out_conv2_1x1)
pepx24 = self.pexp2_4(pepx23 + pepx21 + pepx22 + out_conv2_1x1)
pepx22 = self.pepx2_2(pepx21 + out_conv2_1x1)
pepx23 = self.pepx2_3(pepx22 + pepx21 + out_conv2_1x1)
pepx24 = self.pepx2_4(pepx23 + pepx21 + pepx22 + out_conv2_1x1)

out_conv3_1x1 = F.max_pool2d(self.conv3_1x1(pepx22 + pepx21 + pepx23 + pepx24 + out_conv2_1x1), 2)

pepx31 = self.pexp3_1(
pepx31 = self.pepx3_1(
F.max_pool2d(pepx24, 2) + F.max_pool2d(pepx21, 2) + F.max_pool2d(pepx22, 2) + F.max_pool2d(pepx23,
2) + F.max_pool2d(
out_conv2_1x1, 2))
pepx32 = self.pexp3_2(pepx31 + out_conv3_1x1)
pepx33 = self.pexp3_3(pepx31 + pepx32 + out_conv3_1x1)
pepx34 = self.pexp3_4(pepx31 + pepx32 + pepx33 + out_conv3_1x1)
pepx35 = self.pexp3_5(pepx31 + pepx32 + pepx33 + pepx34 + out_conv3_1x1)
pepx36 = self.pexp3_6(pepx31 + pepx32 + pepx33 + pepx34 + pepx35 + out_conv3_1x1)
pepx32 = self.pepx3_2(pepx31 + out_conv3_1x1)
pepx33 = self.pepx3_3(pepx31 + pepx32 + out_conv3_1x1)
pepx34 = self.pepx3_4(pepx31 + pepx32 + pepx33 + out_conv3_1x1)
pepx35 = self.pepx3_5(pepx31 + pepx32 + pepx33 + pepx34 + out_conv3_1x1)
pepx36 = self.pepx3_6(pepx31 + pepx32 + pepx33 + pepx34 + pepx35 + out_conv3_1x1)

out_conv4_1x1 = F.max_pool2d(
self.conv4_1x1(pepx31 + pepx32 + pepx33 + pepx34 + pepx35 + pepx36 + out_conv3_1x1), 2)

pepx41 = self.pexp4_1(
pepx41 = self.pepx4_1(
F.max_pool2d(pepx31, 2) + F.max_pool2d(pepx32, 2) + F.max_pool2d(pepx32, 2) + F.max_pool2d(pepx34,
2) + F.max_pool2d(
pepx35, 2) + F.max_pool2d(pepx36, 2) + F.max_pool2d(out_conv3_1x1, 2))
pepx42 = self.pexp4_2(pepx41 + out_conv4_1x1)
pepx43 = self.pexp4_3(pepx41 + pepx42 + out_conv4_1x1)
pepx42 = self.pepx4_2(pepx41 + out_conv4_1x1)
pepx43 = self.pepx4_3(pepx41 + pepx42 + out_conv4_1x1)
flattened = self.flatten(pepx41 + pepx42 + pepx43 + out_conv4_1x1)

fc1out = F.relu(self.fc1(flattened))
Expand All @@ -142,29 +142,29 @@ def forward_large_net(self, x):
def forward_small_net(self, x):
x = F.max_pool2d(F.relu(self.conv1(x)), 2)

pepx11 = self.pexp1_1(x)
pepx12 = self.pexp1_2(pepx11)
pepx13 = self.pexp1_3(pepx12 + pepx11)
pepx11 = self.pepx1_1(x)
pepx12 = self.pepx1_2(pepx11)
pepx13 = self.pepx1_3(pepx12 + pepx11)

pepx21 = self.pexp2_1(F.max_pool2d(pepx13, 2) + F.max_pool2d(pepx11, 2) + F.max_pool2d(pepx12, 2))
pepx22 = self.pexp2_2(pepx21)
pepx23 = self.pexp2_3(pepx22 + pepx21)
pepx24 = self.pexp2_4(pepx23 + pepx21 + pepx22)
pepx21 = self.pepx2_1(F.max_pool2d(pepx13, 2) + F.max_pool2d(pepx11, 2) + F.max_pool2d(pepx12, 2))
pepx22 = self.pepx2_2(pepx21)
pepx23 = self.pepx2_3(pepx22 + pepx21)
pepx24 = self.pepx2_4(pepx23 + pepx21 + pepx22)

pepx31 = self.pexp3_1(
pepx31 = self.pepx3_1(
F.max_pool2d(pepx24, 2) + F.max_pool2d(pepx21, 2) + F.max_pool2d(pepx22, 2) + F.max_pool2d(pepx23, 2))
pepx32 = self.pexp3_2(pepx31)
pepx33 = self.pexp3_3(pepx31 + pepx32)
pepx34 = self.pexp3_4(pepx31 + pepx32 + pepx33)
pepx35 = self.pexp3_5(pepx31 + pepx32 + pepx33 + pepx34)
pepx36 = self.pexp3_6(pepx31 + pepx32 + pepx33 + pepx34 + pepx35)
pepx32 = self.pepx3_2(pepx31)
pepx33 = self.pepx3_3(pepx31 + pepx32)
pepx34 = self.pepx3_4(pepx31 + pepx32 + pepx33)
pepx35 = self.pepx3_5(pepx31 + pepx32 + pepx33 + pepx34)
pepx36 = self.pepx3_6(pepx31 + pepx32 + pepx33 + pepx34 + pepx35)

pepx41 = self.pexp4_1(
pepx41 = self.pepx4_1(
F.max_pool2d(pepx31, 2) + F.max_pool2d(pepx32, 2) + F.max_pool2d(pepx32, 2) + F.max_pool2d(pepx34,
2) + F.max_pool2d(
pepx35, 2) + F.max_pool2d(pepx36, 2))
pepx42 = self.pexp4_2(pepx41)
pepx43 = self.pexp4_3(pepx41 + pepx42)
pepx42 = self.pepx4_2(pepx41)
pepx43 = self.pepx4_3(pepx41 + pepx42)
flattened = self.flatten(pepx41 + pepx42 + pepx43)

fc1out = F.relu(self.fc1(flattened))
Expand Down

0 comments on commit 8f40dab

Please sign in to comment.