mirror of
https://github.com/nerfstudio-project/nerfstudio.git
synced 2026-11-20 14:45:38 +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
+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