diff --git a/tests/bm_mesh_io.py b/tests/bm_mesh_io.py index 1a6eb450..85ce4dbe 100644 --- a/tests/bm_mesh_io.py +++ b/tests/bm_mesh_io.py @@ -7,26 +7,32 @@ from test_ply_io import TestMeshPlyIO def bm_save_load() -> None: - kwargs_list = [ + simple_kwargs_list = [ {"V": 100, "F": 300}, {"V": 1000, "F": 3000}, {"V": 10000, "F": 30000}, ] benchmark( - TestMeshObjIO.load_obj_with_init, - "LOAD_OBJ", - kwargs_list, + TestMeshObjIO.bm_load_simple_obj_with_init, + "LOAD_SIMPLE_OBJ", + simple_kwargs_list, warmup_iters=1, ) benchmark( - TestMeshObjIO.save_obj_with_init, - "SAVE_OBJ", - kwargs_list, + TestMeshObjIO.bm_save_simple_obj_with_init, + "SAVE_SIMPLE_OBJ", + simple_kwargs_list, warmup_iters=1, ) benchmark( - TestMeshPlyIO.load_ply_bm, "LOAD_PLY", kwargs_list, warmup_iters=1 + TestMeshPlyIO.bm_load_simple_ply_with_init, + "LOAD_SIMPLE_PLY", + simple_kwargs_list, + warmup_iters=1, ) benchmark( - TestMeshPlyIO.save_ply_bm, "SAVE_PLY", kwargs_list, warmup_iters=1 + TestMeshPlyIO.bm_save_simple_ply_with_init, + "SAVE_SIMPLE_PLY", + simple_kwargs_list, + warmup_iters=1, ) diff --git a/tests/test_obj_io.py b/tests/test_obj_io.py index 00270997..4292904d 100644 --- a/tests/test_obj_io.py +++ b/tests/test_obj_io.py @@ -602,7 +602,7 @@ class TestMeshObjIO(TestCaseMixin, unittest.TestCase): self.assertClose(cow3_tea.faces_list()[3], mesh_teapot.faces_list()[0]) @staticmethod - def save_obj_with_init(V: int, F: int): + def bm_save_simple_obj_with_init(V: int, F: int): verts_list = torch.tensor(V * [[0.11, 0.22, 0.33]]).view(-1, 3) faces_list = torch.tensor(F * [[1, 2, 3]]).view(-1, 3) obj_file = StringIO() @@ -613,7 +613,7 @@ class TestMeshObjIO(TestCaseMixin, unittest.TestCase): return save_mesh @staticmethod - def load_obj_with_init(V: int, F: int): + def bm_load_simple_obj_with_init(V: int, F: int): obj = "\n".join(["v 0.1 0.2 0.3"] * V + ["f 1 2 3"] * F) def load_mesh(): diff --git a/tests/test_ply_io.py b/tests/test_ply_io.py index 7d2baf46..ad651399 100644 --- a/tests/test_ply_io.py +++ b/tests/test_ply_io.py @@ -407,7 +407,7 @@ class TestMeshPlyIO(TestCaseMixin, unittest.TestCase): load_ply(StringIO("\n".join(lines2))) @staticmethod - def save_ply_bm(V: int, F: int): + def bm_save_simple_ply_with_init(V: int, F: int): verts_list = torch.tensor(V * [[0.11, 0.22, 0.33]]).view(-1, 3) faces_list = torch.tensor(F * [[0, 1, 2]]).view(-1, 3) @@ -418,7 +418,7 @@ class TestMeshPlyIO(TestCaseMixin, unittest.TestCase): return save_mesh @staticmethod - def load_ply_bm(V: int, F: int): + def bm_load_simple_ply_with_init(V: int, F: int): verts = torch.tensor([[0.1, 0.2, 0.3]]).expand(V, 3) faces = torch.tensor([[0, 1, 2]], dtype=torch.int64).expand(F, 3) ply_file = StringIO()