Merge branch 'main' into AdamRashid96/main

This commit is contained in:
Ethan Weber committed 2023-08-01 01:56:27 +00:00
commit f115dc784e
67 files changed
+1474 -527

No files matched your search

+36 -4
View File
@@ -1,3 +1,4 @@
import pickle
from pathlib import Path
from typing import Any
@@ -52,18 +53,49 @@ def config():
def test_data_manager_type_inference(config):
# Mock for a faster test
assert VanillaDataManager(config).dataset_type is InputDataset
assert VanillaDataManager[DepthDataset](config).dataset_type is DepthDataset
assert VanillaDataManager(config).dataset_type is InputDataset
class tmp2(VanillaDataManager[DepthDataset]):
pass
assert tmp2(config).dataset_type is DepthDataset
class tmp(VanillaDataManager):
pass
assert tmp(config).dataset_type is InputDataset
class tmp2(VanillaDataManager[DepthDataset]):
pass
assert tmp2(config).dataset_type is DepthDataset
class _pickle_enabled_tmp(VanillaDataManager):
pass
class _pickle_enabled_tmp2(VanillaDataManager[DepthDataset]):
pass
def test_data_manager_type_can_be_pickled(config):
# Mock for a faster test
assert VanillaDataManager[DepthDataset](config).dataset_type is DepthDataset
obj = pickle.loads(pickle.dumps(VanillaDataManager[DepthDataset](config)))
assert obj.dataset_type is DepthDataset
assert isinstance(obj, VanillaDataManager)
assert VanillaDataManager(config).dataset_type is InputDataset
obj = pickle.loads(pickle.dumps(VanillaDataManager(config)))
assert obj.dataset_type is InputDataset
assert isinstance(obj, VanillaDataManager)
assert _pickle_enabled_tmp(config).dataset_type is InputDataset
obj = pickle.loads(pickle.dumps(_pickle_enabled_tmp(config)))
assert obj.dataset_type is InputDataset
assert isinstance(obj, _pickle_enabled_tmp)
assert _pickle_enabled_tmp2(config).dataset_type is DepthDataset
obj = pickle.loads(pickle.dumps(_pickle_enabled_tmp2(config)))
assert obj.dataset_type is DepthDataset
assert isinstance(obj, _pickle_enabled_tmp2)
def test_data_manager_type_can_be_serialized(config):
+17 -8
View File
@@ -4,11 +4,11 @@ Test the fields
import torch
from nerfstudio.cameras.rays import Frustums, RaySamples
from nerfstudio.fields.instant_ngp_field import TCNNInstantNGPField
from nerfstudio.fields.nerfacto_field import NerfactoField
def test_tcnn_instant_ngp_field():
"""Test the tiny-cuda-nn field"""
def test_nerfacto_field():
"""Test the Nerfacto field"""
try:
import tinycudann as tcnn # noqa: F401
except ModuleNotFoundError as e:
@@ -18,9 +18,11 @@ def test_tcnn_instant_ngp_field():
device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
aabb_scale = 1.0
aabb = torch.tensor(
[[-aabb_scale, -aabb_scale, -aabb_scale], [aabb_scale, aabb_scale, aabb_scale]], dtype=torch.float32
).to(device)
field = TCNNInstantNGPField(aabb)
[[-aabb_scale, -aabb_scale, -aabb_scale], [aabb_scale, aabb_scale, aabb_scale]],
dtype=torch.float32,
device=device,
)
field = NerfactoField(aabb, num_images=1).to(device)
num_rays = 1024
num_samples = 256
positions = torch.rand((num_rays, num_samples, 3), dtype=torch.float32, device=device)
@@ -32,9 +34,16 @@ def test_tcnn_instant_ngp_field():
ends=torch.zeros((*directions.shape[:-1], 1), device=device),
pixel_area=torch.ones((*directions.shape[:-1], 1), device=device),
)
ray_samples = RaySamples(frustums=frustums)
ray_samples = RaySamples(
frustums=frustums,
camera_indices=torch.zeros(
(num_rays, 1, 1),
device=device,
dtype=torch.int32,
),
)
field.forward(ray_samples)
if __name__ == "__main__":
test_tcnn_instant_ngp_field()
test_nerfacto_field()
+1 -1
View File
@@ -4,7 +4,7 @@ MLP Test
import torch
from torch import nn
from nerfstudio.field_components import MLP
from nerfstudio.field_components.mlp import MLP
def test_mlp():