Fix ShapeNetDataset (#593)

Summary:
- Add MANIFEST.in and `include_package_data=True` to include dataset .json files in the installation
Fix https://github.com/facebookresearch/pytorch3d/issues/435
- Fix `load_textures=False` for ShapeNetDataset with a test
Fix https://github.com/facebookresearch/pytorch3d/issues/450, partly fix https://github.com/facebookresearch/pytorch3d/issues/444. I've set the textures to `None`, if they should be all white instead, let me know.

Pull Request resolved: https://github.com/facebookresearch/pytorch3d/pull/593

Reviewed By: patricklabatut

Differential Revision: D29116264

Pulled By: nikhilaravi

fbshipit-source-id: 1fb0198e616b7f834dfeaf7168bb5e6e530810d1
This commit is contained in:
Talmaj Marinc 2021-06-18 07:01:37 -07:00 committed by Facebook GitHub Bot
parent 1b39cebe92
commit 029a9da00b
4 changed files with 13 additions and 0 deletions

3
MANIFEST.in Normal file
View File

@ -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

View File

@ -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

View File

@ -142,4 +142,5 @@ setup(
},
ext_modules=get_extensions(),
cmdclass={"build_ext": BuildExtension},
include_package_data=True,
)

View File

@ -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"])