tsaddev commited on
Commit
1d38fea
·
1 Parent(s): d3507ec

Update app/Hackathon_setup/exp_recognition_model.py

Browse files
app/Hackathon_setup/exp_recognition_model.py CHANGED
@@ -16,17 +16,17 @@ classes = {0: 'ANGER', 1: 'DISGUST', 2: 'FEAR', 3: 'HAPPINESS', 4: 'NEUTRAL', 5:
16
  class facExpRec(torch.nn.Module):
17
  def __init__(self, out_features=7):
18
  super().__init__()
19
-
20
  self.conv1 = self.convlayer(in_channels=1, out_channels=64, kernel_size=3)
21
  self.conv2 = self.convlayer(in_channels=64, out_channels=128, kernel_size=5)
22
  self.conv3 = self.convlayer(in_channels=128, out_channels=512, kernel_size=3)
23
  self.conv4 = self.convlayer(in_channels=512, out_channels=512, kernel_size=3, max_pool=1)
24
-
25
  self.fc1 = self.fclayer(512, 256)
26
  self.fc2 = self.fclayer(256, 512)
27
  self.fc3 = nn.Linear(512, out_features)
28
-
29
- def convlayer(self, in_channels, out_channels, kernel_size, max_pool=2):
30
  return nn.Sequential(
31
  nn.Conv2d(in_channels=in_channels, out_channels=out_channels, kernel_size=kernel_size, stride=1),
32
  nn.BatchNorm2d(out_channels),
@@ -34,17 +34,17 @@ class facExpRec(torch.nn.Module):
34
  nn.Dropout2d(),
35
  nn.MaxPool2d(kernel_size=max_pool),
36
  )
37
-
38
- def fclayer(self, in_features, out_features):
39
  return nn.Sequential(
40
  nn.Linear(in_features, out_features),
41
  nn.BatchNorm1d(out_features),
42
  nn.Dropout1d(0.4),
43
  nn.ReLU(),
44
  )
 
45
 
46
-
47
- def forward(self, x):
48
  x = self.conv1(x)
49
  x = self.conv2(x)
50
  x = self.conv3(x)
 
16
  class facExpRec(torch.nn.Module):
17
  def __init__(self, out_features=7):
18
  super().__init__()
19
+
20
  self.conv1 = self.convlayer(in_channels=1, out_channels=64, kernel_size=3)
21
  self.conv2 = self.convlayer(in_channels=64, out_channels=128, kernel_size=5)
22
  self.conv3 = self.convlayer(in_channels=128, out_channels=512, kernel_size=3)
23
  self.conv4 = self.convlayer(in_channels=512, out_channels=512, kernel_size=3, max_pool=1)
24
+
25
  self.fc1 = self.fclayer(512, 256)
26
  self.fc2 = self.fclayer(256, 512)
27
  self.fc3 = nn.Linear(512, out_features)
28
+
29
+ def convlayer(self, in_channels, out_channels, kernel_size, max_pool=2):
30
  return nn.Sequential(
31
  nn.Conv2d(in_channels=in_channels, out_channels=out_channels, kernel_size=kernel_size, stride=1),
32
  nn.BatchNorm2d(out_channels),
 
34
  nn.Dropout2d(),
35
  nn.MaxPool2d(kernel_size=max_pool),
36
  )
37
+
38
+ def fclayer(self, in_features, out_features):
39
  return nn.Sequential(
40
  nn.Linear(in_features, out_features),
41
  nn.BatchNorm1d(out_features),
42
  nn.Dropout1d(0.4),
43
  nn.ReLU(),
44
  )
45
+
46
 
47
+ def forward(self, x):
 
48
  x = self.conv1(x)
49
  x = self.conv2(x)
50
  x = self.conv3(x)