From d285712b1c0a3e0785a4e5b17debdde650a7c26a Mon Sep 17 00:00:00 2001
From: natanielruiz <nataniel777@hotmail.com>
Date: 星期三, 13 九月 2017 21:34:38 +0800
Subject: [PATCH] Removed hourglass
---
code/hopenet.py | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/code/hopenet.py b/code/hopenet.py
index 274044f..81e645c 100644
--- a/code/hopenet.py
+++ b/code/hopenet.py
@@ -41,7 +41,7 @@
class Hopenet(nn.Module):
# This is just Hopenet with 3 output layers for yaw, pitch and roll.
- def __init__(self, block, layers, num_bins):
+ def __init__(self, block, layers, num_bins, iter_ref):
self.inplanes = 64
super(Hopenet, self).__init__()
self.conv1 = nn.Conv2d(3, 64, kernel_size=7, stride=2, padding=3,
@@ -62,6 +62,8 @@
self.fc_finetune = nn.Linear(512 * block.expansion + 3, 3)
self.idx_tensor = Variable(torch.FloatTensor(range(66))).cuda()
+
+ self.iter_ref = iter_ref
for m in self.modules():
if isinstance(m, nn.Conv2d):
@@ -87,12 +89,6 @@
layers.append(block(self.inplanes, planes))
return nn.Sequential(*layers)
-
- def get_expectation(angle):
- angle_pred = F.softmax(angle)
-
- angle_pred = torch.sum(angle_pred.data * self.idx_tensor, 1)
- return angle_pred
def forward(self, x):
x = self.conv1(x)
@@ -123,7 +119,7 @@
angles = []
angles.append(torch.cat([yaw, pitch, roll], 1))
- for idx in xrange(1):
+ for idx in xrange(self.iter_ref):
angles.append(self.fc_finetune(torch.cat((angles[-1], x), 1)))
return pre_yaw, pre_pitch, pre_roll, angles
--
Gitblit v1.8.0