diff options
| author | Jordan Gong <jordan.gong@protonmail.com> | 2021-04-03 21:30:35 +0800 |
|---|---|---|
| committer | Jordan Gong <jordan.gong@protonmail.com> | 2021-04-03 23:06:07 +0800 |
| commit | f6f133fa7b926ce0c7d28bbf0ba4de41b3708d4a (patch) | |
| tree | 4bf9b80c1c7a96f081a4e3b3b751145054fccc39 /models/auto_encoder.py | |
| parent | d12dd6b04a4e7c2b1ee43ab6f36f25d0c35ca364 (diff) | |
| parent | b9f35fbe7d78b3c478086ea26c2a76f72ce35687 (diff) | |
Merge branch 'master' into disentangling_only
# Conflicts:
# config.py
# models/hpm.py
# models/layers.py
# models/model.py
# models/part_net.py
# models/rgb_part_net.py
# test/part_net.py
# utils/configuration.py
# utils/triplet_loss.py
Diffstat (limited to 'models/auto_encoder.py')
| -rw-r--r-- | models/auto_encoder.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/models/auto_encoder.py b/models/auto_encoder.py index 2d715db..91071dd 100644 --- a/models/auto_encoder.py +++ b/models/auto_encoder.py @@ -106,15 +106,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)) |