diff options
| author | Jordan Gong <jordan.gong@protonmail.com> | 2021-02-21 19:01:20 +0800 |
|---|---|---|
| committer | Jordan Gong <jordan.gong@protonmail.com> | 2021-02-21 19:01:20 +0800 |
| commit | 1014543e8b2cecbe6fdf1a0135bbefccee9c0d41 (patch) | |
| tree | 90d726834bec29c8816800c71b75aad663edc858 /models/auto_encoder.py | |
| parent | c538919cb69e35a46811aef0b23baefe6a4c499c (diff) | |
| parent | c52fdc2748e272a5195303299a9739291be32281 (diff) | |
Merge branch 'master' into python3.8
# Conflicts:
# models/part_net.py
# models/rgb_part_net.py
Diffstat (limited to 'models/auto_encoder.py')
| -rw-r--r-- | models/auto_encoder.py | 4 |
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)) |