mirror of
https://github.com/nerfstudio-project/nerfstudio.git
synced 2026-11-21 15:15:43 +08:00
Unify dataparser and method discovery (#2398)
* Unify external dataparser registration * Unify dataparser and method discovery
This commit is contained in:
1 parent
85ef567682
commit
6af0bcfbf8
4 files changed
+127
-4
No files matched your search
@@ -9,6 +9,8 @@ from nerfstudio.engine.trainer import TrainerConfig
|
||||
from nerfstudio.pipelines.base_pipeline import VanillaPipelineConfig
|
||||
from nerfstudio.plugins import registry
|
||||
from nerfstudio.plugins.types import MethodSpecification
|
||||
from nerfstudio.plugins import registry_dataparser
|
||||
from nerfstudio.plugins.registry_dataparser import DataParserSpecification, discover_dataparsers, DataParserConfig
|
||||
|
||||
if sys.version_info < (3, 10):
|
||||
import importlib_metadata
|
||||
@@ -94,3 +96,79 @@ def test_discover_methods_from_environment_variable_function():
|
||||
def test_discover_methods_from_environment_variable_instance():
|
||||
"""Tests if a custom method instance from env variable gets properly registered using the discover_methods method"""
|
||||
_test_discover_methods_from_environment_variable("TestConfig")
|
||||
|
||||
|
||||
@dataclass
|
||||
class TestDataparserConfigClass(DataParserSpecification):
|
||||
config: DataParserConfig = DataParserConfig()
|
||||
description: str = "Test description"
|
||||
|
||||
|
||||
def TestDataparserConfigFunc():
|
||||
return TestDataparserConfigClass()
|
||||
|
||||
|
||||
TestDataparserConfig = TestDataparserConfigClass()
|
||||
|
||||
|
||||
def test_discover_dataparser():
|
||||
"""Tests if a custom method gets properly registered using the discover_dataparsers method"""
|
||||
entry_points_backup = registry_dataparser.entry_points
|
||||
|
||||
def entry_points(group=None):
|
||||
return importlib_metadata.EntryPoints(
|
||||
[
|
||||
importlib_metadata.EntryPoint(
|
||||
name="test", value="test_registry:TestDataparserConfig", group="nerfstudio.dataparser_configs"
|
||||
)
|
||||
]
|
||||
).select(group=group)
|
||||
|
||||
try:
|
||||
# Mock importlib entry_points
|
||||
registry_dataparser.entry_points = entry_points
|
||||
|
||||
# Discover plugins
|
||||
dataparsers, _ = discover_dataparsers()
|
||||
assert "test" in dataparsers
|
||||
config = dataparsers["test"]
|
||||
assert isinstance(config, DataParserConfig)
|
||||
finally:
|
||||
# Revert mock
|
||||
registry_dataparser.entry_points = entry_points_backup
|
||||
|
||||
|
||||
def _test_discover_dataparsers_from_environment_variable(method):
|
||||
"""Tests if a custom method from env variable gets properly registered using the discover_dataparsers method"""
|
||||
old_env = None
|
||||
try:
|
||||
old_env = os.environ.get("NERFSTUDIO_DATAPARSER_CONFIGS", None)
|
||||
method_key = f"{method}-env"
|
||||
os.environ["NERFSTUDIO_DATAPARSER_CONFIGS"] = f"{method_key}=test_registry:{method}"
|
||||
|
||||
# Discover plugins
|
||||
dataparsers, _ = discover_dataparsers()
|
||||
assert method_key in dataparsers
|
||||
config = dataparsers[method_key]
|
||||
assert isinstance(config, DataParserConfig)
|
||||
finally:
|
||||
# Revert mock
|
||||
if old_env is not None:
|
||||
os.environ["NERFSTUDIO_DATAPARSER_CONFIGS"] = old_env
|
||||
else:
|
||||
del os.environ["NERFSTUDIO_DATAPARSER_CONFIGS"]
|
||||
|
||||
|
||||
def test_discover_dataparsers_from_environment_variable_class():
|
||||
"""Tests if a custom dataparser class from env variable gets properly registered using the discover_methods method"""
|
||||
_test_discover_dataparsers_from_environment_variable("TestDataparserConfigClass")
|
||||
|
||||
|
||||
def test_discover_dataparsers_from_environment_variable_function():
|
||||
"""Tests if a custom dataparser function from env variable gets properly registered using the discover_methods method"""
|
||||
_test_discover_dataparsers_from_environment_variable("TestDataparserConfigFunc")
|
||||
|
||||
|
||||
def test_discover_dataparsers_from_environment_variable_instance():
|
||||
"""Tests if a custom dataparser instance from env variable gets properly registered using the discover_methods method"""
|
||||
_test_discover_dataparsers_from_environment_variable("TestDataparserConfig")
|
||||
Reference in new issue
Block a user