diff --git a/nerfstudio/data/datamanagers/base_datamanager.py b/nerfstudio/data/datamanagers/base_datamanager.py index e48218c39..0e3c6edce 100644 --- a/nerfstudio/data/datamanagers/base_datamanager.py +++ b/nerfstudio/data/datamanagers/base_datamanager.py @@ -49,13 +49,8 @@ from nerfstudio.data.dataparsers.nuscenes_dataparser import NuScenesDataParserCo from nerfstudio.data.dataparsers.phototourism_dataparser import ( PhototourismDataParserConfig, ) -from nerfstudio.data.dataparsers.sdfstudio_dataparser import SDFStudioDataParserConfig from nerfstudio.data.datasets.base_dataset import InputDataset -from nerfstudio.data.pixel_samplers import ( - EquirectangularPixelSampler, - PatchPixelSampler, - PixelSampler, -) +from nerfstudio.data.pixel_samplers import EquirectangularPixelSampler, PixelSampler from nerfstudio.data.utils.dataloaders import ( CacheDataloader, FixedIndicesEvalDataloader, @@ -80,7 +75,6 @@ AnnotatedDataParserUnion = tyro.conf.OmitSubcommandPrefixes[ # Omit prefixes of "dnerf-data": DNeRFDataParserConfig(), "phototourism-data": PhototourismDataParserConfig(), "dycheck-data": DycheckDataParserConfig(), - "sdfstudio-data": SDFStudioDataParserConfig(), }, prefix_names=False, # Omit prefixes in subcommands themselves. ) @@ -287,8 +281,6 @@ class VanillaDataManagerConfig(InstantiateConfig): """The scale factor for scaling spatial data such as images, mask, semantics along with relevant information about camera intrinsics """ - patch_size: int = 1 - """Size of patch to sample from. If >1, patch-based sampling will be used.""" class VanillaDataManager(DataManager): # pylint: disable=abstract-method @@ -352,9 +344,6 @@ class VanillaDataManager(DataManager): # pylint: disable=abstract-method self, dataset: InputDataset, *args: Any, **kwargs: Any ) -> PixelSampler: """Infer pixel sampler to use.""" - if self.config.patch_size > 1: - return PatchPixelSampler(*args, **kwargs, patch_size=self.config.patch_size) - # If all images are equirectangular, use equirectangular pixel sampler is_equirectangular = dataset.cameras.camera_type == CameraType.EQUIRECTANGULAR.value if is_equirectangular.all(): @@ -402,9 +391,12 @@ class VanillaDataManager(DataManager): # pylint: disable=abstract-method ) self.iter_eval_image_dataloader = iter(self.eval_image_dataloader) self.eval_pixel_sampler = self._get_pixel_sampler(self.eval_dataset, self.config.eval_num_rays_per_batch) + self.eval_camera_optimizer = self.config.camera_optimizer.setup( + num_cameras=self.eval_dataset.cameras.size, device=self.device + ) self.eval_ray_generator = RayGenerator( self.eval_dataset.cameras.to(self.device), - self.train_camera_optimizer, # should be shared between train and eval. + self.eval_camera_optimizer, ) # for loading full images self.fixed_indices_eval_dataloader = FixedIndicesEvalDataloader(