From 31fc66b795c0a57b8009d7b03f49f6cd099ceb29 Mon Sep 17 00:00:00 2001
From: natanielruiz <nataniel777@hotmail.com>
Date: 星期六, 23 九月 2017 12:07:48 +0800
Subject: [PATCH] Trying superres
---
code/hopenet.py | 76 ++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/code/hopenet.py b/code/hopenet.py
index 4aa0dfb..7b5f764 100644
--- a/code/hopenet.py
+++ b/code/hopenet.py
@@ -126,11 +126,11 @@
return pre_yaw, pre_pitch, pre_roll, angles
-class Hopenet_shape(nn.Module):
- # This is just Hopenet with 3 output layers for yaw, pitch and roll.
- def __init__(self, block, layers, num_bins, shape_bins):
+class ResNet(nn.Module):
+
+ def __init__(self, block, layers, num_classes=1000):
self.inplanes = 64
- super(Hopenet_shape, self).__init__()
+ super(ResNet, self).__init__()
self.conv1 = nn.Conv2d(3, 64, kernel_size=7, stride=2, padding=3,
bias=False)
self.bn1 = nn.BatchNorm2d(64)
@@ -141,19 +141,7 @@
self.layer3 = self._make_layer(block, 256, layers[2], stride=2)
self.layer4 = self._make_layer(block, 512, layers[3], stride=2)
self.avgpool = nn.AvgPool2d(7)
- self.fc_yaw = nn.Linear(512 * block.expansion, num_bins)
- self.fc_pitch = nn.Linear(512 * block.expansion, num_bins)
- self.fc_roll = nn.Linear(512 * block.expansion, num_bins)
- self.fc_shape_0 = nn.Linear(512 * block.expansion, shape_bins)
- self.fc_shape_1 = nn.Linear(512 * block.expansion, shape_bins)
- self.fc_shape_2 = nn.Linear(512 * block.expansion, shape_bins)
- self.fc_shape_3 = nn.Linear(512 * block.expansion, shape_bins)
- self.fc_shape_4 = nn.Linear(512 * block.expansion, shape_bins)
- self.fc_shape_5 = nn.Linear(512 * block.expansion, shape_bins)
- self.fc_shape_6 = nn.Linear(512 * block.expansion, shape_bins)
- self.fc_shape_7 = nn.Linear(512 * block.expansion, shape_bins)
- self.fc_shape_8 = nn.Linear(512 * block.expansion, shape_bins)
- self.fc_shape_9 = nn.Linear(512 * block.expansion, shape_bins)
+ self.fc_angles = nn.Linear(512 * block.expansion, num_classes)
for m in self.modules():
if isinstance(m, nn.Conv2d):
@@ -193,20 +181,46 @@
x = self.avgpool(x)
x = x.view(x.size(0), -1)
+ x = self.fc_angles(x)
+
+ return x
+
+class AlexNet(nn.Module):
+
+ def __init__(self, num_bins):
+ super(AlexNet, self).__init__()
+ self.features = nn.Sequential(
+ nn.Conv2d(3, 64, kernel_size=11, stride=4, padding=2),
+ nn.ReLU(inplace=True),
+ nn.MaxPool2d(kernel_size=3, stride=2),
+ nn.Conv2d(64, 192, kernel_size=5, padding=2),
+ nn.ReLU(inplace=True),
+ nn.MaxPool2d(kernel_size=3, stride=2),
+ nn.Conv2d(192, 384, kernel_size=3, padding=1),
+ nn.ReLU(inplace=True),
+ nn.Conv2d(384, 256, kernel_size=3, padding=1),
+ nn.ReLU(inplace=True),
+ nn.Conv2d(256, 256, kernel_size=3, padding=1),
+ nn.ReLU(inplace=True),
+ nn.MaxPool2d(kernel_size=3, stride=2),
+ )
+ self.classifier = nn.Sequential(
+ nn.Dropout(),
+ nn.Linear(256 * 6 * 6, 4096),
+ nn.ReLU(inplace=True),
+ nn.Dropout(),
+ nn.Linear(4096, 4096),
+ nn.ReLU(inplace=True),
+ )
+ self.fc_yaw = nn.Linear(4096, num_bins)
+ self.fc_pitch = nn.Linear(4096, num_bins)
+ self.fc_roll = nn.Linear(4096, num_bins)
+
+ def forward(self, x):
+ x = self.features(x)
+ x = x.view(x.size(0), 256 * 6 * 6)
+ x = self.classifier(x)
yaw = self.fc_yaw(x)
pitch = self.fc_pitch(x)
roll = self.fc_roll(x)
-
- shape = []
- shape.append(self.fc_shape_0(x))
- shape.append(self.fc_shape_1(x))
- shape.append(self.fc_shape_2(x))
- shape.append(self.fc_shape_3(x))
- shape.append(self.fc_shape_4(x))
- shape.append(self.fc_shape_5(x))
- shape.append(self.fc_shape_6(x))
- shape.append(self.fc_shape_7(x))
- shape.append(self.fc_shape_8(x))
- shape.append(self.fc_shape_9(x))
-
- return yaw, pitch, roll, shape
+ return yaw, pitch, roll
--
Gitblit v1.8.0