diff --git a/configs/graph_instant_ngp.yaml b/configs/graph_instant_ngp.yaml index b01a76c60..30e792a50 100644 --- a/configs/graph_instant_ngp.yaml +++ b/configs/graph_instant_ngp.yaml @@ -8,7 +8,7 @@ data: pixel_sampler: num_rays_per_batch: 8192 # for training dataloader_eval: - num_rays_per_chunk: 8192 # for evaluation + num_rays_per_chunk: 1000000000 # all rays for evaluation viewer: enable: true @@ -16,12 +16,11 @@ viewer: graph: _target_: nerfactory.graphs.instant_ngp.NGPGraph - collider_config: - _target_: nerfactory.graphs.modules.scene_colliders.AABBBoxCollider + enable_density_field: true + enable_collider: false field_implementation: tcnn # torch, tcnn, ... loss_coefficients: # loss coefficients rgb_loss: 1.0 - enable_collider: false # optimizer options for network optimizers: diff --git a/nerfactory/graphs/instant_ngp.py b/nerfactory/graphs/instant_ngp.py index 8f3f2056b..12eba5743 100644 --- a/nerfactory/graphs/instant_ngp.py +++ b/nerfactory/graphs/instant_ngp.py @@ -26,7 +26,6 @@ from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity import nerfactory.cuda as nerfactory_cuda from nerfactory.cameras.rays import RayBundle -from nerfactory.fields.density_fields.density_grid import DensityGrid from nerfactory.fields.instant_ngp_field import field_implementation_to_class from nerfactory.fields.modules.field_heads import FieldHeadNames from nerfactory.graphs.base import Graph @@ -48,10 +47,11 @@ class NGPGraph(Graph): def register_callbacks(self) -> None: """defining callbacks to run after every training iteration""" + assert self.density_field is not None self.callbacks = [ Callback( - self.density_grid.update_every_num_iters, - self.density_grid.update_density_grid, + self.density_field.update_every_num_iters, + self.density_field.update_density_grid, density_eval_func=self.field.density_fn, ) ] @@ -62,11 +62,8 @@ class NGPGraph(Graph): self.field = field_implementation_to_class[self.field_implementation](self.scene_bounds.aabb) def populate_misc_modules(self): - # density grid - self.density_grid = DensityGrid(center=0.0, base_scale=3, num_cascades=1) - # samplers - self.sampler = NGPSpacedSampler(num_samples=1024, density_field=self.density_grid) + self.sampler = NGPSpacedSampler(num_samples=1024, density_field=self.density_field) # losses self.rgb_loss = MSELoss()