diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml index 40cef0d6b..706576f75 100644 --- a/.github/workflows/code_checks.yml +++ b/.github/workflows/code_checks.yml @@ -25,10 +25,10 @@ jobs: pip install -r environment/requirements.txt pip install -e . - name: Run Black - run: black mattport/ notebooks/ --check + run: black radiance/ notebooks/ --check - name: Python Pylint run: | - pylint mattport tests + pylint radiance tests - name: Test with pytest run: | pytest diff --git a/README.md b/README.md index b871711bc..e12ef89b9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# MattPort +# Radiance # Quickstart @@ -6,14 +6,14 @@ ``` # Clone the repo -git clone --recurse-submodules git@github.com:ethanweber/mattport.git +git clone --recurse-submodules git@github.com:ethanweber/radiance.git # Create the python environment -conda create --name mattport python=3.8.13 -conda activate mattport +conda create --name radiance python=3.8.13 +conda activate radiance pip install -r environment/requirements.txt -# Install mattport as a library +# Install radiance as a library pip install -e . # Install library with CUDA support. Change setup.py to `USE_CUDA = True` and then @@ -69,7 +69,7 @@ bash environments/run_jupyter.sh # Tooling -1. One can use [autoenv](https://github.com/hyperupcall/autoenv) to make setting up the environment and environment variables easier. This will run the `.envrc` file upon entering the `/path/to/mattport` folder. It will also remove the environment parameters upon leaving. +1. One can use [autoenv](https://github.com/hyperupcall/autoenv) to make setting up the environment and environment variables easier. This will run the `.envrc` file upon entering the `/path/to/radiance` folder. It will also remove the environment parameters upon leaving. ``` # Install direnv. @@ -79,7 +79,7 @@ sudo apt install direnv eval "$(direnv hook bash)" # Populate your .envrc with commands you want to run. Then, run the following to allow updates. -cd /path/to/mattport +cd /path/to/radiance direnv allow . ``` @@ -125,12 +125,12 @@ python scripts/benchmarking/run_benchmark.py ``` # nerf-pytorch cd external -python run_nerf.py --config configs/chair.txt --datadir /path/to/mattport/data/blender/chair +python run_nerf.py --config configs/chair.txt --datadir /path/to/radiance/data/blender/chair # jaxnerf cd external conda activate jaxnerf -python -m jaxnerf.train --data_dir=/path/to/mattport/data/blender/chair --train_dir=/path/to/mattport/outputs/blender_chair_jaxnerf --config=/path/to/mattport/external/jaxnerf/configs/demo --render_every 100 +python -m jaxnerf.train --data_dir=/path/to/radiance/data/blender/chair --train_dir=/path/to/radiance/outputs/blender_chair_jaxnerf --config=/path/to/radiance/external/jaxnerf/configs/demo --render_every 100 ``` # Speeding up the code diff --git a/configs/default.yaml b/configs/default.yaml index c71b434d7..96f06284d 100644 --- a/configs/default.yaml +++ b/configs/default.yaml @@ -7,7 +7,7 @@ defaults: - override hydra/hydra_logging: colorlog - _self_ -seed: 0 +seed: 42 hydra: run: diff --git a/configs/graph/default_graph.yaml b/configs/graph/default_graph.yaml index d0010cc7c..1259f0b58 100644 --- a/configs/graph/default_graph.yaml +++ b/configs/graph/default_graph.yaml @@ -1,5 +1,5 @@ # saving model specifications -model_dir: /tmp/mattport_models/ +model_dir: /tmp/radiance_models/ steps_per_save: null steps_per_test: 100 max_num_iterations: 1000000 @@ -10,7 +10,7 @@ resume_train: load_step: # pretrained model's step number network: - _target_: mattport.nerf.graph.vanilla_nerf.NeRFGraph + _target_: radiance.nerf.graph.vanilla_nerf.NeRFGraph near_plane: 2.0 far_plane: 6.0 num_coarse_samples: 64 @@ -27,6 +27,6 @@ param_groups: _target_: torch.optim.RAdam lr: 0.0005 scheduler: - _target_: mattport.nerf.optimizers.ExponentialDecaySchedule + _target_: radiance.nerf.optimizers.ExponentialDecaySchedule lr_final: 0.000005 max_steps: 1000000 diff --git a/configs/graph/instant_ngp_graph.yaml b/configs/graph/instant_ngp_graph.yaml index 5d0a72f14..de509f365 100644 --- a/configs/graph/instant_ngp_graph.yaml +++ b/configs/graph/instant_ngp_graph.yaml @@ -3,7 +3,7 @@ defaults: - _self_ network: - _target_: mattport.nerf.graph.instant_ngp.NGPGraph + _target_: radiance.nerf.graph.instant_ngp.NGPGraph field_implementation: torch # torch, tcnn, ... loss_coefficients: # loss coefficients rgb_loss: 1.0 diff --git a/configs/graph/nerfw_graph.yaml b/configs/graph/nerfw_graph.yaml index 5036f4cf8..9893763b0 100644 --- a/configs/graph/nerfw_graph.yaml +++ b/configs/graph/nerfw_graph.yaml @@ -3,7 +3,7 @@ defaults: - _self_ network: - _target_: mattport.nerf.graph.nerfw.NerfWGraph + _target_: radiance.nerf.graph.nerfw.NerfWGraph loss_coefficients: # loss coefficients rgb_loss_coarse: 1.0 rgb_loss_fine: 1.0 diff --git a/configs/graph/semantic_nerf_graph.yaml b/configs/graph/semantic_nerf_graph.yaml index 74c55b8d2..689f4b15f 100644 --- a/configs/graph/semantic_nerf_graph.yaml +++ b/configs/graph/semantic_nerf_graph.yaml @@ -3,7 +3,7 @@ defaults: - _self_ network: - _target_: mattport.nerf.graph.semantic_nerf.SemanticNerfGraph + _target_: radiance.nerf.graph.semantic_nerf.SemanticNerfGraph loss_coefficients: # loss coefficients rgb_loss_coarse: 1.0 rgb_loss_fine: 1.0 diff --git a/notebooks/visualize_cameras.ipynb b/notebooks/visualize_cameras.ipynb index 3bc223bed..2a0320f51 100644 --- a/notebooks/visualize_cameras.ipynb +++ b/notebooks/visualize_cameras.ipynb @@ -14,7 +14,7 @@ "outputs": [], "source": [ "import torch\n", - "from mattport.structures import cameras\n", + "from radiance.structures import cameras\n", "import plotly.graph_objects as go\n", "import mediapy as media" ] @@ -19597,7 +19597,7 @@ "hash": "024fe9dea615e4e34961116ff517c7e9f5910440e3d2c8eb4560299f11aaf2e7" }, "kernelspec": { - "display_name": "Python 3.9.12 ('mattport')", + "display_name": "Python 3.9.12 ('radiance')", "language": "python", "name": "python3" }, diff --git a/notebooks/visualize_dataset.ipynb b/notebooks/visualize_dataset.ipynb index aa1cae6c2..d664ed738 100644 --- a/notebooks/visualize_dataset.ipynb +++ b/notebooks/visualize_dataset.ipynb @@ -20,15 +20,15 @@ "import torch\n", "from torch.utils.data import DataLoader\n", "\n", - "from mattport.nerf.dataset.image_dataset import ImageDataset, collate_batch\n", - "from mattport.nerf.dataset.collate import CollateIterDataset, collate_batch_size_one\n", - "from mattport.nerf.dataset.utils import get_dataset_inputs\n", - "from mattport.nerf.field_modules.ray_generator import RayGenerator\n", - "from mattport.nerf.field_modules.scene_bounds_collider import SceneBoundsCollider\n", - "from mattport.structures.rays import RayBundle\n", - "from mattport.utils.io import get_absolute_path\n", - "from mattport.viewer.plotly import get_line_segments_from_lines\n", - "from mattport.structures.cameras import get_camera_model\n", + "from radiance.nerf.dataset.image_dataset import ImageDataset, collate_batch\n", + "from radiance.nerf.dataset.collate import CollateIterDataset, collate_batch_size_one\n", + "from radiance.nerf.dataset.utils import get_dataset_inputs\n", + "from radiance.nerf.field_modules.ray_generator import RayGenerator\n", + "from radiance.nerf.field_modules.scene_bounds_collider import SceneBoundsCollider\n", + "from radiance.structures.rays import RayBundle\n", + "from radiance.utils.io import get_absolute_path\n", + "from radiance.viewer.plotly import get_line_segments_from_lines\n", + "from radiance.structures.cameras import get_camera_model\n", "\n", "\n", "from hydra import compose, initialize\n", @@ -361,9 +361,9 @@ "hash": "4a749acc7d255f078aee52e0584cc77b3cb5aaed1b3a7407ec4262c1bf6cb526" }, "kernelspec": { - "display_name": "mattport", + "display_name": "radiance", "language": "python", - "name": "mattport" + "name": "radiance" }, "language_info": { "codemirror_mode": { diff --git a/notebooks/visualize_encoders.ipynb b/notebooks/visualize_encoders.ipynb index 337252f9b..118a41eb2 100644 --- a/notebooks/visualize_encoders.ipynb +++ b/notebooks/visualize_encoders.ipynb @@ -14,7 +14,7 @@ "outputs": [ { "data": { - "application/javascript": "\n setTimeout(function() {\n var nbb_cell_id = 6;\n var nbb_unformatted_code = \"import torch\\nimport mediapy as media\\nfrom mattport.nerf.field_modules import encoding\";\n var nbb_formatted_code = \"import torch\\nimport mediapy as media\\nfrom mattport.nerf.field_modules import encoding\";\n var nbb_cells = Jupyter.notebook.get_cells();\n for (var i = 0; i < nbb_cells.length; ++i) {\n if (nbb_cells[i].input_prompt_number == nbb_cell_id) {\n if (nbb_cells[i].get_text() == nbb_unformatted_code) {\n nbb_cells[i].set_text(nbb_formatted_code);\n }\n break;\n }\n }\n }, 500);\n ", + "application/javascript": "\n setTimeout(function() {\n var nbb_cell_id = 6;\n var nbb_unformatted_code = \"import torch\\nimport mediapy as media\\nfrom radiance.nerf.field_modules import encoding\";\n var nbb_formatted_code = \"import torch\\nimport mediapy as media\\nfrom radiance.nerf.field_modules import encoding\";\n var nbb_cells = Jupyter.notebook.get_cells();\n for (var i = 0; i < nbb_cells.length; ++i) {\n if (nbb_cells[i].input_prompt_number == nbb_cell_id) {\n if (nbb_cells[i].get_text() == nbb_unformatted_code) {\n nbb_cells[i].set_text(nbb_formatted_code);\n }\n break;\n }\n }\n }, 500);\n ", "text/plain": [ "" ] @@ -26,7 +26,7 @@ "source": [ "import torch\n", "import mediapy as media\n", - "from mattport.nerf.field_modules import encoding" + "from radiance.nerf.field_modules import encoding" ] }, { @@ -434,7 +434,7 @@ "hash": "024fe9dea615e4e34961116ff517c7e9f5910440e3d2c8eb4560299f11aaf2e7" }, "kernelspec": { - "display_name": "Python 3.9.11 ('mattport')", + "display_name": "Python 3.9.11 ('radiance')", "language": "python", "name": "python3" }, diff --git a/pyproject.toml b/pyproject.toml index 258f0db85..8afbd775c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ line-length = 120 max-line-length = 120 generated-members = ["numpy.*", "torch.*", "cv2.*", "cv.*"] good-names-rgxs = "^[_a-zA-Z][_a-z0-9]?$" -ignore = ["mattport/cuda", "tests/cuda", "nerfw.py", "semantic_nerf.py"] +ignore = ["radiance/cuda", "tests/cuda", "nerfw.py", "semantic_nerf.py"] disable = [ "too-many-arguments", @@ -23,7 +23,7 @@ disable = [ #pytest [tool.pytest.ini_options] -addopts = "--typeguard-packages=mattport --torchtyping-patch-typeguard --disable-warnings --ignore=tests/cuda" +addopts = "--typeguard-packages=radiance --torchtyping-patch-typeguard --disable-warnings --ignore=tests/cuda" testpaths = [ "tests", ] \ No newline at end of file diff --git a/mattport/cuda/include/helpers.cuh b/radiance/cuda/include/helpers.cuh similarity index 100% rename from mattport/cuda/include/helpers.cuh rename to radiance/cuda/include/helpers.cuh diff --git a/mattport/cuda/mattport_cuda.cpp b/radiance/cuda/mattport_cuda.cpp similarity index 100% rename from mattport/cuda/mattport_cuda.cpp rename to radiance/cuda/mattport_cuda.cpp diff --git a/mattport/cuda/mattport_cuda_kernel.cu b/radiance/cuda/mattport_cuda_kernel.cu similarity index 100% rename from mattport/cuda/mattport_cuda_kernel.cu rename to radiance/cuda/mattport_cuda_kernel.cu diff --git a/mattport/cuda/sampler.py b/radiance/cuda/sampler.py similarity index 89% rename from mattport/cuda/sampler.py rename to radiance/cuda/sampler.py index 7188f8136..635a7d981 100644 --- a/mattport/cuda/sampler.py +++ b/radiance/cuda/sampler.py @@ -7,13 +7,13 @@ import math import torch from torch import nn -import mattport_cuda +import radiance_cuda class LLTMFunction(torch.autograd.Function): @staticmethod def forward(ctx, input, weights, bias, old_h, old_cell): - outputs = mattport_cuda.forward(input, weights, bias, old_h, old_cell) + outputs = radiance_cuda.forward(input, weights, bias, old_h, old_cell) new_h, new_cell = outputs[:2] variables = outputs[1:] + [weights] ctx.save_for_backward(*variables) @@ -22,7 +22,7 @@ class LLTMFunction(torch.autograd.Function): @staticmethod def backward(ctx, grad_h, grad_cell): - outputs = mattport_cuda.backward(grad_h.contiguous(), grad_cell.contiguous(), *ctx.saved_variables) + outputs = radiance_cuda.backward(grad_h.contiguous(), grad_cell.contiguous(), *ctx.saved_variables) d_old_h, d_input, d_weights, d_bias, d_old_cell, d_gates = outputs return d_input, d_weights, d_bias, d_old_h, d_old_cell diff --git a/mattport/nerf/__init__.py b/radiance/nerf/__init__.py similarity index 100% rename from mattport/nerf/__init__.py rename to radiance/nerf/__init__.py diff --git a/mattport/nerf/colliders.py b/radiance/nerf/colliders.py similarity index 96% rename from mattport/nerf/colliders.py rename to radiance/nerf/colliders.py index 538ec8e44..57a192774 100644 --- a/mattport/nerf/colliders.py +++ b/radiance/nerf/colliders.py @@ -4,8 +4,8 @@ Ray generator. import torch from torch import nn from torchtyping import TensorType -from mattport.nerf.dataset.structs import SceneBounds -from mattport.structures.rays import RayBundle +from radiance.nerf.dataset.structs import SceneBounds +from radiance.structures.rays import RayBundle class SceneBoundsCollider(nn.Module): diff --git a/mattport/nerf/dataset/__init__.py b/radiance/nerf/dataset/__init__.py similarity index 100% rename from mattport/nerf/dataset/__init__.py rename to radiance/nerf/dataset/__init__.py diff --git a/mattport/nerf/dataset/collate.py b/radiance/nerf/dataset/collate.py similarity index 100% rename from mattport/nerf/dataset/collate.py rename to radiance/nerf/dataset/collate.py diff --git a/mattport/nerf/dataset/colmap_utils.py b/radiance/nerf/dataset/colmap_utils.py similarity index 100% rename from mattport/nerf/dataset/colmap_utils.py rename to radiance/nerf/dataset/colmap_utils.py diff --git a/mattport/nerf/dataset/format/__init__.py b/radiance/nerf/dataset/format/__init__.py similarity index 100% rename from mattport/nerf/dataset/format/__init__.py rename to radiance/nerf/dataset/format/__init__.py diff --git a/mattport/nerf/dataset/format/blender.py b/radiance/nerf/dataset/format/blender.py similarity index 95% rename from mattport/nerf/dataset/format/blender.py rename to radiance/nerf/dataset/format/blender.py index 2ffa1e20a..deea8901e 100644 --- a/mattport/nerf/dataset/format/blender.py +++ b/radiance/nerf/dataset/format/blender.py @@ -10,8 +10,8 @@ import numpy as np import torch from torchtyping import TensorType -from mattport.nerf.dataset.structs import DatasetInputs, SceneBounds -from mattport.utils.io import load_from_json +from radiance.nerf.dataset.structs import DatasetInputs, SceneBounds +from radiance.utils.io import load_from_json def load_blender_data( diff --git a/mattport/nerf/dataset/format/friends.py b/radiance/nerf/dataset/format/friends.py similarity index 96% rename from mattport/nerf/dataset/format/friends.py rename to radiance/nerf/dataset/format/friends.py index f8c52de67..26ca641d1 100644 --- a/mattport/nerf/dataset/format/friends.py +++ b/radiance/nerf/dataset/format/friends.py @@ -7,10 +7,10 @@ import numpy as np import torch -from mattport.nerf.dataset.colmap_utils import read_cameras_binary, read_images_binary, read_pointsTD_binary -from mattport.nerf.dataset.structs import DatasetInputs, PointCloud, SceneBounds, Semantics -from mattport.utils import profiler -from mattport.utils.io import load_from_json +from radiance.nerf.dataset.colmap_utils import read_cameras_binary, read_images_binary, read_pointsTD_binary +from radiance.nerf.dataset.structs import DatasetInputs, PointCloud, SceneBounds, Semantics +from radiance.utils import profiler +from radiance.utils.io import load_from_json def get_aabb_and_transform(basedir): diff --git a/mattport/nerf/dataset/format/instant_ngp.py b/radiance/nerf/dataset/format/instant_ngp.py similarity index 96% rename from mattport/nerf/dataset/format/instant_ngp.py rename to radiance/nerf/dataset/format/instant_ngp.py index a00126956..43f3378ef 100644 --- a/mattport/nerf/dataset/format/instant_ngp.py +++ b/radiance/nerf/dataset/format/instant_ngp.py @@ -10,8 +10,8 @@ import imageio import numpy as np import torch -from mattport.nerf.dataset.structs import DatasetInputs, SceneBounds -from mattport.utils.io import load_from_json +from radiance.nerf.dataset.structs import DatasetInputs, SceneBounds +from radiance.utils.io import load_from_json def load_instant_ngp_data( diff --git a/mattport/nerf/dataset/format/llff.py b/radiance/nerf/dataset/format/llff.py similarity index 100% rename from mattport/nerf/dataset/format/llff.py rename to radiance/nerf/dataset/format/llff.py diff --git a/mattport/nerf/dataset/image_dataset.py b/radiance/nerf/dataset/image_dataset.py similarity index 99% rename from mattport/nerf/dataset/image_dataset.py rename to radiance/nerf/dataset/image_dataset.py index d0c19e2af..f37d9ead3 100644 --- a/mattport/nerf/dataset/image_dataset.py +++ b/radiance/nerf/dataset/image_dataset.py @@ -12,7 +12,7 @@ from PIL import Image from torch.utils.data import default_collate from torchtyping import TensorType -from mattport.nerf.dataset.structs import Semantics +from radiance.nerf.dataset.structs import Semantics def collate_batch(batch_list, num_rays_per_batch, keep_full_image: bool = False): diff --git a/mattport/nerf/dataset/structs.py b/radiance/nerf/dataset/structs.py similarity index 100% rename from mattport/nerf/dataset/structs.py rename to radiance/nerf/dataset/structs.py diff --git a/mattport/nerf/dataset/utils.py b/radiance/nerf/dataset/utils.py similarity index 86% rename from mattport/nerf/dataset/utils.py rename to radiance/nerf/dataset/utils.py index e2aef9989..8fead05e6 100644 --- a/mattport/nerf/dataset/utils.py +++ b/radiance/nerf/dataset/utils.py @@ -6,12 +6,12 @@ from typing import Optional, Union from omegaconf import ListConfig -from mattport.nerf.dataset.format.blender import load_blender_data -from mattport.nerf.dataset.format.friends import load_friends_data -from mattport.nerf.dataset.format.instant_ngp import load_instant_ngp_data -from mattport.nerf.dataset.structs import DatasetInputs -from mattport.structures.colors import get_color -from mattport.utils.io import get_absolute_path +from radiance.nerf.dataset.format.blender import load_blender_data +from radiance.nerf.dataset.format.friends import load_friends_data +from radiance.nerf.dataset.format.instant_ngp import load_instant_ngp_data +from radiance.nerf.dataset.structs import DatasetInputs +from radiance.structures.colors import get_color +from radiance.utils.io import get_absolute_path def get_dataset_inputs( diff --git a/mattport/nerf/field_modules/__init__.py b/radiance/nerf/field_modules/__init__.py similarity index 100% rename from mattport/nerf/field_modules/__init__.py rename to radiance/nerf/field_modules/__init__.py diff --git a/mattport/nerf/field_modules/base.py b/radiance/nerf/field_modules/base.py similarity index 100% rename from mattport/nerf/field_modules/base.py rename to radiance/nerf/field_modules/base.py diff --git a/mattport/nerf/field_modules/embedding.py b/radiance/nerf/field_modules/embedding.py similarity index 93% rename from mattport/nerf/field_modules/embedding.py rename to radiance/nerf/field_modules/embedding.py index 9a7770451..f6140f40c 100644 --- a/mattport/nerf/field_modules/embedding.py +++ b/radiance/nerf/field_modules/embedding.py @@ -5,7 +5,7 @@ Code for embeddings. import torch from torchtyping import TensorType -from mattport.nerf.field_modules.base import FieldModule +from radiance.nerf.field_modules.base import FieldModule class Embedding(FieldModule): diff --git a/mattport/nerf/field_modules/encoding.py b/radiance/nerf/field_modules/encoding.py similarity index 99% rename from mattport/nerf/field_modules/encoding.py rename to radiance/nerf/field_modules/encoding.py index 0155fce94..91e88fe79 100644 --- a/mattport/nerf/field_modules/encoding.py +++ b/radiance/nerf/field_modules/encoding.py @@ -9,8 +9,8 @@ import torch.nn.functional as F from torch import nn from torchtyping import TensorType -from mattport.nerf.field_modules.base import FieldModule -from mattport.utils.math import components_from_spherical_harmonics +from radiance.nerf.field_modules.base import FieldModule +from radiance.utils.math import components_from_spherical_harmonics class Encoding(FieldModule): diff --git a/mattport/nerf/field_modules/field_heads.py b/radiance/nerf/field_modules/field_heads.py similarity index 98% rename from mattport/nerf/field_modules/field_heads.py rename to radiance/nerf/field_modules/field_heads.py index 4d0a0e61a..e974e8f5e 100644 --- a/mattport/nerf/field_modules/field_heads.py +++ b/radiance/nerf/field_modules/field_heads.py @@ -7,7 +7,7 @@ from typing import Optional from torch import nn from torchtyping import TensorType -from mattport.nerf.field_modules.base import FieldModule +from radiance.nerf.field_modules.base import FieldModule class FieldHeadNames(Enum): diff --git a/mattport/nerf/field_modules/field_losses.py b/radiance/nerf/field_modules/field_losses.py similarity index 100% rename from mattport/nerf/field_modules/field_losses.py rename to radiance/nerf/field_modules/field_losses.py diff --git a/mattport/nerf/field_modules/mlp.py b/radiance/nerf/field_modules/mlp.py similarity index 98% rename from mattport/nerf/field_modules/mlp.py rename to radiance/nerf/field_modules/mlp.py index 532184db3..16c9f9350 100644 --- a/mattport/nerf/field_modules/mlp.py +++ b/radiance/nerf/field_modules/mlp.py @@ -7,7 +7,7 @@ import torch from torch import nn from torchtyping import TensorType -from mattport.nerf.field_modules.base import FieldModule +from radiance.nerf.field_modules.base import FieldModule class MLP(FieldModule): diff --git a/mattport/nerf/fields/__init__.py b/radiance/nerf/fields/__init__.py similarity index 100% rename from mattport/nerf/fields/__init__.py rename to radiance/nerf/fields/__init__.py diff --git a/mattport/nerf/fields/base.py b/radiance/nerf/fields/base.py similarity index 95% rename from mattport/nerf/fields/base.py rename to radiance/nerf/fields/base.py index 23bcf6656..1aa1a0221 100644 --- a/mattport/nerf/fields/base.py +++ b/radiance/nerf/fields/base.py @@ -8,10 +8,10 @@ from typing import Dict, Optional, Tuple from torch import nn import torch from torchtyping import TensorType -from mattport.nerf.field_modules.field_heads import FieldHeadNames +from radiance.nerf.field_modules.field_heads import FieldHeadNames -from mattport.structures.rays import PointSamples -from mattport.utils.misc import is_not_none +from radiance.structures.rays import PointSamples +from radiance.utils.misc import is_not_none class Field(nn.Module): diff --git a/mattport/nerf/fields/instant_ngp_field.py b/radiance/nerf/fields/instant_ngp_field.py similarity index 93% rename from mattport/nerf/fields/instant_ngp_field.py rename to radiance/nerf/fields/instant_ngp_field.py index d50c13ea9..85d162780 100644 --- a/mattport/nerf/fields/instant_ngp_field.py +++ b/radiance/nerf/fields/instant_ngp_field.py @@ -9,12 +9,12 @@ import torch import torch.nn.functional as F from torch.nn.parameter import Parameter -from mattport.nerf.field_modules.encoding import Encoding, HashEncoding, SHEncoding -from mattport.nerf.field_modules.field_heads import FieldHeadNames -from mattport.nerf.fields.base import Field -from mattport.nerf.fields.nerf_field import NeRFField -from mattport.structures.rays import PointSamples -from mattport.utils.misc import is_not_none +from radiance.nerf.field_modules.encoding import Encoding, HashEncoding, SHEncoding +from radiance.nerf.field_modules.field_heads import FieldHeadNames +from radiance.nerf.fields.base import Field +from radiance.nerf.fields.nerf_field import NeRFField +from radiance.structures.rays import PointSamples +from radiance.utils.misc import is_not_none try: import tinycudann as tcnn diff --git a/mattport/nerf/fields/nerf_field.py b/radiance/nerf/fields/nerf_field.py similarity index 92% rename from mattport/nerf/fields/nerf_field.py rename to radiance/nerf/fields/nerf_field.py index 507e544ff..6325025fe 100644 --- a/mattport/nerf/fields/nerf_field.py +++ b/radiance/nerf/fields/nerf_field.py @@ -7,11 +7,11 @@ import torch from torch import nn from torchtyping import TensorType -from mattport.nerf.field_modules.encoding import Encoding, Identity -from mattport.nerf.field_modules.field_heads import DensityFieldHead, FieldHead, FieldHeadNames, RGBFieldHead -from mattport.nerf.field_modules.mlp import MLP -from mattport.nerf.fields.base import Field -from mattport.structures.rays import PointSamples +from radiance.nerf.field_modules.encoding import Encoding, Identity +from radiance.nerf.field_modules.field_heads import DensityFieldHead, FieldHead, FieldHeadNames, RGBFieldHead +from radiance.nerf.field_modules.mlp import MLP +from radiance.nerf.fields.base import Field +from radiance.structures.rays import PointSamples class NeRFField(Field): diff --git a/mattport/nerf/graph/base.py b/radiance/nerf/graph/base.py similarity index 94% rename from mattport/nerf/graph/base.py rename to radiance/nerf/graph/base.py index 72dfe9b20..c91735029 100644 --- a/mattport/nerf/graph/base.py +++ b/radiance/nerf/graph/base.py @@ -11,13 +11,13 @@ from torch import nn from torch.nn import Parameter from torchtyping import TensorType -from mattport.nerf.dataset.structs import SceneBounds -from mattport.nerf.ray_generator import RayGenerator -from mattport.nerf.colliders import AABBBoxCollider -from mattport.structures.cameras import get_camera_model -from mattport.structures.rays import RayBundle -from mattport.utils.misc import get_masked_dict -from mattport.utils.misc import is_not_none +from radiance.nerf.dataset.structs import SceneBounds +from radiance.nerf.ray_generator import RayGenerator +from radiance.nerf.colliders import AABBBoxCollider +from radiance.structures.cameras import get_camera_model +from radiance.structures.rays import RayBundle +from radiance.utils.misc import get_masked_dict +from radiance.utils.misc import is_not_none class AbstractGraph(nn.Module): diff --git a/mattport/nerf/graph/instant_ngp.py b/radiance/nerf/graph/instant_ngp.py similarity index 91% rename from mattport/nerf/graph/instant_ngp.py rename to radiance/nerf/graph/instant_ngp.py index ad67c9823..983c616c6 100644 --- a/mattport/nerf/graph/instant_ngp.py +++ b/radiance/nerf/graph/instant_ngp.py @@ -9,17 +9,17 @@ from torch.nn import Parameter from torchmetrics import PeakSignalNoiseRatio, StructuralSimilarityIndexMeasure from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity -from mattport.nerf.colliders import AABBBoxCollider -from mattport.nerf.field_modules.field_heads import FieldHeadNames -from mattport.nerf.fields.instant_ngp_field import field_implementation_to_class -from mattport.nerf.graph.base import Graph -from mattport.nerf.loss import MSELoss -from mattport.nerf.occupancy_grid import OccupancyGrid -from mattport.nerf.renderers import AccumulationRenderer, DepthRenderer, RGBRenderer -from mattport.nerf.sampler import PDFSampler, UniformSampler -from mattport.structures import colors -from mattport.structures.rays import RayBundle -from mattport.utils import visualization, writer +from radiance.nerf.colliders import AABBBoxCollider +from radiance.nerf.field_modules.field_heads import FieldHeadNames +from radiance.nerf.fields.instant_ngp_field import field_implementation_to_class +from radiance.nerf.graph.base import Graph +from radiance.nerf.loss import MSELoss +from radiance.nerf.occupancy_grid import OccupancyGrid +from radiance.nerf.renderers import AccumulationRenderer, DepthRenderer, RGBRenderer +from radiance.nerf.sampler import PDFSampler, UniformSampler +from radiance.structures import colors +from radiance.structures.rays import RayBundle +from radiance.utils import visualization, writer class NGPGraph(Graph): diff --git a/mattport/nerf/graph/nerfw.py b/radiance/nerf/graph/nerfw.py similarity index 95% rename from mattport/nerf/graph/nerfw.py rename to radiance/nerf/graph/nerfw.py index b325df13a..67c603e10 100644 --- a/mattport/nerf/graph/nerfw.py +++ b/radiance/nerf/graph/nerfw.py @@ -8,18 +8,18 @@ from typing import Tuple import torch from torch import nn -from mattport.nerf.field_modules.embedding import Embedding -from mattport.nerf.field_modules.field_heads import ( +from radiance.nerf.field_modules.embedding import Embedding +from radiance.nerf.field_modules.field_heads import ( FieldHeadNames, TransientDensityHead, TransientRGBHead, UncertaintyFieldHead, ) -from mattport.nerf.field_modules.mlp import MLP -from mattport.nerf.graph.vanilla_nerf import NeRFField, NeRFGraph -from mattport.nerf.renderers import UncertaintyRenderer -from mattport.structures.rays import RayBundle, RaySamples -from mattport.utils import visualization, writer +from radiance.nerf.field_modules.mlp import MLP +from radiance.nerf.graph.vanilla_nerf import NeRFField, NeRFGraph +from radiance.nerf.renderers import UncertaintyRenderer +from radiance.structures.rays import RayBundle, RaySamples +from radiance.utils import visualization, writer class NerfWField(Field): diff --git a/mattport/nerf/graph/semantic_nerf.py b/radiance/nerf/graph/semantic_nerf.py similarity index 95% rename from mattport/nerf/graph/semantic_nerf.py rename to radiance/nerf/graph/semantic_nerf.py index 494ec6d1d..46b326ce6 100644 --- a/mattport/nerf/graph/semantic_nerf.py +++ b/radiance/nerf/graph/semantic_nerf.py @@ -7,12 +7,12 @@ from typing import Tuple import torch from torch import nn -from mattport.nerf.field_modules.field_heads import FieldHeadNames, SemanticStuffHead -from mattport.nerf.field_modules.mlp import MLP -from mattport.nerf.graph.vanilla_nerf import NeRFField, NeRFGraph -from mattport.nerf.renderers import SemanticRenderer -from mattport.structures.rays import RayBundle, RaySamples -from mattport.utils import visualization, writer +from radiance.nerf.field_modules.field_heads import FieldHeadNames, SemanticStuffHead +from radiance.nerf.field_modules.mlp import MLP +from radiance.nerf.graph.vanilla_nerf import NeRFField, NeRFGraph +from radiance.nerf.renderers import SemanticRenderer +from radiance.structures.rays import RayBundle, RaySamples +from radiance.utils import visualization, writer class SemanticNerfField(NeRFField): diff --git a/mattport/nerf/graph/tensorf.py b/radiance/nerf/graph/tensorf.py similarity index 100% rename from mattport/nerf/graph/tensorf.py rename to radiance/nerf/graph/tensorf.py diff --git a/mattport/nerf/graph/vanilla_nerf.py b/radiance/nerf/graph/vanilla_nerf.py similarity index 92% rename from mattport/nerf/graph/vanilla_nerf.py rename to radiance/nerf/graph/vanilla_nerf.py index 860603b0f..c7e5ba6eb 100644 --- a/mattport/nerf/graph/vanilla_nerf.py +++ b/radiance/nerf/graph/vanilla_nerf.py @@ -9,18 +9,18 @@ import torch from torch.nn import Parameter from torchmetrics import PeakSignalNoiseRatio, StructuralSimilarityIndexMeasure from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity -from mattport.nerf.field_modules.encoding import NeRFEncoding -from mattport.nerf.field_modules.field_heads import FieldHeadNames +from radiance.nerf.field_modules.encoding import NeRFEncoding +from radiance.nerf.field_modules.field_heads import FieldHeadNames -from mattport.nerf.fields.nerf_field import NeRFField -from mattport.nerf.graph.base import Graph -from mattport.nerf.loss import MSELoss -from mattport.nerf.renderers import AccumulationRenderer, DepthRenderer, RGBRenderer -from mattport.nerf.sampler import PDFSampler, UniformSampler -from mattport.structures import colors -from mattport.structures.rays import RayBundle -from mattport.nerf.colliders import NearFarCollider -from mattport.utils import visualization, writer +from radiance.nerf.fields.nerf_field import NeRFField +from radiance.nerf.graph.base import Graph +from radiance.nerf.loss import MSELoss +from radiance.nerf.renderers import AccumulationRenderer, DepthRenderer, RGBRenderer +from radiance.nerf.sampler import PDFSampler, UniformSampler +from radiance.structures import colors +from radiance.structures.rays import RayBundle +from radiance.nerf.colliders import NearFarCollider +from radiance.utils import visualization, writer class NeRFGraph(Graph): diff --git a/mattport/nerf/loss.py b/radiance/nerf/loss.py similarity index 100% rename from mattport/nerf/loss.py rename to radiance/nerf/loss.py diff --git a/mattport/nerf/occupancy_grid.py b/radiance/nerf/occupancy_grid.py similarity index 99% rename from mattport/nerf/occupancy_grid.py rename to radiance/nerf/occupancy_grid.py index 9b72a29d7..87ed5920a 100644 --- a/mattport/nerf/occupancy_grid.py +++ b/radiance/nerf/occupancy_grid.py @@ -7,7 +7,7 @@ import torch.nn.functional as F from torch import nn from torchtyping import TensorType -from mattport.utils.misc import is_not_none +from radiance.utils.misc import is_not_none class OccupancyGrid(nn.Module): diff --git a/mattport/nerf/optimizers.py b/radiance/nerf/optimizers.py similarity index 99% rename from mattport/nerf/optimizers.py rename to radiance/nerf/optimizers.py index 539db4675..4606f0bd8 100644 --- a/mattport/nerf/optimizers.py +++ b/radiance/nerf/optimizers.py @@ -10,7 +10,7 @@ from omegaconf import DictConfig from torch.nn import Parameter from torch.optim.lr_scheduler import LambdaLR -from mattport.utils import writer +from radiance.utils import writer class ExponentialDecaySchedule(LambdaLR): diff --git a/mattport/nerf/ray_generator.py b/radiance/nerf/ray_generator.py similarity index 95% rename from mattport/nerf/ray_generator.py rename to radiance/nerf/ray_generator.py index fe4d97098..eb10f6f7c 100644 --- a/mattport/nerf/ray_generator.py +++ b/radiance/nerf/ray_generator.py @@ -3,8 +3,8 @@ Ray generator. """ from torch import nn from torchtyping import TensorType -from mattport.structures.rays import RayBundle -from mattport.structures.cameras import get_camera_model +from radiance.structures.rays import RayBundle +from radiance.structures.cameras import get_camera_model class RayGenerator(nn.Module): diff --git a/mattport/nerf/renderers.py b/radiance/nerf/renderers.py similarity index 99% rename from mattport/nerf/renderers.py rename to radiance/nerf/renderers.py index 1ab8ec2e9..ce6933e64 100644 --- a/mattport/nerf/renderers.py +++ b/radiance/nerf/renderers.py @@ -8,7 +8,7 @@ import torch from torch import nn from torchtyping import TensorType -from mattport.utils.math import components_from_spherical_harmonics +from radiance.utils.math import components_from_spherical_harmonics class RGBRenderer(nn.Module): diff --git a/mattport/nerf/sampler.py b/radiance/nerf/sampler.py similarity index 98% rename from mattport/nerf/sampler.py rename to radiance/nerf/sampler.py index d517f7d12..4f77f305f 100644 --- a/mattport/nerf/sampler.py +++ b/radiance/nerf/sampler.py @@ -9,8 +9,8 @@ import torch from torch import nn from torchtyping import TensorType -from mattport.nerf.occupancy_grid import OccupancyGrid -from mattport.structures.rays import RayBundle, RaySamples +from radiance.nerf.occupancy_grid import OccupancyGrid +from radiance.structures.rays import RayBundle, RaySamples class Sampler(nn.Module): diff --git a/mattport/nerf/trainer.py b/radiance/nerf/trainer.py similarity index 96% rename from mattport/nerf/trainer.py rename to radiance/nerf/trainer.py index b820bf9dd..e2f625203 100644 --- a/mattport/nerf/trainer.py +++ b/radiance/nerf/trainer.py @@ -14,14 +14,14 @@ from omegaconf import DictConfig from torch.nn.parallel import DistributedDataParallel as DDP from torch.utils.data import DataLoader -from mattport.nerf.dataset.collate import CollateIterDataset, collate_batch_size_one -from mattport.nerf.dataset.image_dataset import ImageDataset, collate_batch -from mattport.nerf.dataset.utils import DatasetInputs, get_dataset_inputs -from mattport.nerf.optimizers import Optimizers -from mattport.utils import profiler, writer -from mattport.utils.callbacks import update_occupancy -from mattport.utils.decorators import check_main_thread -from mattport.utils.misc import get_dict_to_torch +from radiance.nerf.dataset.collate import CollateIterDataset, collate_batch_size_one +from radiance.nerf.dataset.image_dataset import ImageDataset, collate_batch +from radiance.nerf.dataset.utils import DatasetInputs, get_dataset_inputs +from radiance.nerf.optimizers import Optimizers +from radiance.utils import profiler, writer +from radiance.utils.callbacks import update_occupancy +from radiance.utils.decorators import check_main_thread +from radiance.utils.misc import get_dict_to_torch logging.getLogger("PIL").setLevel(logging.WARNING) diff --git a/mattport/sfm/__init__.py b/radiance/sfm/__init__.py similarity index 100% rename from mattport/sfm/__init__.py rename to radiance/sfm/__init__.py diff --git a/mattport/structures/__init__.py b/radiance/structures/__init__.py similarity index 100% rename from mattport/structures/__init__.py rename to radiance/structures/__init__.py diff --git a/mattport/structures/cameras.py b/radiance/structures/cameras.py similarity index 99% rename from mattport/structures/cameras.py rename to radiance/structures/cameras.py index 7d8c43975..5c2cfbd30 100644 --- a/mattport/structures/cameras.py +++ b/radiance/structures/cameras.py @@ -9,7 +9,7 @@ import torch from torch.nn.functional import normalize from torchtyping import TensorType -from mattport.structures.rays import RayBundle +from radiance.structures.rays import RayBundle @dataclass diff --git a/mattport/structures/colors.py b/radiance/structures/colors.py similarity index 100% rename from mattport/structures/colors.py rename to radiance/structures/colors.py diff --git a/mattport/structures/rays.py b/radiance/structures/rays.py similarity index 99% rename from mattport/structures/rays.py rename to radiance/structures/rays.py index 62baba364..55b9875f8 100644 --- a/mattport/structures/rays.py +++ b/radiance/structures/rays.py @@ -8,7 +8,7 @@ from typing import Optional import torch from torchtyping import TensorType -from mattport.utils.misc import is_not_none +from radiance.utils.misc import is_not_none @dataclass diff --git a/mattport/utils/__init__.py b/radiance/utils/__init__.py similarity index 100% rename from mattport/utils/__init__.py rename to radiance/utils/__init__.py diff --git a/mattport/utils/callbacks.py b/radiance/utils/callbacks.py similarity index 87% rename from mattport/utils/callbacks.py rename to radiance/utils/callbacks.py index 9fe05019a..8ce22cac0 100644 --- a/mattport/utils/callbacks.py +++ b/radiance/utils/callbacks.py @@ -2,8 +2,8 @@ Callback functions for training iterations """ -from mattport.nerf.graph.base import Graph -from mattport.nerf.occupancy_grid import OccupancyGrid +from radiance.nerf.graph.base import Graph +from radiance.nerf.occupancy_grid import OccupancyGrid def update_occupancy(graph: Graph): diff --git a/mattport/utils/comms.py b/radiance/utils/comms.py similarity index 100% rename from mattport/utils/comms.py rename to radiance/utils/comms.py diff --git a/mattport/utils/decorators.py b/radiance/utils/decorators.py similarity index 96% rename from mattport/utils/decorators.py rename to radiance/utils/decorators.py index 9d99c68f9..ca8be04a7 100644 --- a/mattport/utils/decorators.py +++ b/radiance/utils/decorators.py @@ -3,7 +3,7 @@ Decorator definitions """ from typing import Callable, List -from mattport.utils import comms +from radiance.utils import comms def decorate_all(decorators: List[Callable]) -> Callable: diff --git a/mattport/utils/io.py b/radiance/utils/io.py similarity index 100% rename from mattport/utils/io.py rename to radiance/utils/io.py diff --git a/mattport/utils/math.py b/radiance/utils/math.py similarity index 100% rename from mattport/utils/math.py rename to radiance/utils/math.py diff --git a/mattport/utils/misc.py b/radiance/utils/misc.py similarity index 100% rename from mattport/utils/misc.py rename to radiance/utils/misc.py diff --git a/mattport/utils/profiler.py b/radiance/utils/profiler.py similarity index 95% rename from mattport/utils/profiler.py rename to radiance/utils/profiler.py index a2b4987dd..68dc2d29a 100644 --- a/mattport/utils/profiler.py +++ b/radiance/utils/profiler.py @@ -7,8 +7,8 @@ from typing import Callable from omegaconf import DictConfig -from mattport.utils import comms -from mattport.utils.decorators import check_main_thread, check_profiler_enabled, decorate_all +from radiance.utils import comms +from radiance.utils.decorators import check_main_thread, check_profiler_enabled, decorate_all PROFILER = [] diff --git a/mattport/utils/visualization.py b/radiance/utils/visualization.py similarity index 100% rename from mattport/utils/visualization.py rename to radiance/utils/visualization.py diff --git a/mattport/utils/writer.py b/radiance/utils/writer.py similarity index 98% rename from mattport/utils/writer.py rename to radiance/utils/writer.py index 502df3c7f..daf094534 100644 --- a/mattport/utils/writer.py +++ b/radiance/utils/writer.py @@ -15,8 +15,8 @@ from omegaconf import DictConfig, ListConfig from torch.utils.tensorboard import SummaryWriter from torchtyping import TensorType -import mattport.utils.writer -from mattport.utils.decorators import check_main_thread, decorate_all +import radiance.utils.writer +from radiance.utils.decorators import check_main_thread, decorate_all to8b = lambda x: (255 * torch.clamp(x, min=0, max=1)).to(torch.uint8) EVENT_WRITERS = [] @@ -150,7 +150,7 @@ def setup_event_writers(config: DictConfig) -> None: """Initialization of all event writers specified in config""" logging_configs = config.logging.writer for writer_type in logging_configs: - writer_class = getattr(mattport.utils.writer, writer_type) + writer_class = getattr(radiance.utils.writer, writer_type) writer_config = logging_configs[writer_type] if writer_type == "LocalWriter": curr_writer = writer_class(writer_config.save_dir, writer_config.stats_to_track, writer_config.max_log_size) diff --git a/mattport/viewer/README.md b/radiance/viewer/README.md similarity index 100% rename from mattport/viewer/README.md rename to radiance/viewer/README.md diff --git a/mattport/viewer/__init__.py b/radiance/viewer/__init__.py similarity index 100% rename from mattport/viewer/__init__.py rename to radiance/viewer/__init__.py diff --git a/mattport/viewer/plotly.py b/radiance/viewer/plotly.py similarity index 98% rename from mattport/viewer/plotly.py rename to radiance/viewer/plotly.py index 0f6ed1cc1..0964a5489 100644 --- a/mattport/viewer/plotly.py +++ b/radiance/viewer/plotly.py @@ -6,7 +6,7 @@ import numpy as np import plotly.graph_objects as go import torch -from mattport.structures.rays import RayBundle +from radiance.structures.rays import RayBundle def color_str(color): diff --git a/scripts/benchmarking/launch_train_blender.sh b/scripts/benchmarking/launch_train_blender.sh index e5b679539..38bba313b 100755 --- a/scripts/benchmarking/launch_train_blender.sh +++ b/scripts/benchmarking/launch_train_blender.sh @@ -43,7 +43,7 @@ for dataset in ${DATASETS[@]}; do data.dataset.data_directory=data/blender/${dataset} \ data.dataset.downscale_factor=1 \ experiment_name=blender_${dataset}_${tag} \ - graph.model_dir=mattport_models/ \ + graph.model_dir=radiance_models/ \ graph.steps_per_save=25000 \ graph.max_num_iterations=2000000 \ logging.enable_profiler=False & diff --git a/scripts/benchmarking/run_benchmark.py b/scripts/benchmarking/run_benchmark.py index 2d26e77ec..ca3dcda0f 100644 --- a/scripts/benchmarking/run_benchmark.py +++ b/scripts/benchmarking/run_benchmark.py @@ -12,7 +12,7 @@ from hydra.core.global_hydra import GlobalHydra from omegaconf import DictConfig from tqdm import tqdm -from mattport.nerf.trainer import Trainer +from radiance.nerf.trainer import Trainer BENCH = { "method": "vanilla_nerf", diff --git a/scripts/run_train.py b/scripts/run_train.py index 1590c7668..68e984814 100644 --- a/scripts/run_train.py +++ b/scripts/run_train.py @@ -16,8 +16,8 @@ import torch.distributed as dist import torch.multiprocessing as mp from omegaconf import DictConfig -from mattport.nerf.trainer import Trainer -from mattport.utils import comms, profiler +from radiance.nerf.trainer import Trainer +from radiance.utils import comms, profiler from time import time logging.basicConfig(format="[%(filename)s:%(lineno)d] %(message)s", level=logging.DEBUG) diff --git a/setup.cfg b/setup.cfg index d7994bea2..6565fd502 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] -name = mattport +name = radiance version = 0.0.0 -url = https://github.com/ethanweber/mattport.git +url = https://github.com/ethanweber/radiance.git description = differentiable volume rendering package long_description = file: README.md diff --git a/setup.py b/setup.py index b7ceb0cd1..1f9a0460c 100644 --- a/setup.py +++ b/setup.py @@ -13,12 +13,12 @@ if USE_CUDA: ext_modules = [ CUDAExtension( - name="mattport_cuda", + name="radiance_cuda", sources=[ - "mattport/cuda/mattport_cuda.cpp", - "mattport/cuda/mattport_cuda_kernel.cu", + "radiance/cuda/radiance_cuda.cpp", + "radiance/cuda/radiance_cuda_kernel.cu", ], - include_dirs=[os.path.join("mattport", "cuda", "include")], + include_dirs=[os.path.join("radiance", "cuda", "include")], extra_compile_args={ "cxx": [], "nvcc": [], diff --git a/tests/cuda/test_mattport_cuda.py b/tests/cuda/test_mattport_cuda.py index cce9b4130..f96f3d421 100644 --- a/tests/cuda/test_mattport_cuda.py +++ b/tests/cuda/test_mattport_cuda.py @@ -2,9 +2,9 @@ Test the CUDA bindings. """ import torch -from mattport.cuda.sampler import Sampler +from radiance.cuda.sampler import Sampler import time -import mattport_cuda +import radiance_cuda import os @@ -78,7 +78,7 @@ def test_benchmark(): print("PYTORCH_SAMPLE_TIME:", PYTORCH_SAMPLE_TIME) start = time.time() - time_steps_cu, samples_cu, time_steps_mask_cu = mattport_cuda.sample_uniformly_along_ray_bundle( + time_steps_cu, samples_cu, time_steps_mask_cu = radiance_cuda.sample_uniformly_along_ray_bundle( origins, directions, nears, fars, offsets, max_num_samples ) CUDA_SAMPLE_TIME = time.time() - start diff --git a/tests/nerf/dataloader/test_ray_generator.py b/tests/nerf/dataloader/test_ray_generator.py index 98682960c..0bd44e058 100644 --- a/tests/nerf/dataloader/test_ray_generator.py +++ b/tests/nerf/dataloader/test_ray_generator.py @@ -7,12 +7,12 @@ import torch from torch.utils.data import DataLoader from tqdm import tqdm -from mattport.nerf.dataset.collate import CollateIterDataset, collate_batch_size_one -from mattport.nerf.dataset.image_dataset import ImageDataset, collate_batch -from mattport.nerf.dataset.utils import get_dataset_inputs -from mattport.nerf.ray_generator import RayGenerator -from mattport.utils.io import get_absolute_path -from mattport.viewer.plotly import visualize_dataset +from radiance.nerf.dataset.collate import CollateIterDataset, collate_batch_size_one +from radiance.nerf.dataset.image_dataset import ImageDataset, collate_batch +from radiance.nerf.dataset.utils import get_dataset_inputs +from radiance.nerf.ray_generator import RayGenerator +from radiance.utils.io import get_absolute_path +from radiance.viewer.plotly import visualize_dataset def visualize_batch(batch): diff --git a/tests/nerf/field_modules/test_embedding.py b/tests/nerf/field_modules/test_embedding.py index 43b5340f6..74c54c635 100644 --- a/tests/nerf/field_modules/test_embedding.py +++ b/tests/nerf/field_modules/test_embedding.py @@ -1,7 +1,7 @@ """ Embedding tests """ -from mattport.nerf.field_modules.embedding import Embedding +from radiance.nerf.field_modules.embedding import Embedding def test_indexing(): diff --git a/tests/nerf/field_modules/test_encodings.py b/tests/nerf/field_modules/test_encodings.py index 3654daa3e..0c277f09d 100644 --- a/tests/nerf/field_modules/test_encodings.py +++ b/tests/nerf/field_modules/test_encodings.py @@ -3,7 +3,7 @@ Encoding Tests """ import pytest import torch -from mattport.nerf.field_modules import encoding +from radiance.nerf.field_modules import encoding def test_scaling_and_offset(): diff --git a/tests/nerf/field_modules/test_field_outputs.py b/tests/nerf/field_modules/test_field_outputs.py index 7fd2adf8f..28ef9ea85 100644 --- a/tests/nerf/field_modules/test_field_outputs.py +++ b/tests/nerf/field_modules/test_field_outputs.py @@ -5,7 +5,7 @@ import torch from torch import nn import pytest -from mattport.nerf.field_modules.field_heads import ( +from radiance.nerf.field_modules.field_heads import ( DensityFieldHead, FieldHead, FieldHeadNames, diff --git a/tests/nerf/field_modules/test_mlp.py b/tests/nerf/field_modules/test_mlp.py index c25c29528..e56b6a05a 100644 --- a/tests/nerf/field_modules/test_mlp.py +++ b/tests/nerf/field_modules/test_mlp.py @@ -4,7 +4,7 @@ MLP Test import torch from torch import nn -from mattport.nerf.field_modules import MLP +from radiance.nerf.field_modules import MLP def test_mlp(): diff --git a/tests/nerf/test_fields.py b/tests/nerf/test_fields.py index 65421d958..427e12aa3 100644 --- a/tests/nerf/test_fields.py +++ b/tests/nerf/test_fields.py @@ -3,9 +3,9 @@ Test the fields """ import torch -from mattport.nerf.field_modules.field_heads import FieldHeadNames -from mattport.nerf.fields.instant_ngp_field import TCNNInstantNGPField -from mattport.structures.rays import PointSamples +from radiance.nerf.field_modules.field_heads import FieldHeadNames +from radiance.nerf.fields.instant_ngp_field import TCNNInstantNGPField +from radiance.structures.rays import PointSamples def test_tcnn_instant_ngp_field(): diff --git a/tests/nerf/test_occupancy_grid.py b/tests/nerf/test_occupancy_grid.py index b7c33f61a..ab86982ea 100644 --- a/tests/nerf/test_occupancy_grid.py +++ b/tests/nerf/test_occupancy_grid.py @@ -3,7 +3,7 @@ Code to test the occupancy grid. """ import torch -from mattport.nerf.occupancy_grid import OccupancyGrid +from radiance.nerf.occupancy_grid import OccupancyGrid def test_occupancy_grid(): diff --git a/tests/nerf/test_renderers.py b/tests/nerf/test_renderers.py index 4d1e89ffc..d238893ee 100644 --- a/tests/nerf/test_renderers.py +++ b/tests/nerf/test_renderers.py @@ -4,7 +4,7 @@ Test renderers import pytest import torch -from mattport.nerf import renderers +from radiance.nerf import renderers def test_rgb_renderer(): diff --git a/tests/nerf/test_sampler.py b/tests/nerf/test_sampler.py index df88b889c..c97d763f0 100644 --- a/tests/nerf/test_sampler.py +++ b/tests/nerf/test_sampler.py @@ -2,10 +2,10 @@ Test samplers """ import torch -from mattport.nerf.sampler import PDFSampler, UniformSampler +from radiance.nerf.sampler import PDFSampler, UniformSampler -from mattport.structures.rays import RayBundle -from mattport.nerf.colliders import NearFarCollider +from radiance.structures.rays import RayBundle +from radiance.nerf.colliders import NearFarCollider def test_uniform_sampler(): diff --git a/tests/structures/test_cameras.py b/tests/structures/test_cameras.py index 936116806..cf8f9aeec 100644 --- a/tests/structures/test_cameras.py +++ b/tests/structures/test_cameras.py @@ -4,8 +4,8 @@ Test the camera classes. import torch -from mattport.structures.cameras import PinholeCamera -from mattport.structures.rays import RayBundle +from radiance.structures.cameras import PinholeCamera +from radiance.structures.rays import RayBundle def test_pinhole_camera():