Merge geometry test helper into geometry (#153)

Summary:
Pull Request resolved: #153

Now that `geometry_test_helper` no longer has a gtest dependency, it can be merged into geometry for simplicity.

Reviewed By: cdtwigg

Differential Revision: D66790295

fbshipit-source-id: bbfc739a642b95a140a14780fd5f60a0205d32b9

Author: jeongseok-meta

pymomentum/CMakeLists.txt

@@ -111,6 +111,7 @@ mt_python_binding(
     ${TORCH_LIBRARIES}
   LINK_LIBRARIES
     character
+    character_test_helpers
     io_fbx
     io_gltf
     io_marker
@@ -169,15 +170,6 @@ if(MOMENTUM_BUILD_TESTING)
   enable_testing()
   mt_setup_gtest()
 
-  mt_python_binding(
-    NAME geometry_test_helper
-    PYMOMENTUM_HEADERS_VARS geometry_test_helper_public_headers
-    PYMOMENTUM_SOURCES_VARS geometry_test_helper_sources
-    INCLUDE_DIRECTORIES
-    LINK_LIBRARIES
-      character_test_helpers
-  )
-
   mt_test(
     NAME tensor_utility_test
     PYMOMENTUM_SOURCES_VARS tensor_utility_test_sources

pymomentum/cmake/build_variables.bzl

@@ -61,13 +61,6 @@ geometry_sources = [
     "geometry/momentum_io.cpp",
 ]
 
-geometry_test_helper_public_headers = [
-]
-
-geometry_test_helper_sources = [
-    "geometry/geometry_test_helper_pybind.cpp",
-]
-
 quaternion_public_headers = [
 ]
 

pymomentum/geometry/geometry_pybind.cpp

@@ -29,6 +29,7 @@
 #include <momentum/io/shape/blend_shape_io.h>
 #include <momentum/math/mesh.h>
 #include <momentum/math/mppca.h>
+#include <momentum/test/character/character_helpers.h>
 
 #include <pybind11/eigen.h>
 #include <pybind11/numpy.h>
@@ -2134,4 +2135,29 @@ Computes vertex normals for a triangle mesh given its positions.
     )",
       py::arg("vertex_positions"),
       py::arg("triangles"));
+
+  // createTestCharacter()
+  m.def(
+      "test_character",
+      &momentum::createTestCharacter<float>,
+      R"(Create a simple 3-joint test character.  This is useful for writing confidence tests that
+execute quickly and don't rely on outside files.
+
+The mesh is made by a few vertices on the line segment from (1,0,0) to (1,1,0) and a few dummy
+faces. The skeleton has three joints: root at (0,0,0), joint1 parented by root, at world-space
+(0,1,0), and joint2 parented by joint1, at world-space (0,2,0).
+The character has only one parameter limit: min-max type [-0.1, 0.1] for root.
+
+:parameter numJoints: The number of joints in the resulting character.
+:return: A simple character with 3 joints and 10 model parameters.
+      )",
+      py::arg("num_joints") = 3);
+
+  // createTestPosePrior()
+  m.def(
+      "create_test_mppca",
+      &momentum::createDefaultPosePrior<float>,
+      R"(Create a pose prior that acts on the simple 3-joint test character.
+
+:return: A simple pose prior.)");
 }

pymomentum/geometry/geometry_test_helper_pybind.cpp

@@ -8,8 +8,11 @@
 import unittest
 
 import torch
-from pymomentum.geometry import Character, uniform_random_to_model_parameters
-from pymomentum.geometry_test_helper import test_character
+from pymomentum.geometry import (
+    Character,
+    test_character,
+    uniform_random_to_model_parameters,
+)
 
 
 class TestParameterTransform(unittest.TestCase):

pymomentum/test/test_parameter_transform.py

@@ -8,7 +8,6 @@
 import unittest
 
 import pymomentum.geometry as pym_geometry
-import pymomentum.geometry_test_helper as pym_geometry_test_helper
 import pymomentum.quaternion as pym_quaternion
 import pymomentum.skel_state as pym_skel_state
 import torch
@@ -44,7 +43,7 @@ def generate_random_skel_state(sz):
 
 class TestSkelState(unittest.TestCase):
     def test_skel_state_to_transforms(self) -> None:
-        character = pym_geometry_test_helper.test_character()
+        character = pym_geometry.test_character()
         nBatch = 2
         modelParams = 0.2 * torch.ones(
             nBatch,

pymomentum/test/test_skel_state.py

@@ -7,8 +7,7 @@
 
 import unittest
 
-from pymomentum.geometry import Character
-from pymomentum.geometry_test_helper import test_character
+from pymomentum.geometry import Character, test_character
 
 
 class TestSkeleton(unittest.TestCase):

pymomentum/test/test_skeleton.py

@@ -115,7 +115,6 @@ def main():
         ext_modules=[
             CMakeExtension("geometry", sourcedir=ROOT_DIR),
             CMakeExtension("quaternion", sourcedir=ROOT_DIR),
-            CMakeExtension("geometry_test_helper", sourcedir=ROOT_DIR),
             CMakeExtension("skel_state", sourcedir=ROOT_DIR),
         ],
         cmdclass={