From bc2ee574dad787948ef63a926b3e940fc1e2db91 Mon Sep 17 00:00:00 2001 From: terrance Date: Thu, 25 May 2023 21:53:33 +0000 Subject: [PATCH] changing datamanager check in trainer, add typing in random cameras datamanager --- nerfstudio/data/datamanagers/base_datamanager.py | 1 - nerfstudio/data/datamanagers/random_cameras_datamanager.py | 5 +---- nerfstudio/engine/trainer.py | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/nerfstudio/data/datamanagers/base_datamanager.py b/nerfstudio/data/datamanagers/base_datamanager.py index 475f111c7..707659d95 100644 --- a/nerfstudio/data/datamanagers/base_datamanager.py +++ b/nerfstudio/data/datamanagers/base_datamanager.py @@ -382,7 +382,6 @@ class VanillaDataManager(DataManager, Generic[TDataset]): self.test_mode = test_mode self.test_split = "test" if test_mode in ["test", "inference"] else "val" self.dataparser_config = self.config.dataparser - self.input_data = True if self.config.data is not None: self.config.dataparser.data = Path(self.config.data) else: diff --git a/nerfstudio/data/datamanagers/random_cameras_datamanager.py b/nerfstudio/data/datamanagers/random_cameras_datamanager.py index ba667b75f..a5868f54c 100644 --- a/nerfstudio/data/datamanagers/random_cameras_datamanager.py +++ b/nerfstudio/data/datamanagers/random_cameras_datamanager.py @@ -71,7 +71,7 @@ def random_train_pose( focal_range: Tuple[float, float] = (0.75, 1.35), jitter_std: float = 0.01, center: Tuple[float, float, float] = (0, 0, 0), -): +) -> Tuple[Cameras, Tensor, Tensor]: """generate random poses from an orbit camera Args: size: batch size of generated poses. @@ -212,14 +212,11 @@ class RandomCamerasDataManager(DataManager): # pylint: disable=abstract-method self.sampler = None self.test_mode = test_mode self.test_split = "test" if test_mode in ["test", "inference"] else "val" - self.input_data = False if self.config.data is not None: CONSOLE.print("[red] --data should not be used with the RandomCamerasDataManager[/red]") sys.exit(1) - print(type(config)) - cameras, _, _ = random_train_pose( self.config.num_eval_angles, self.config.eval_resolution, diff --git a/nerfstudio/engine/trainer.py b/nerfstudio/engine/trainer.py index b19cb6c02..10dd33849 100644 --- a/nerfstudio/engine/trainer.py +++ b/nerfstudio/engine/trainer.py @@ -231,8 +231,7 @@ class Trainer: """Train the model.""" assert self.pipeline.datamanager.train_dataset is not None, "Missing DatsetInputs" - if self.pipeline.datamanager.input_data: - assert isinstance(self.pipeline.datamanager, VanillaDataManager) + if isinstance(self.pipeline.datamanager, VanillaDataManager): self.pipeline.datamanager.train_dataparser_outputs.save_dataparser_transform( self.base_dir / "dataparser_transforms.json" )