Package core utils

Signed-off-by: Krishna Murthy <[email protected]>
shitongG · Apr 15, 2020 · deae4a8 · deae4a8
1 parent a1406c9
commit deae4a8
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 20 deletions.
diff --git a/cache_dataset.py b/cache_dataset.py
@@ -10,9 +10,9 @@
 import torch
 from tqdm import tqdm
 
-from load_blender import load_blender_data
-from load_llff import load_llff_data
-from nerf_helpers import get_ray_bundle, meshgrid_xy
+from nerf import load_blender_data
+from nerf import load_llff_data
+from nerf import get_ray_bundle, meshgrid_xy
 
 
 def cache_nerf_dataset(args):

diff --git a/eval_nerf.py b/eval_nerf.py
@@ -9,12 +9,12 @@
 import yaml
 from tqdm import tqdm
 
-import models
-from cfgnode import CfgNode
-from load_blender import load_blender_data
-from load_llff import load_llff_data
-from nerf_helpers import get_ray_bundle, positional_encoding
-from train_utils import run_one_iter_of_nerf
+from nerf import models
+from nerf import CfgNode
+from nerf import load_blender_data
+from nerf import load_llff_data
+from nerf import get_ray_bundle, positional_encoding
+from nerf import run_one_iter_of_nerf
 
 
 def cast_to_image(tensor):

diff --git a/nerf/__init__.py b/nerf/__init__.py
@@ -0,0 +1,8 @@
+from .cfgnode import CfgNode
+from .load_blender import load_blender_data
+from .load_llff import load_llff_data
+from .models import *
+from .nerf_helpers import *
+from .train_utils import *
+from .volume_rendering_utils import *
+
diff --git a/cfgnode.py → nerf/cfgnode.py b/cfgnode.py → nerf/cfgnode.py
diff --git a/load_blender.py → nerf/load_blender.py b/load_blender.py → nerf/load_blender.py
diff --git a/load_llff.py → nerf/load_llff.py b/load_llff.py → nerf/load_llff.py
diff --git a/metrics.py → nerf/metrics.py b/metrics.py → nerf/metrics.py
diff --git a/models.py → nerf/models.py b/models.py → nerf/models.py
diff --git a/nerf_helpers.py → nerf/nerf_helpers.py b/nerf_helpers.py → nerf/nerf_helpers.py
diff --git a/train_utils.py → nerf/train_utils.py b/train_utils.py → nerf/train_utils.py
@@ -1,8 +1,8 @@
 import torch
 
-from nerf_helpers import get_minibatches, ndc_rays
-from nerf_helpers import sample_pdf_2 as sample_pdf
-from volume_rendering_utils import volume_render_radiance_field
+from .nerf_helpers import get_minibatches, ndc_rays
+from .nerf_helpers import sample_pdf_2 as sample_pdf
+from .volume_rendering_utils import volume_render_radiance_field
 
 
 def run_network(network_fn, pts, ray_batch, chunksize, embed_fn, embeddirs_fn):

diff --git a/volume_rendering_utils.py → nerf/volume_rendering_utils.py b/volume_rendering_utils.py → nerf/volume_rendering_utils.py
@@ -1,6 +1,6 @@
 import torch
 
-from nerf_helpers import cumprod_exclusive
+from .nerf_helpers import cumprod_exclusive
 
 
 def volume_render_radiance_field(

diff --git a/tiny_nerf.py b/tiny_nerf.py
@@ -6,7 +6,7 @@
 import torch
 from tqdm import tqdm, trange
 
-from nerf_helpers import (
+from nerf import (
     cumprod_exclusive,
     get_minibatches,
     get_ray_bundle,

diff --git a/train_nerf.py b/train_nerf.py
@@ -10,18 +10,18 @@
 from torch.utils.tensorboard import SummaryWriter
 from tqdm import tqdm, trange
 
-import models
-from cfgnode import CfgNode
-from load_blender import load_blender_data
-from load_llff import load_llff_data
-from nerf_helpers import (
+from nerf import models
+from nerf import CfgNode
+from nerf import load_blender_data
+from nerf import load_llff_data
+from nerf import (
     get_ray_bundle,
     img2mse,
     meshgrid_xy,
     mse2psnr,
     positional_encoding,
 )
-from train_utils import run_one_iter_of_nerf
+from nerf import run_one_iter_of_nerf
 
 
 def main():