copilot/OpenSeeFace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed the number of layers in 30 point model and added missing batch dimension (#7)

Browse source
This commit is contained in:
Emiliana 2020-09-24 17:57:35 +02:00 • committed by GitHub
parent 8ff2e61e1b
commit 2cca2cba57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
model.py
View file

@ -161,12 +161,12 @@ class OpenSeeFaceLandmarks(geffnet.mobilenetv3.MobileNetV3):
x = self.group(x)
if self.inference:
t_main = x[0:66].reshape((66, 28*28))
t_main = x[:, 0:66].reshape((-1, 66, 28*28))
t_m = t_main.argmax(dim=1)
indices = t_m.unsqueeze(1)
t_conf = t_main.gather(1, indices).squeeze(1)
t_off_x = x[66:132].reshape((66, 28*28)).gather(1, indices).squeeze(1)
t_off_y = x[132:198].reshape((66, 28*28)).gather(1, indices).squeeze(1)
t_off_x = x[:, 66:132].reshape((-1, 66, 28*28)).gather(1, indices).squeeze(1)
t_off_y = x[:, 132:198].reshape((-1, 66, 28*28)).gather(1, indices).squeeze(1)
t_off_x = (223. * logit_arr(t_off_x) + 0.5).floor()
t_off_y = (223. * logit_arr(t_off_y) + 0.5).floor()
t_x = 223. * (t_m / 28.).floor() / 27. + t_off_x
@ -203,12 +203,12 @@ class OpenSeeFaceLandmarks30Pt(geffnet.mobilenetv3.MobileNetV3):
x = self.group(x)
if self.inference:
t_main = x[0:30].reshape((30, 7*7))
t_main = x[:, 0:30].reshape((-1, 30, 7*7))
t_m = t_main.argmax(dim=1)
indices = t_m.unsqueeze(1)
t_conf = t_main.gather(1, indices).squeeze(1)
t_off_x = x[30:60].reshape((60, 7*7)).gather(1, indices).squeeze(1)
t_off_y = x[60:90].reshape((60, 7*7)).gather(1, indices).squeeze(1)
t_off_x = x[:, 30:60].reshape((-1, 30, 7*7)).gather(1, indices).squeeze(1)
t_off_y = x[:, 60:90].reshape((-1, 30, 7*7)).gather(1, indices).squeeze(1)
t_off_x = 55. * logit_arr(t_off_x)
t_off_y = 55. * logit_arr(t_off_y)
t_x = 55. * (t_m / 7.).floor() / 6. + t_off_x