423A35C7/pytorch3d
1
0
Fork 0
mirror of https://github.com/facebookresearch/pytorch3d.git synced 2025-08-03 20:32:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: FrameDataBuilder working with PathManager

Browse Source 
Summary: In refactoring, we lost path manager here, which broke manifold storage. Fixing this.

Reviewed By: bottler

Differential Revision: D45574940

fbshipit-source-id: 579349eaa654215a09e057be57b56b46769c986a
This commit is contained in:
Roman Shapovalov 2023-05-09 04:56:39 -07:00 committed by Facebook GitHub Bot
parent 23cd19fbc7
commit c80180c96e
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pytorch3d/implicitron/dataset/frame_data.py
View File

@ -450,7 +450,9 @@ class FrameDataBuilderBase(ReplaceableBase, Generic[FrameDataSubtype], ABC):
self, self,
frame_annotation: types.FrameAnnotation, frame_annotation: types.FrameAnnotation,
sequence_annotation: types.SequenceAnnotation, sequence_annotation: types.SequenceAnnotation,
*,
load_blobs: bool = True, load_blobs: bool = True,
**kwargs,
) -> FrameDataSubtype: ) -> FrameDataSubtype:
"""An abstract method to build the frame data based on raw frame/sequence """An abstract method to build the frame data based on raw frame/sequence
annotations, load the binary data and adjust them according to the metadata. annotations, load the binary data and adjust them according to the metadata.
@ -526,7 +528,12 @@ class GenericFrameDataBuilder(FrameDataBuilderBase[FrameDataSubtype], ABC):
"Make sure it is set in either FrameDataBuilder or Dataset params." "Make sure it is set in either FrameDataBuilder or Dataset params."
) )
if load_any_blob and not os.path.isdir(self.dataset_root): # pyre-ignore if self.path_manager is None:
dataset_root_exists = os.path.isdir(self.dataset_root) # pyre-ignore
else:
dataset_root_exists = self.path_manager.isdir(self.dataset_root)
if load_any_blob and not dataset_root_exists:
raise ValueError( raise ValueError(
f"dataset_root is passed but {self.dataset_root} does not exist." f"dataset_root is passed but {self.dataset_root} does not exist."
) )
@ -535,7 +542,9 @@ class GenericFrameDataBuilder(FrameDataBuilderBase[FrameDataSubtype], ABC):
self, self,
frame_annotation: types.FrameAnnotation, frame_annotation: types.FrameAnnotation,
sequence_annotation: types.SequenceAnnotation, sequence_annotation: types.SequenceAnnotation,
*,
load_blobs: bool = True, load_blobs: bool = True,
**kwargs,
) -> FrameDataSubtype: ) -> FrameDataSubtype:
"""Builds the frame data based on raw frame/sequence annotations, loads the """Builds the frame data based on raw frame/sequence annotations, loads the
binary data and adjust them according to the metadata. The processing includes: binary data and adjust them according to the metadata. The processing includes:

1
pytorch3d/implicitron/dataset/json_index_dataset.py
View File

@ -190,6 +190,7 @@ class JsonIndexDataset(DatasetBase, ReplaceableBase):
box_crop=self.box_crop, box_crop=self.box_crop,
box_crop_mask_thr=self.box_crop_mask_thr, box_crop_mask_thr=self.box_crop_mask_thr,
box_crop_context=self.box_crop_context, box_crop_context=self.box_crop_context,
path_manager=self.path_manager,
) )
logger.info(str(self)) logger.info(str(self))

1
pytorch3d/implicitron/dataset/sql_dataset.py
View File

@ -140,6 +140,7 @@ class SqlIndexDataset(DatasetBase, ReplaceableBase): # pyre-ignore
] = self.dataset_root ] = self.dataset_root
run_auto_creation(self) run_auto_creation(self)
self.frame_data_builder.path_manager = self.path_manager
# pyre-ignore # pyre-ignore
self._sql_engine = sa.create_engine(f"sqlite:///{self.sqlite_metadata_file}") self._sql_engine = sa.create_engine(f"sqlite:///{self.sqlite_metadata_file}")