From d325593e0229ae741920416ebe1812fc0ac4af50 Mon Sep 17 00:00:00 2001 From: Matthew Tancik Date: Mon, 9 Oct 2023 04:35:08 +0200 Subject: [PATCH] Remove unused config param (#2495) Remove unused config. --- docs/developer_guides/pipelines/datamanagers.md | 2 -- nerfstudio/data/datamanagers/base_datamanager.py | 2 -- nerfstudio/scripts/render.py | 1 - nerfstudio/utils/eval_utils.py | 3 --- tests/data/configs/test_config1.yml | 2 -- tests/data/configs/test_config2.yml | 2 -- 6 files changed, 12 deletions(-) diff --git a/docs/developer_guides/pipelines/datamanagers.md b/docs/developer_guides/pipelines/datamanagers.md index 32c55b63e..78aec242d 100644 --- a/docs/developer_guides/pipelines/datamanagers.md +++ b/docs/developer_guides/pipelines/datamanagers.md @@ -62,8 +62,6 @@ class VanillaDataManagerConfig(InstantiateConfig): """number of rays per batch to use per eval iteration""" eval_num_images_to_sample_from: int = -1 """number of images to sample during eval iteration""" - eval_image_indices: Optional[Tuple[int, ...]] = (0,) - """specifies the image indices to use during eval; if None, uses all""" camera_optimizer: CameraOptimizerConfig = CameraOptimizerConfig() """specifies the camera pose optimizer used during training""" ``` diff --git a/nerfstudio/data/datamanagers/base_datamanager.py b/nerfstudio/data/datamanagers/base_datamanager.py index 52fd0af0f..cb63202df 100644 --- a/nerfstudio/data/datamanagers/base_datamanager.py +++ b/nerfstudio/data/datamanagers/base_datamanager.py @@ -335,8 +335,6 @@ class VanillaDataManagerConfig(DataManagerConfig): eval_num_times_to_repeat_images: int = -1 """When not evaluating on all images, number of iterations before picking new images. If -1, never pick new images.""" - eval_image_indices: Optional[Tuple[int, ...]] = (0,) - """Specifies the image indices to use during eval; if None, uses all.""" camera_optimizer: CameraOptimizerConfig = CameraOptimizerConfig() """Specifies the camera pose optimizer used during training. Helpful if poses are noisy, such as for data from Record3D.""" diff --git a/nerfstudio/scripts/render.py b/nerfstudio/scripts/render.py index 7f6102428..307bb5adb 100644 --- a/nerfstudio/scripts/render.py +++ b/nerfstudio/scripts/render.py @@ -624,7 +624,6 @@ class DatasetRender(BaseRender): def update_config(config: TrainerConfig) -> TrainerConfig: data_manager_config = config.pipeline.datamanager assert isinstance(data_manager_config, VanillaDataManagerConfig) - data_manager_config.eval_image_indices = None data_manager_config.eval_num_images_to_sample_from = -1 data_manager_config.eval_num_times_to_repeat_images = -1 data_manager_config.train_num_images_to_sample_from = -1 diff --git a/nerfstudio/utils/eval_utils.py b/nerfstudio/utils/eval_utils.py index 7e0400536..0b7306791 100644 --- a/nerfstudio/utils/eval_utils.py +++ b/nerfstudio/utils/eval_utils.py @@ -26,7 +26,6 @@ import torch import yaml from nerfstudio.configs.method_configs import all_methods -from nerfstudio.data.datamanagers.base_datamanager import VanillaDataManagerConfig from nerfstudio.engine.trainer import TrainerConfig from nerfstudio.pipelines.base_pipeline import Pipeline from nerfstudio.utils.rich_utils import CONSOLE @@ -100,8 +99,6 @@ def eval_setup( # load checkpoints from wherever they were saved # TODO: expose the ability to choose an arbitrary checkpoint config.load_dir = config.get_checkpoint_dir() - if isinstance(config.pipeline.datamanager, VanillaDataManagerConfig): - config.pipeline.datamanager.eval_image_indices = None # setup pipeline (which includes the DataManager) device = torch.device("cuda" if torch.cuda.is_available() else "cpu") diff --git a/tests/data/configs/test_config1.yml b/tests/data/configs/test_config1.yml index 3cf014760..67ce18cda 100644 --- a/tests/data/configs/test_config1.yml +++ b/tests/data/configs/test_config1.yml @@ -111,8 +111,6 @@ pipeline: !!python/object:nerfstudio.pipelines.base_pipeline.VanillaPipelineConf - data - varun - cheezit-scaled - eval_image_indices: !!python/tuple - - 0 eval_num_images_to_sample_from: -1 eval_num_rays_per_batch: 4096 eval_num_times_to_repeat_images: -1 diff --git a/tests/data/configs/test_config2.yml b/tests/data/configs/test_config2.yml index c1ccda379..90737789f 100644 --- a/tests/data/configs/test_config2.yml +++ b/tests/data/configs/test_config2.yml @@ -105,8 +105,6 @@ pipeline: !!python/object:nerfstudio.pipelines.base_pipeline.VanillaPipelineConf - data - varun - cheezit-scaled - eval_image_indices: !!python/tuple - - 0 eval_num_images_to_sample_from: -1 eval_num_rays_per_batch: 4096 eval_num_times_to_repeat_images: -1