diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..a0d6ffee --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,3 @@ +include pytorch3d/datasets/shapenet/shapenet_synset_dict_v1.json +include pytorch3d/datasets/shapenet/shapenet_synset_dict_v2.json +include pytorch3d/datasets/r2n2/r2n2_synset_dict.json diff --git a/pytorch3d/datasets/shapenet_base.py b/pytorch3d/datasets/shapenet_base.py index 91b82448..24810e1f 100644 --- a/pytorch3d/datasets/shapenet_base.py +++ b/pytorch3d/datasets/shapenet_base.py @@ -96,6 +96,8 @@ class ShapeNetBase(torch.utils.data.Dataset): # pragma: no cover self.texture_resolution, 3, ) + else: + textures = None return verts, faces.verts_idx, textures diff --git a/setup.py b/setup.py index 28c4081d..a12abb14 100755 --- a/setup.py +++ b/setup.py @@ -142,4 +142,5 @@ setup( }, ext_modules=get_extensions(), cmdclass={"build_ext": BuildExtension}, + include_package_data=True, ) diff --git a/tests/test_shapenet_core.py b/tests/test_shapenet_core.py index 0268459f..260c95e9 100644 --- a/tests/test_shapenet_core.py +++ b/tests/test_shapenet_core.py @@ -282,3 +282,10 @@ class TestShapenetCore(TestCaseMixin, unittest.TestCase): "test_shapenet_core_render_without_sample_nums_%s.png" % idx, DATA_DIR ) self.assertClose(mixed_rgb_2, image_ref, atol=0.05) + + def test_load_textures_false(self): + shapenet_dataset = ShapeNetCore( + SHAPENET_PATH, load_textures=False, version=VERSION + ) + model = shapenet_dataset[0] + self.assertIsNone(model["textures"])