Skip to content

Commit 8f40dab

Browse files
iliasprciliasprc
authored
Merge pull request #24 from glennmatlin/patch-2
PEXP -> PEPX
2 parents 6c21e28 + 11d1312 commit 8f40dab

File tree

1 file changed

+51
-51
lines changed

1 file changed

+51
-51
lines changed

‎lib/medzoo/COVIDNet.py

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ def forward(self, input):
99
return input.view(input.size(0), -1)
1010

1111

12-
class PEXP(nn.Module):
12+
class PEPX(nn.Module):
1313
def __init__(self, n_input, n_out):
14-
super(PEXP, self).__init__()
14+
super(PEPX, self).__init__()
1515

1616
'''
1717
• First-stage Projection: 1×1 convolutions for projecting input features to a lower dimension,
@@ -49,22 +49,22 @@ class CovidNet(nn.Module):
4949
def __init__(self, model='large', n_classes=3):
5050
super(CovidNet, self).__init__()
5151
filters = {
52-
'pexp1_1': [64, 256],
53-
'pexp1_2': [256, 256],
54-
'pexp1_3': [256, 256],
55-
'pexp2_1': [256, 512],
56-
'pexp2_2': [512, 512],
57-
'pexp2_3': [512, 512],
58-
'pexp2_4': [512, 512],
59-
'pexp3_1': [512, 1024],
60-
'pexp3_2': [1024, 1024],
61-
'pexp3_3': [1024, 1024],
62-
'pexp3_4': [1024, 1024],
63-
'pexp3_5': [1024, 1024],
64-
'pexp3_6': [1024, 1024],
65-
'pexp4_1': [1024, 2048],
66-
'pexp4_2': [2048, 2048],
67-
'pexp4_3': [2048, 2048],
52+
'pepx1_1': [64, 256],
53+
'pepx1_2': [256, 256],
54+
'pepx1_3': [256, 256],
55+
'pepx2_1': [256, 512],
56+
'pepx2_2': [512, 512],
57+
'pepx2_3': [512, 512],
58+
'pepx2_4': [512, 512],
59+
'pepx3_1': [512, 1024],
60+
'pepx3_2': [1024, 1024],
61+
'pepx3_3': [1024, 1024],
62+
'pepx3_4': [1024, 1024],
63+
'pepx3_5': [1024, 1024],
64+
'pepx3_6': [1024, 1024],
65+
'pepx4_1': [1024, 2048],
66+
'pepx4_2': [2048, 2048],
67+
'pepx4_3': [2048, 2048],
6868
}
6969

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

7878
if (model == 'large'):
7979

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

101-
pepx11 = self.pexp1_1(x)
102-
pepx12 = self.pexp1_2(pepx11 + out_conv1_1x1)
103-
pepx13 = self.pexp1_3(pepx12 + pepx11 + out_conv1_1x1)
101+
pepx11 = self.pepx1_1(x)
102+
pepx12 = self.pepx1_2(pepx11 + out_conv1_1x1)
103+
pepx13 = self.pepx1_3(pepx12 + pepx11 + out_conv1_1x1)
104104

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

107-
pepx21 = self.pexp2_1(
107+
pepx21 = self.pepx2_1(
108108
F.max_pool2d(pepx13, 2) + F.max_pool2d(pepx11, 2) + F.max_pool2d(pepx12, 2) + F.max_pool2d(out_conv1_1x1,
109109
2))
110-
pepx22 = self.pexp2_2(pepx21 + out_conv2_1x1)
111-
pepx23 = self.pexp2_3(pepx22 + pepx21 + out_conv2_1x1)
112-
pepx24 = self.pexp2_4(pepx23 + pepx21 + pepx22 + out_conv2_1x1)
110+
pepx22 = self.pepx2_2(pepx21 + out_conv2_1x1)
111+
pepx23 = self.pepx2_3(pepx22 + pepx21 + out_conv2_1x1)
112+
pepx24 = self.pepx2_4(pepx23 + pepx21 + pepx22 + out_conv2_1x1)
113113

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

116-
pepx31 = self.pexp3_1(
116+
pepx31 = self.pepx3_1(
117117
F.max_pool2d(pepx24, 2) + F.max_pool2d(pepx21, 2) + F.max_pool2d(pepx22, 2) + F.max_pool2d(pepx23,
118118
2) + F.max_pool2d(
119119
out_conv2_1x1, 2))
120-
pepx32 = self.pexp3_2(pepx31 + out_conv3_1x1)
121-
pepx33 = self.pexp3_3(pepx31 + pepx32 + out_conv3_1x1)
122-
pepx34 = self.pexp3_4(pepx31 + pepx32 + pepx33 + out_conv3_1x1)
123-
pepx35 = self.pexp3_5(pepx31 + pepx32 + pepx33 + pepx34 + out_conv3_1x1)
124-
pepx36 = self.pexp3_6(pepx31 + pepx32 + pepx33 + pepx34 + pepx35 + out_conv3_1x1)
120+
pepx32 = self.pepx3_2(pepx31 + out_conv3_1x1)
121+
pepx33 = self.pepx3_3(pepx31 + pepx32 + out_conv3_1x1)
122+
pepx34 = self.pepx3_4(pepx31 + pepx32 + pepx33 + out_conv3_1x1)
123+
pepx35 = self.pepx3_5(pepx31 + pepx32 + pepx33 + pepx34 + out_conv3_1x1)
124+
pepx36 = self.pepx3_6(pepx31 + pepx32 + pepx33 + pepx34 + pepx35 + out_conv3_1x1)
125125

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

129-
pepx41 = self.pexp4_1(
129+
pepx41 = self.pepx4_1(
130130
F.max_pool2d(pepx31, 2) + F.max_pool2d(pepx32, 2) + F.max_pool2d(pepx32, 2) + F.max_pool2d(pepx34,
131131
2) + F.max_pool2d(
132132
pepx35, 2) + F.max_pool2d(pepx36, 2) + F.max_pool2d(out_conv3_1x1, 2))
133-
pepx42 = self.pexp4_2(pepx41 + out_conv4_1x1)
134-
pepx43 = self.pexp4_3(pepx41 + pepx42 + out_conv4_1x1)
133+
pepx42 = self.pepx4_2(pepx41 + out_conv4_1x1)
134+
pepx43 = self.pepx4_3(pepx41 + pepx42 + out_conv4_1x1)
135135
flattened = self.flatten(pepx41 + pepx42 + pepx43 + out_conv4_1x1)
136136

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

145-
pepx11 = self.pexp1_1(x)
146-
pepx12 = self.pexp1_2(pepx11)
147-
pepx13 = self.pexp1_3(pepx12 + pepx11)
145+
pepx11 = self.pepx1_1(x)
146+
pepx12 = self.pepx1_2(pepx11)
147+
pepx13 = self.pepx1_3(pepx12 + pepx11)
148148

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

154-
pepx31 = self.pexp3_1(
154+
pepx31 = self.pepx3_1(
155155
F.max_pool2d(pepx24, 2) + F.max_pool2d(pepx21, 2) + F.max_pool2d(pepx22, 2) + F.max_pool2d(pepx23, 2))
156-
pepx32 = self.pexp3_2(pepx31)
157-
pepx33 = self.pexp3_3(pepx31 + pepx32)
158-
pepx34 = self.pexp3_4(pepx31 + pepx32 + pepx33)
159-
pepx35 = self.pexp3_5(pepx31 + pepx32 + pepx33 + pepx34)
160-
pepx36 = self.pexp3_6(pepx31 + pepx32 + pepx33 + pepx34 + pepx35)
156+
pepx32 = self.pepx3_2(pepx31)
157+
pepx33 = self.pepx3_3(pepx31 + pepx32)
158+
pepx34 = self.pepx3_4(pepx31 + pepx32 + pepx33)
159+
pepx35 = self.pepx3_5(pepx31 + pepx32 + pepx33 + pepx34)
160+
pepx36 = self.pepx3_6(pepx31 + pepx32 + pepx33 + pepx34 + pepx35)
161161

162-
pepx41 = self.pexp4_1(
162+
pepx41 = self.pepx4_1(
163163
F.max_pool2d(pepx31, 2) + F.max_pool2d(pepx32, 2) + F.max_pool2d(pepx32, 2) + F.max_pool2d(pepx34,
164164
2) + F.max_pool2d(
165165
pepx35, 2) + F.max_pool2d(pepx36, 2))
166-
pepx42 = self.pexp4_2(pepx41)
167-
pepx43 = self.pexp4_3(pepx41 + pepx42)
166+
pepx42 = self.pepx4_2(pepx41)
167+
pepx43 = self.pepx4_3(pepx41 + pepx42)
168168
flattened = self.flatten(pepx41 + pepx42 + pepx43)
169169

170170
fc1out = F.relu(self.fc1(flattened))

0 commit comments

Comments
 (0)