diff options
author | Jordan Gong <jordan.gong@protonmail.com> | 2021-02-27 22:16:12 +0800 |
---|---|---|
committer | Jordan Gong <jordan.gong@protonmail.com> | 2021-02-27 22:16:12 +0800 |
commit | ec863bad4933f25a5bf14fef2541df43c4d9430f (patch) | |
tree | 98f424edba3e394170ea595d868a36d135e9a138 /models/rgb_part_net.py | |
parent | 66d7b0e6f80aa6feb5e4e0af9af7ba78db641f9e (diff) | |
parent | 46391257ff50848efa1aa251ab3f15dc8b7a2d2c (diff) |
Merge branch 'master' into python3.8
# Conflicts:
# models/model.py
# utils/configuration.py
# utils/triplet_loss.py
Diffstat (limited to 'models/rgb_part_net.py')
-rw-r--r-- | models/rgb_part_net.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/models/rgb_part_net.py b/models/rgb_part_net.py index 4d7ba7f..310ef25 100644 --- a/models/rgb_part_net.py +++ b/models/rgb_part_net.py @@ -81,7 +81,7 @@ class RGBPartNet(nn.Module): ((f_a_, f_c_, f_p_), losses) = self.ae(x_c1_t2, x_c1_t1, x_c2_t2) # Decode features x_c = self._decode_cano_feature(f_c_, n, t, device) - x_p_ = self._decode_pose_feature(f_p_, n, t, c, h, w, device) + x_p_ = self._decode_pose_feature(f_p_, n, t, device) x_p = x_p_.view(n, t, self.pn_in_channels, self.h // 4, self.w // 4) i_a, i_c, i_p = None, None, None @@ -100,7 +100,7 @@ class RGBPartNet(nn.Module): else: # evaluating f_c_, f_p_ = self.ae(x_c1_t2) x_c = self._decode_cano_feature(f_c_, n, t, device) - x_p_ = self._decode_pose_feature(f_p_, n, t, c, h, w, device) + x_p_ = self._decode_pose_feature(f_p_, n, t, device) x_p = x_p_.view(n, t, self.pn_in_channels, self.h // 4, self.w // 4) return (x_c, x_p), None, None @@ -125,7 +125,7 @@ class RGBPartNet(nn.Module): ) return x_c - def _decode_pose_feature(self, f_p_, n, t, c, h, w, device): + def _decode_pose_feature(self, f_p_, n, t, device): # Decode pose features to images x_p_ = self.ae.decoder( torch.zeros((n * t, self.f_a_dim), device=device), |