From f090d9a0016aa400b82402801c59af774713e9e4 Mon Sep 17 00:00:00 2001
From: Ethan Weber <eweb0124@gmail.com>
Date: Fri, 22 Apr 2022 03:52:15 +0000
Subject: [PATCH] training loop with tensorboard funs

---
 configs/default.yaml                |  2 +-
 mattport/nerf/graph/vanilla_nerf.py | 10 +++++-----
 mattport/nerf/optimizers.py         |  2 +-
 mattport/utils/misc.py              |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configs/default.yaml b/configs/default.yaml
index 331f6880c..ed779b867 100644
--- a/configs/default.yaml
+++ b/configs/default.yaml
@@ -60,4 +60,4 @@ machine_config:
 # graph options
 graph:
   # NOTE(ethan): currently setting to nothing b/c we're still designing the config format...
-  _target_: mattport.nerf.graph.nerf.NeRFGraph
+  _target_: mattport.nerf.graph.vanilla_nerf.NeRFGraph
diff --git a/mattport/nerf/graph/vanilla_nerf.py b/mattport/nerf/graph/vanilla_nerf.py
index 528294769..c58f6bb2b 100644
--- a/mattport/nerf/graph/vanilla_nerf.py
+++ b/mattport/nerf/graph/vanilla_nerf.py
@@ -11,9 +11,7 @@ from torch.nn import Parameter
 from torchtyping import TensorType
 
 from mattport.nerf.field_modules.encoding import NeRFEncoding
-from mattport.nerf.field_modules.field_heads import (DensityFieldHead,
-                                                     FieldHeadNames,
-                                                     RGBFieldHead)
+from mattport.nerf.field_modules.field_heads import DensityFieldHead, FieldHeadNames, RGBFieldHead
 from mattport.nerf.field_modules.mlp import MLP
 from mattport.nerf.field_modules.ray_generator import RayGenerator
 from mattport.nerf.graph.base import Graph
@@ -60,7 +58,9 @@ class NeRFField(nn.Module):
         field_rgb_output = self.field_output_rgb(rgb_mlp_out)
         field_density_out = self.field_output_density(base_mlp_out)
 
-        field_outputs = field_rgb_output | field_density_out
+        field_outputs = {}
+        field_outputs.update(field_rgb_output)
+        field_outputs.update(field_density_out)
         return field_outputs
 
 
@@ -75,7 +75,7 @@ class NeRFGraph(Graph):
         self.ray_generator = RayGenerator(self.intrinsics, self.camera_to_world)
 
         # samplers
-        self.sampler_uniform = UniformSampler(near_plane=0.1, far_plane=4.0, num_samples=64)
+        self.sampler_uniform = UniformSampler(near_plane=0.1, far_plane=6.0, num_samples=64)
         self.sampler_pdf = PDFSampler(num_samples=64)
 
         # field
diff --git a/mattport/nerf/optimizers.py b/mattport/nerf/optimizers.py
index 0db806fd5..4431e9f51 100644
--- a/mattport/nerf/optimizers.py
+++ b/mattport/nerf/optimizers.py
@@ -63,4 +63,4 @@ class Optimizers:
     def scheduler_step_all(self, step):
         """Run step for all schedulers."""
         # logging.info("optimizer_step_all")
-        pass
\ No newline at end of file
+        pass
diff --git a/mattport/utils/misc.py b/mattport/utils/misc.py
index d6fb5ecfe..7d44ace6e 100644
--- a/mattport/utils/misc.py
+++ b/mattport/utils/misc.py
@@ -7,4 +7,4 @@ class DotDict(dict):
         return self[attr]
 
     __setattr__ = dict.__setitem__
-    __delattr__ = dict.__delitem__
\ No newline at end of file
+    __delattr__ = dict.__delitem__