summaryrefslogtreecommitdiff
path: root/models/auto_encoder.py
diff options
context:
space:
mode:
authorJordan Gong <jordan.gong@protonmail.com>2021-02-26 20:23:26 +0800
committerJordan Gong <jordan.gong@protonmail.com>2021-02-26 20:23:57 +0800
commit8745ffeb51b29cfe7d3eee2d845910086ba8b046 (patch)
tree4eccf715f0a17c0d54c75d38b54e1d682dc26b99 /models/auto_encoder.py
parent9b1828be1db7fd1be8731a7cec66162de9145285 (diff)
parent5f75d7ef65f6dcd0e72df320c58b6bd141937b5f (diff)
Merge branch 'data_parallel' into data_parallel_py3.8
# Conflicts: # models/part_net.py # models/rgb_part_net.py
Diffstat (limited to 'models/auto_encoder.py')
-rw-r--r--models/auto_encoder.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/models/auto_encoder.py b/models/auto_encoder.py
index 6f388c2..dbd1da0 100644
--- a/models/auto_encoder.py
+++ b/models/auto_encoder.py
@@ -108,14 +108,14 @@ 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, is_feature_map=False):
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:
+ if is_feature_map:
return x
x = self.trans_conv3(x)
x = torch.sigmoid(self.trans_conv4(x))