mirror of
https://github.com/nerfstudio-project/nerfstudio.git
synced 2026-11-17 21:33:56 +08:00
Bump dcargs, base config simplification (#368)
Updates for dcargs v0.3.0
This commit is contained in:
1 parent
9292a02287
commit
97b77c6c5f
4 files changed
+28
-49
No files matched your search
@@ -21,6 +21,7 @@ from datetime import datetime
|
||||
from pathlib import Path
|
||||
from typing import Any, Dict, List, Literal, Optional, Tuple, Type
|
||||
|
||||
import dcargs
|
||||
import torch
|
||||
|
||||
from nerfactory.configs.utils import to_immutable_dict
|
||||
@@ -241,11 +242,15 @@ class Record3DDataParserConfig(DataParserConfig):
|
||||
class VanillaDataManagerConfig(InstantiateConfig):
|
||||
"""Configuration for data manager instantiation"""
|
||||
|
||||
# Note: eval_dataparser is annotated with Fixed[] to prevent dcargs from trying to
|
||||
# convert Optional[InstantiateConfig] into subcommands for choosing between None and
|
||||
# InstantiateConfig.
|
||||
|
||||
_target: Type = VanillaDataManager
|
||||
train_dataparser: DataParserConfig = BlenderDataParserConfig()
|
||||
train_num_rays_per_batch: int = 1024
|
||||
train_num_images_to_sample_from: int = -1
|
||||
eval_dataparser: Optional[InstantiateConfig] = None
|
||||
eval_dataparser: dcargs.conf.Fixed[Optional[InstantiateConfig]] = None
|
||||
eval_image_indices: Optional[Tuple[int, ...]] = (0,)
|
||||
eval_num_rays_per_chunk: int = 4096
|
||||
|
||||
|
||||
@@ -18,38 +18,8 @@ Some utility code for configs.
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import sys
|
||||
from dataclasses import field
|
||||
from typing import Any, Dict, TypeVar
|
||||
|
||||
import dcargs
|
||||
|
||||
T = TypeVar("T")
|
||||
|
||||
|
||||
def cli_from_base_configs(base_library: Dict[str, T]) -> T:
|
||||
"""Populate an instance of `cls`, where the first positional argument is used to
|
||||
select from a library of named base configs. See
|
||||
https://brentyi.github.io/dcargs/examples/06_base_configs/ for more details."""
|
||||
|
||||
# Get base configuration name from the first positional argument.
|
||||
if len(sys.argv) < 2 or sys.argv[1] not in base_library:
|
||||
valid_usages = map(lambda k: f"{sys.argv[0]} {k} --help", base_library.keys())
|
||||
raise SystemExit("usage:\n " + "\n ".join(valid_usages))
|
||||
|
||||
# Get base configuration from our library, and use it for default CLI parameters.
|
||||
default_instance = base_library[sys.argv[1]]
|
||||
|
||||
return dcargs.cli(
|
||||
type(default_instance),
|
||||
prog=" ".join(sys.argv[:2]),
|
||||
args=sys.argv[2:],
|
||||
default_instance=default_instance,
|
||||
# `avoid_subparsers` will avoid making a subparser for unions when a default is
|
||||
# provided; in this case, it simplifies our CLI but makes it less expressive.
|
||||
avoid_subparsers=True,
|
||||
)
|
||||
|
||||
from typing import Any, Dict
|
||||
|
||||
# pylint: disable=import-outside-toplevel
|
||||
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ dependencies = [
|
||||
"aiortc==1.3.2",
|
||||
"av==9.2.0",
|
||||
"black[jupyter]==22.3.0",
|
||||
"dcargs>=0.2.6",
|
||||
"dcargs>=0.3.1",
|
||||
"ninja==1.10.2.3",
|
||||
"functorch==0.2.1",
|
||||
"h5py>=2.9.0",
|
||||
|
||||
+20
-16
@@ -9,6 +9,7 @@ import traceback
|
||||
from datetime import timedelta
|
||||
from typing import Any, Callable, Optional
|
||||
|
||||
import dcargs
|
||||
import numpy as np
|
||||
import torch
|
||||
import torch.distributed as dist
|
||||
@@ -17,7 +18,6 @@ import yaml
|
||||
from rich.console import Console
|
||||
|
||||
from nerfactory.configs import base as cfg
|
||||
from nerfactory.configs.utils import cli_from_base_configs
|
||||
from nerfactory.engine.trainer import train_loop
|
||||
from nerfactory.utils import comms, profiler
|
||||
|
||||
@@ -182,6 +182,22 @@ def launch(
|
||||
|
||||
def main(config: cfg.Config) -> None:
|
||||
"""Main function."""
|
||||
|
||||
if config.trainer.load_config:
|
||||
logging.info(f"Loading pre-set config from: {config.trainer.load_config}")
|
||||
config = yaml.load(config.trainer.load_config.read_text(), Loader=yaml.Loader)
|
||||
|
||||
console = Console(width=120)
|
||||
console.rule("Config")
|
||||
console.print(config)
|
||||
console.rule("")
|
||||
|
||||
assert config.base_dir is not None
|
||||
config.base_dir.mkdir(parents=True, exist_ok=True)
|
||||
config_yaml_path = config.base_dir / "config.yml"
|
||||
logging.info(f"Saving config to: {config_yaml_path}")
|
||||
config_yaml_path.write_text(yaml.dump(config), "utf8")
|
||||
|
||||
launch(
|
||||
train_loop,
|
||||
config.machine.num_gpus,
|
||||
@@ -193,22 +209,10 @@ def main(config: cfg.Config) -> None:
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
console = Console(width=120)
|
||||
|
||||
from nerfactory.configs.base_configs import base_configs
|
||||
|
||||
instantiated_config = cli_from_base_configs(base_configs)
|
||||
if instantiated_config.trainer.load_config:
|
||||
logging.info(f"Loading pre-set config from: {instantiated_config.trainer.load_config}")
|
||||
instantiated_config = yaml.load(instantiated_config.trainer.load_config.read_text(), Loader=yaml.Loader)
|
||||
|
||||
console.rule("Config")
|
||||
console.print(instantiated_config)
|
||||
console.rule("")
|
||||
|
||||
assert instantiated_config.base_dir is not None
|
||||
instantiated_config.base_dir.mkdir(parents=True, exist_ok=True)
|
||||
config_yaml_path = instantiated_config.base_dir / "config.yml"
|
||||
logging.info(f"Saving config to: {config_yaml_path}")
|
||||
config_yaml_path.write_text(yaml.dump(instantiated_config), "utf8")
|
||||
# Create a subcommand for each base config.
|
||||
SubcommandType = dcargs.extras.subcommand_type_from_defaults(base_configs)
|
||||
instantiated_config = dcargs.cli(SubcommandType)
|
||||
main(config=instantiated_config)
|
||||
Reference in new issue
Block a user