summaryrefslogtreecommitdiff
path: root/models/auto_encoder.py
diff options
context:
space:
mode:
authorJordan Gong <jordan.gong@protonmail.com>2021-04-03 23:07:23 +0800
committerJordan Gong <jordan.gong@protonmail.com>2021-04-03 23:07:23 +0800
commit258efcafe4d34ed5ffeebcaab9389f75a17e4717 (patch)
tree0f4ffe75990b63b8e17956eeec269e3589852769 /models/auto_encoder.py
parent4049566103a00aa6d5a0b1f73569bdc5435714ca (diff)
parentf6f133fa7b926ce0c7d28bbf0ba4de41b3708d4a (diff)
Merge branch 'disentangling_only' into disentangling_only_py3.8
# Conflicts: # models/model.py
Diffstat (limited to 'models/auto_encoder.py')
-rw-r--r--models/auto_encoder.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/models/auto_encoder.py b/models/auto_encoder.py
index e17caed..b1d51ef 100644
--- a/models/auto_encoder.py
+++ b/models/auto_encoder.py
@@ -108,15 +108,13 @@ class Decoder(nn.Module):
self.trans_conv4 = DCGANConvTranspose2d(feature_channels, out_channels,
is_last_layer=True)
- def forward(self, f_appearance, f_canonical, f_pose, cano_only=False):
+ def forward(self, f_appearance, f_canonical, f_pose):
x = torch.cat((f_appearance, f_canonical, f_pose), dim=1)
x = self.fc(x)
x = x.view(-1, self.feature_channels * 8, self.h_0, self.w_0)
x = F.relu(x, inplace=True)
x = self.trans_conv1(x)
x = self.trans_conv2(x)
- if cano_only:
- return x
x = self.trans_conv3(x)
x = torch.sigmoid(self.trans_conv4(x))