mirror of
https://github.com/nerfstudio-project/nerfstudio.git
synced 2026-11-20 14:45:38 +08:00
Default to train dataset when eval isn't specified in config (#265)
default to train dataset when eval isn't in config
This commit is contained in:
1 parent
0b042be956
commit
841e03a9a3
11 files changed
+8
-44
No files matched your search
@@ -55,8 +55,6 @@ pipeline:
|
||||
_target_: nerfactory.dataloaders.datasets.Dataset
|
||||
train_num_rays_per_batch: 1024
|
||||
train_num_images_to_sample_from: -1
|
||||
eval_dataset:
|
||||
_target_: nerfactory.dataloaders.datasets.Dataset
|
||||
eval_image_indices: [0]
|
||||
eval_num_rays_per_chunk: 4096
|
||||
model:
|
||||
|
||||
@@ -16,11 +16,6 @@ pipeline:
|
||||
alpha_color: white
|
||||
downscale_factor: 1
|
||||
train_num_rays_per_batch: 8192
|
||||
eval_dataset:
|
||||
_target_: nerfactory.dataloaders.datasets.Blender
|
||||
data_directory: data/blender/lego
|
||||
alpha_color: white
|
||||
downscale_factor: 1
|
||||
eval_num_rays_per_chunk: 8192
|
||||
model:
|
||||
_target_: nerfactory.models.instant_ngp.NGPModel
|
||||
|
||||
@@ -11,18 +11,11 @@ method_name: mipnerf
|
||||
|
||||
pipeline:
|
||||
dataloader:
|
||||
# Train dataloading.
|
||||
train_dataset:
|
||||
_target_: nerfactory.dataloaders.datasets.Blender
|
||||
data_directory: data/blender/lego
|
||||
alpha_color: white
|
||||
downscale_factor: 1
|
||||
# Eval dataloading
|
||||
eval_dataset:
|
||||
_target_: nerfactory.dataloaders.datasets.Blender
|
||||
data_directory: data/blender/lego
|
||||
alpha_color: white
|
||||
downscale_factor: 1
|
||||
model:
|
||||
_target_: nerfactory.models.mipnerf.MipNerfModel
|
||||
num_coarse_samples: 128
|
||||
|
||||
@@ -7,16 +7,10 @@ method_name: vanilla_nerf
|
||||
|
||||
pipeline:
|
||||
dataloader:
|
||||
# Train dataloading.
|
||||
train_dataset:
|
||||
_target_: nerfactory.dataloaders.datasets.Mipnerf360
|
||||
data_directory: data/mipnerf_360/garden
|
||||
downscale_factor: 1
|
||||
# Eval dataloading
|
||||
eval_dataset:
|
||||
_target_: nerfactory.dataloaders.datasets.Mipnerf360
|
||||
data_directory: data/mipnerf_360/garden
|
||||
downscale_factor: 1
|
||||
model:
|
||||
_target_: nerfactory.models.mipnerf_360.MipNerf360Model
|
||||
num_coarse_samples: 128
|
||||
|
||||
@@ -8,16 +8,10 @@ method_name: nerfw
|
||||
pipeline:
|
||||
dataloader:
|
||||
image_dataset_type: panoptic
|
||||
# Train dataloading.
|
||||
train_dataset:
|
||||
_target_: nerfactory.dataloaders.datasets.Friends
|
||||
data_directory: data/friends/TBBT-big_living_room
|
||||
downscale_factor: 1
|
||||
# Eval dataloading
|
||||
eval_dataset:
|
||||
_target_: nerfactory.dataloaders.datasets.Friends
|
||||
data_directory: data/friends/TBBT-big_living_room
|
||||
downscale_factor: 1
|
||||
model:
|
||||
_target_: nerfactory.models.nerfw.NerfWModel
|
||||
collider_config:
|
||||
|
||||
@@ -8,16 +8,10 @@ method_name: nerfw
|
||||
pipeline:
|
||||
dataloader:
|
||||
image_dataset_type: panoptic
|
||||
# Train dataloading.
|
||||
train_dataset:
|
||||
_target_: nerfactory.dataloaders.datasets.Friends
|
||||
data_directory: data/friends/TBBT-big_living_room
|
||||
downscale_factor: 1
|
||||
# Eval dataloading
|
||||
eval_dataset:
|
||||
_target_: nerfactory.dataloaders.datasets.Friends
|
||||
data_directory: data/friends/TBBT-big_living_room
|
||||
downscale_factor: 1
|
||||
model:
|
||||
_target_: nerfactory.models.semantic_nerf.SemanticNerfModel
|
||||
collider_config:
|
||||
|
||||
@@ -4,15 +4,8 @@ defaults:
|
||||
|
||||
pipeline:
|
||||
dataloader:
|
||||
# Train dataloading.
|
||||
train_dataset:
|
||||
_target_: nerfactory.dataloaders.datasets.Blender
|
||||
data_directory: data/blender/lego
|
||||
alpha_color: white
|
||||
downscale_factor: 1
|
||||
# Eval dataloading
|
||||
eval_dataset:
|
||||
_target_: nerfactory.dataloaders.datasets.Blender
|
||||
data_directory: data/blender/lego
|
||||
alpha_color: white
|
||||
downscale_factor: 1
|
||||
@@ -16,6 +16,7 @@
|
||||
Data loader.
|
||||
"""
|
||||
|
||||
import logging
|
||||
from abc import abstractmethod
|
||||
from typing import Dict, List, Tuple, Union
|
||||
|
||||
@@ -224,7 +225,11 @@ def setup_dataloader(config: DataloaderConfig, device: str, test_mode=False) ->
|
||||
|
||||
dataset_train = instantiate_from_dict_config(config.train_dataset)
|
||||
train_datasetinputs = dataset_train.get_dataset_inputs(split="train")
|
||||
dataset_eval = instantiate_from_dict_config(config.eval_dataset)
|
||||
if config.eval_dataset is not None:
|
||||
dataset_eval = instantiate_from_dict_config(config.eval_dataset)
|
||||
else:
|
||||
logging.info("No eval dataset specified so using train dataset for eval.")
|
||||
dataset_eval = dataset_train
|
||||
eval_datasetinputs = dataset_eval.get_dataset_inputs(split="val" if not test_mode else "test")
|
||||
|
||||
dataloader: Dataloader = instantiate_from_dict_config(
|
||||
|
||||
@@ -101,8 +101,6 @@ class Trainer:
|
||||
with TimeWriter(writer, EventName.TOTAL_TRAIN_TIME):
|
||||
num_iterations = self.config.trainer.max_num_iterations
|
||||
for step in range(self.start_step, self.start_step + num_iterations):
|
||||
# with TimeWriter(writer, EventName.ITER_LOAD_TIME, step=step):
|
||||
# ray_indices, batch = next(iter_dataloader_train)
|
||||
|
||||
with TimeWriter(writer, EventName.ITER_TRAIN_TIME, step=step) as t:
|
||||
loss_metric_dict = self.train_iteration(step)
|
||||
|
||||
@@ -190,7 +190,7 @@ class Model(nn.Module):
|
||||
"""Computes and returns the losses dict."""
|
||||
|
||||
@torch.no_grad()
|
||||
def get_outputs_for_camera_ray_bundle(self, camera_ray_bundle: RayBundle):
|
||||
def get_outputs_for_camera_ray_bundle(self, camera_ray_bundle: RayBundle) -> Dict[str, torch.Tensor]:
|
||||
"""Takes in camera parameters and computes the output of the model."""
|
||||
assert is_not_none(camera_ray_bundle.num_rays_per_chunk)
|
||||
image_height, image_width = camera_ray_bundle.origins.shape[:2]
|
||||
|
||||
@@ -70,7 +70,7 @@ class DataloaderConfig:
|
||||
train_dataset: Dict[str, Any] = MISSING
|
||||
train_num_rays_per_batch: int = MISSING
|
||||
train_num_images_to_sample_from: int = MISSING
|
||||
eval_dataset: Dict[str, Any] = MISSING
|
||||
eval_dataset: Optional[Dict[str, Any]] = None
|
||||
eval_image_indices: List[int] = MISSING
|
||||
eval_num_rays_per_chunk: int = MISSING
|
||||
|
||||
|
||||
Reference in new issue
Block a user