Merge branch 'master' into master

Author: MarilynKeller

config_files/smplh2smplx_as.yaml

@@ -0,0 +1,26 @@
+datasets:
+    mesh_folder:
+        data_folder: 'transfer_data/meshes/amass_sample'
+deformation_transfer_path: 'transfer_data/smplh2smplx_deftrafo_setup.pkl'
+mask_ids_fname: 'smplx_mask_ids.npy'
+summary_steps: 100
+
+edge_fitting:
+    per_part: False
+
+optim:
+    type: 'trust-ncg'
+    maxiters: 100
+    gtol: 1e-06
+
+body_model:
+    model_type: "smplx"
+    gender: "neutral"
+    folder: "models"
+    use_compressed: False
+    use_face_contour: True
+    smplx:
+        betas:
+            num: 10
+        expression:
+            num: 10

config_files/smplh2smplx_onepose.yaml

@@ -0,0 +1,27 @@
+datasets:
+    mesh_folder:
+        data_folder: 'transfer_data/meshes/amass_onepose'
+deformation_transfer_path: 'transfer_data/smplh2smplx_deftrafo_setup.pkl'
+mask_ids_fname: 'smplx_mask_ids.npy'
+summary_steps: 100
+
+edge_fitting:
+    per_part: False
+
+optim:
+    type: 'adam'
+    lr: 0.1
+    maxiters: 10000
+    gtol: 1e-06
+
+body_model:
+    model_type: "smplx"
+    gender: "neutral"
+    folder: "models"
+    use_compressed: False
+    use_face_contour: True
+    smplx:
+        betas:
+            num: 10
+        expression:
+            num: 10

smplx/body_models.py

@@ -38,7 +38,11 @@
     FLAMEOutput,
     find_joint_kin_chain)
 from .vertex_joint_selector import VertexJointSelector
+from collections import namedtuple
 
+TensorOutput = namedtuple('TensorOutput',
+                          ['vertices', 'joints', 'betas', 'expression', 'global_orient', 'body_pose', 'left_hand_pose',
+                           'right_hand_pose', 'jaw_pose', 'transl', 'full_pose'])
 
 class SMPL(nn.Module):
 
@@ -48,7 +52,7 @@ class SMPL(nn.Module):
 
     def __init__(
         self, model_path: str,
-	kid_template_path: str = '',
+        kid_template_path: str = '',
         data_struct: Optional[Struct] = None,
         create_betas: bool = True,
         betas: Optional[Tensor] = None,
@@ -143,7 +147,9 @@ def __init__(
         shapedirs = data_struct.shapedirs
         if (shapedirs.shape[-1] < self.SHAPE_SPACE_DIM):
             print(f'WARNING: You are using a {self.name()} model, with only'
-                  f' {shapedirs.shape[-1]} shape coefficients.')
+                  f' {shapedirs.shape[-1]} shape coefficients.\n'
+                  f'num_betas={num_betas}, shapedirs.shape={shapedirs.shape}, '
+                  f'self.SHAPE_SPACE_DIM={self.SHAPE_SPACE_DIM}')
             num_betas = min(num_betas, shapedirs.shape[-1])
         else:
             num_betas = min(num_betas, self.SHAPE_SPACE_DIM)
@@ -901,7 +907,7 @@ class SMPLX(SMPLH):
 
     def __init__(
         self, model_path: str,
-	kid_template_path: str = '',
+        kid_template_path: str = '',
         num_expression_coeffs: int = 10,
         create_expression: bool = True,
         expression: Optional[Tensor] = None,
@@ -1128,7 +1134,7 @@ def forward(
         pose2rot: bool = True,
         return_shaped: bool = True,
         **kwargs
-    ) -> SMPLXOutput:
+    ) -> TensorOutput:
         '''
         Forward pass for the SMPLX model
 
@@ -1276,7 +1282,9 @@ def forward(
         v_shaped = None
         if return_shaped:
             v_shaped = self.v_template + blend_shapes(betas, self.shapedirs)
-        output = SMPLXOutput(vertices=vertices if return_verts else None,
+        else:
+            v_shaped = Tensor(0)
+        output = TensorOutput(vertices=vertices if return_verts else None,
                              joints=joints,
                              betas=betas,
                              expression=expression,
@@ -1324,9 +1332,9 @@ def forward(
         leye_pose: Optional[Tensor] = None,
         reye_pose: Optional[Tensor] = None,
         return_verts: bool = True,
-        return_full_pose: bool = False,
+        return_full_pose: bool = True,
         **kwargs
-    ) -> SMPLXOutput:
+    ) -> TensorOutput:
         '''
         Forward pass for the SMPLX model
 
@@ -1475,7 +1483,7 @@ def forward(
             joints += transl.unsqueeze(dim=1)
             vertices += transl.unsqueeze(dim=1)
 
-        output = SMPLXOutput(vertices=vertices if return_verts else None,
+        output = TensorOutput(vertices=vertices if return_verts else Tensor(0),
                              joints=joints,
                              betas=betas,
                              expression=expression,
@@ -1484,8 +1492,9 @@ def forward(
                              left_hand_pose=left_hand_pose,
                              right_hand_pose=right_hand_pose,
                              jaw_pose=jaw_pose,
-                             transl=transl,
-                             full_pose=full_pose if return_full_pose else None)
+                             transl=transl if transl != None else Tensor(0),
+                             full_pose=full_pose if return_full_pose else Tensor(0))
+
         return output