From b86a4251a95f220a2e3988d67a6c4c92983ba9a3 Mon Sep 17 00:00:00 2001 From: Ilya Basharov Date: Sat, 8 Jul 2023 01:01:14 +0300 Subject: [PATCH] Feature/run_beta_viewer (#2157) * add `build-arg` cuda version to dockerfile * [Feature] add 'vis' option to 'ns-viewer' script * fix pylint * [Fix] fix data format --------- Co-authored-by: Brent Yi Co-authored-by: Matthew Tancik --- nerfstudio/scripts/viewer/run_viewer.py | 35 ++++++++++++++++++------- nerfstudio/viewer_beta/viewer.py | 4 +-- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/nerfstudio/scripts/viewer/run_viewer.py b/nerfstudio/scripts/viewer/run_viewer.py index 0600a9107..c4ebefacb 100644 --- a/nerfstudio/scripts/viewer/run_viewer.py +++ b/nerfstudio/scripts/viewer/run_viewer.py @@ -22,6 +22,8 @@ import time from dataclasses import dataclass, field, fields from pathlib import Path +from typing import Literal + import tyro from nerfstudio.configs.base_config import ViewerConfig @@ -30,6 +32,7 @@ from nerfstudio.pipelines.base_pipeline import Pipeline from nerfstudio.utils import writer from nerfstudio.utils.eval_utils import eval_setup from nerfstudio.viewer.server.viewer_state import ViewerState +from nerfstudio.viewer_beta.viewer import Viewer as ViewerBetaState @dataclass @@ -51,6 +54,8 @@ class RunViewer: """Path to config YAML file.""" viewer: ViewerConfigWithoutNumRays = field(default_factory=ViewerConfigWithoutNumRays) """Viewer configuration""" + vis: Literal["viewer", "viewer_beta"] = "viewer" + """Type of viewer""" def main(self) -> None: """Main function.""" @@ -61,7 +66,7 @@ class RunViewer: ) num_rays_per_chunk = config.viewer.num_rays_per_chunk assert self.viewer.num_rays_per_chunk == -1 - config.vis = "viewer" + config.vis = self.vis config.viewer = self.viewer.as_viewer_config() config.viewer.num_rays_per_chunk = num_rays_per_chunk @@ -83,13 +88,24 @@ def _start_viewer(config: TrainerConfig, pipeline: Pipeline, step: int): """ base_dir = config.get_base_dir() viewer_log_path = base_dir / config.viewer.relative_log_filename - viewer_state = ViewerState( - config.viewer, - log_filename=viewer_log_path, - datapath=pipeline.datamanager.get_datapath(), - pipeline=pipeline, - ) - banner_messages = [f"Viewer at: {viewer_state.viewer_url}"] + banner_messages = None + viewer_state = None + if config.vis == "viewer": + viewer_state = ViewerState( + config.viewer, + log_filename=viewer_log_path, + datapath=pipeline.datamanager.get_datapath(), + pipeline=pipeline, + ) + banner_messages = [f"Viewer at: {viewer_state.viewer_url}"] + if config.vis == "viewer_beta": + viewer_state = ViewerBetaState( + config.viewer, + log_filename=viewer_log_path, + datapath=base_dir, + pipeline=pipeline, + ) + banner_messages = [f"Viewer Beta at: {viewer_state.viewer_url}"] # We don't need logging, but writer.GLOBAL_BUFFER needs to be populated config.logging.local_writer.enable = False @@ -100,7 +116,8 @@ def _start_viewer(config: TrainerConfig, pipeline: Pipeline, step: int): dataset=pipeline.datamanager.train_dataset, train_state="completed", ) - viewer_state.viser_server.set_training_state("completed") + if isinstance(viewer_state, ViewerState): + viewer_state.viser_server.set_training_state("completed") viewer_state.update_scene(step=step) while True: time.sleep(0.01) diff --git a/nerfstudio/viewer_beta/viewer.py b/nerfstudio/viewer_beta/viewer.py index 51ca6ab14..4c007f082 100644 --- a/nerfstudio/viewer_beta/viewer.py +++ b/nerfstudio/viewer_beta/viewer.py @@ -118,8 +118,8 @@ class Viewer: def _(_: viser.CameraHandle) -> None: R = vtf.SO3(wxyz=client.camera.wxyz) R = R @ vtf.SO3.from_x_radians(np.pi) - R = torch.tensor(R.as_matrix()) - pos = torch.tensor(client.camera.position, dtype=torch.float64) / VISER_NERFSTUDIO_SCALE_RATIO + R = torch.tensor(R.as_matrix(), dtype=torch.float32) + pos = torch.tensor(client.camera.position, dtype=torch.float32) / VISER_NERFSTUDIO_SCALE_RATIO c2w = torch.concatenate([R, pos[:, None]], dim=1) self.camera_state = CameraState(fov=client.camera.fov, aspect=client.camera.aspect, c2w=c2w) self.render_statemachine.action(RenderAction("move", self.camera_state))