merge from main

This commit is contained in:
terrance committed 2023-05-12 18:39:30 +00:00
commit a0c38e8430
144 files changed
+8884 -8219

No files matched your search

+107
View File
@@ -0,0 +1,107 @@
# pylint: disable=all
from copy import copy
from typing import Any
import pytest
import torch
import yaml
from nerfstudio.cameras.cameras import Cameras
from nerfstudio.configs.base_config import InstantiateConfig
from nerfstudio.data.datamanagers.base_datamanager import (
DataManager,
DataparserOutputs,
VanillaDataManager,
VanillaDataManagerConfig,
)
from nerfstudio.data.datasets.base_dataset import InputDataset
from nerfstudio.data.datasets.depth_dataset import DepthDataset
class DummyDataParser:
def __init__(self, *args, **kwargs):
pass
def __getattr__(self, __name: str) -> Any:
if __name.startswith("_"):
return object.__getattribute__(self, __name)
return None
def get_dataparser_outputs(self, *args, **kwargs):
return DataparserOutputs(
[],
Cameras(
torch.ones((0, 3, 4)),
torch.ones((0, 1)),
torch.ones((0, 1)),
torch.ones((0, 1)),
torch.ones((0, 1)),
10,
10,
),
metadata={"depth_filenames": [], "depth_unit_scale_factor": 1.0},
)
@pytest.fixture
def config():
config = VanillaDataManagerConfig()
setattr(config, "dataparser", InstantiateConfig(_target=DummyDataParser))
setattr(config.dataparser, "data", None)
return 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
class tmp(VanillaDataManager):
pass
assert tmp(config).dataset_type is InputDataset
class tmp2(VanillaDataManager[DepthDataset]):
pass
assert tmp2(config).dataset_type is DepthDataset
def test_data_manager_type_can_be_serialized(config):
# Mock for a faster test
assert VanillaDataManager(config).dataset_type is InputDataset
obj = yaml.load(yaml.dump(VanillaDataManager(config)), Loader=yaml.UnsafeLoader)
assert obj.dataset_type is InputDataset
assert isinstance(obj, VanillaDataManager)
assert VanillaDataManager[DepthDataset](config).dataset_type is DepthDataset
obj = yaml.load(yaml.dump(VanillaDataManager[DepthDataset](config)), Loader=yaml.UnsafeLoader)
assert obj.dataset_type is DepthDataset
assert isinstance(obj, VanillaDataManager)
class tmp(VanillaDataManager):
pass
try:
globals()["tmp"] = tmp
assert tmp(config).dataset_type is InputDataset
obj = yaml.load(yaml.dump(tmp(config)), Loader=yaml.UnsafeLoader)
assert obj.dataset_type is InputDataset
assert isinstance(obj, tmp)
finally:
globals().pop("tmp")
class tmp2(VanillaDataManager[DepthDataset]):
pass
try:
globals()["tmp2"] = tmp2
assert tmp2(config).dataset_type is DepthDataset
obj = yaml.load(yaml.dump(tmp2(config)), Loader=yaml.UnsafeLoader)
assert obj.dataset_type is DepthDataset
assert isinstance(obj, tmp2)
finally:
globals().pop("tmp2")
+28
View File
@@ -0,0 +1,28 @@
"""
Test losses
"""
import torch
from nerfstudio.model_components.losses import tv_loss
def test_tv_loss():
"""Test total variation loss"""
grids = torch.ones([3, 64, 128, 128])
assert tv_loss(grids).item() == 0
grids = torch.zeros([1, 10, 100, 100])
for i in range(100):
for j in range(100):
grid_location = (i + j) % 2
for k in range(10):
grids[0, k, i, j] = grid_location
# TV_row = 1, TV_col = 1. Totol tv should be 2 * (TV_row + TV_col)
assert tv_loss(grids).item() == 4.0
if __name__ == "__main__":
test_tv_loss()
+21
View File
@@ -1,6 +1,7 @@
"""
Tests for the nerfstudio.plugins.registry module.
"""
import os
import sys
from nerfstudio.engine.trainer import TrainerConfig
@@ -49,3 +50,23 @@ def test_discover_methods():
finally:
# Revert mock
registry.entry_points = entry_points_backup
def test_discover_methods_from_environment_variable():
"""Tests if a custom method from env variable gets properly registered using the discover_methods method"""
old_env = None
try:
old_env = os.environ.get("NERFSTUDIO_METHOD_CONFIGS", None)
os.environ["NERFSTUDIO_METHOD_CONFIGS"] = "test-method-env=test_registry:TestConfig"
# Discover plugins
methods, _ = registry.discover_methods()
assert "test-method-env" in methods
config = methods["test-method-env"]
assert isinstance(config, TrainerConfig)
finally:
# Revert mock
if old_env is not None:
os.environ["NERFSTUDIO_METHOD_CONFIGS"] = old_env
else:
del os.environ["NERFSTUDIO_METHOD_CONFIGS"]
+1 -1
View File
@@ -16,7 +16,7 @@ from nerfstudio.data.utils.colmap_parsing_utils import (
write_cameras_binary,
write_images_binary,
)
from nerfstudio.process_data.images_to_nerstudio_dataset import (
from nerfstudio.process_data.images_to_nerfstudio_dataset import (
ImagesToNerfstudioDataset,
)
+1 -1
View File
@@ -13,7 +13,7 @@ from nerfstudio.configs.method_configs import method_configs
from nerfstudio.data.dataparsers.blender_dataparser import BlenderDataParserConfig
from nerfstudio.data.dataparsers.minimal_dataparser import MinimalDataParserConfig
from nerfstudio.engine.trainer import TrainerConfig
from scripts.train import train_loop
from nerfstudio.scripts.train import train_loop
BLACKLIST = [
"base",