From 4242a3c9829a48453f16dfd1810833ae8c0553dc Mon Sep 17 00:00:00 2001 From: Matthew Tancik Date: Fri, 12 May 2023 14:20:40 -0700 Subject: [PATCH] Make rich console global (#1916) --- nerfstudio/configs/config_utils.py | 5 +---- nerfstudio/configs/experiment_config.py | 4 +--- nerfstudio/data/datamanagers/base_datamanager.py | 4 +--- nerfstudio/data/dataparsers/dycheck_dataparser.py | 4 +--- nerfstudio/data/dataparsers/instant_ngp_dataparser.py | 4 +--- nerfstudio/data/dataparsers/nerfosr_dataparser.py | 3 --- nerfstudio/data/dataparsers/nerfstudio_dataparser.py | 3 +-- nerfstudio/data/dataparsers/phototourism_dataparser.py | 4 +--- nerfstudio/data/dataparsers/sdfstudio_dataparser.py | 3 --- nerfstudio/data/dataparsers/sitcoms3d_dataparser.py | 3 --- nerfstudio/data/utils/dataloaders.py | 5 ++--- nerfstudio/engine/trainer.py | 4 +--- nerfstudio/exporter/exporter_utils.py | 6 ++---- nerfstudio/exporter/texture_utils.py | 5 +---- nerfstudio/exporter/tsdf_utils.py | 4 +--- nerfstudio/generative/stable_diffusion.py | 3 +-- nerfstudio/plugins/registry.py | 4 +--- .../process_data/colmap_converter_to_nerfstudio_dataset.py | 5 +---- nerfstudio/process_data/colmap_utils.py | 5 +---- nerfstudio/process_data/equirect_utils.py | 5 +---- nerfstudio/process_data/hloc_utils.py | 5 +---- nerfstudio/process_data/images_to_nerfstudio_dataset.py | 5 +---- nerfstudio/process_data/metashape_utils.py | 4 +--- nerfstudio/process_data/polycam_utils.py | 5 +---- nerfstudio/process_data/process_data_utils.py | 4 +--- nerfstudio/process_data/realitycapture_utils.py | 4 +--- nerfstudio/process_data/record3d_utils.py | 3 --- nerfstudio/process_data/video_to_nerfstudio_dataset.py | 5 +---- nerfstudio/scripts/completions/install.py | 4 ++-- nerfstudio/scripts/docs/add_nb_tags.py | 3 +-- nerfstudio/scripts/docs/build_docs.py | 3 +-- nerfstudio/scripts/downloads/download_data.py | 3 --- nerfstudio/scripts/eval.py | 4 +--- nerfstudio/scripts/exporter.py | 4 +--- nerfstudio/scripts/generative/trace_stable_diffusion.py | 4 +--- nerfstudio/scripts/github/run_actions.py | 3 +-- nerfstudio/scripts/process_data.py | 4 +--- nerfstudio/scripts/render.py | 5 +---- nerfstudio/scripts/texture.py | 3 --- nerfstudio/scripts/train.py | 3 +-- nerfstudio/scripts/viewer/run_viewer.py | 3 --- nerfstudio/utils/eval_utils.py | 4 +--- nerfstudio/utils/install_checks.py | 4 +--- nerfstudio/utils/printing.py | 4 +--- nerfstudio/utils/profiler.py | 4 +--- nerfstudio/utils/scripts.py | 4 +--- nerfstudio/utils/writer.py | 3 +-- nerfstudio/viewer/server/viewer_state.py | 4 +--- nerfstudio/viewer/server/viewer_utils.py | 3 --- 49 files changed, 44 insertions(+), 150 deletions(-) diff --git a/nerfstudio/configs/config_utils.py b/nerfstudio/configs/config_utils.py index 42bf7a082..3326c59dc 100644 --- a/nerfstudio/configs/config_utils.py +++ b/nerfstudio/configs/config_utils.py @@ -21,10 +21,7 @@ from __future__ import annotations from dataclasses import field from typing import Any, Dict -from rich.console import Console - -CONSOLE = Console() -# pylint: disable=import-outside-toplevel +from nerfstudio.utils.rich_utils import CONSOLE # cannot use mutable types directly within dataclass; abstracting default factory calls diff --git a/nerfstudio/configs/experiment_config.py b/nerfstudio/configs/experiment_config.py index 8e9669a47..b9516232b 100644 --- a/nerfstudio/configs/experiment_config.py +++ b/nerfstudio/configs/experiment_config.py @@ -22,7 +22,6 @@ from pathlib import Path from typing import Any, Dict, Literal, Optional import yaml -from rich.console import Console from nerfstudio.configs.base_config import ( InstantiateConfig, @@ -34,8 +33,7 @@ from nerfstudio.configs.config_utils import to_immutable_dict from nerfstudio.engine.optimizers import OptimizerConfig from nerfstudio.engine.schedulers import SchedulerConfig from nerfstudio.pipelines.base_pipeline import VanillaPipelineConfig - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE @dataclass diff --git a/nerfstudio/data/datamanagers/base_datamanager.py b/nerfstudio/data/datamanagers/base_datamanager.py index beb41cf39..2be82a395 100644 --- a/nerfstudio/data/datamanagers/base_datamanager.py +++ b/nerfstudio/data/datamanagers/base_datamanager.py @@ -26,7 +26,6 @@ from typing import Any, Dict, Generic, List, Literal, Optional, Tuple, Type, Uni import torch import tyro -from rich.progress import Console from torch import nn from torch.nn import Parameter from torch.utils.data import Dataset @@ -72,8 +71,7 @@ from nerfstudio.data.utils.nerfstudio_collate import nerfstudio_collate from nerfstudio.engine.callbacks import TrainingCallback, TrainingCallbackAttributes from nerfstudio.model_components.ray_generators import RayGenerator from nerfstudio.utils.misc import IterableWrapper - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE def variable_res_collate(batch: List[Dict]) -> Dict: diff --git a/nerfstudio/data/dataparsers/dycheck_dataparser.py b/nerfstudio/data/dataparsers/dycheck_dataparser.py index 7ddf051e1..31da89162 100644 --- a/nerfstudio/data/dataparsers/dycheck_dataparser.py +++ b/nerfstudio/data/dataparsers/dycheck_dataparser.py @@ -23,7 +23,6 @@ from typing import Dict, List, Tuple, Type import cv2 import numpy as np import torch -from rich.progress import Console from nerfstudio.cameras.cameras import Cameras, CameraType from nerfstudio.data.dataparsers.base_dataparser import ( @@ -34,8 +33,7 @@ from nerfstudio.data.dataparsers.base_dataparser import ( from nerfstudio.data.scene_box import SceneBox from nerfstudio.utils.colors import get_color from nerfstudio.utils.io import load_from_json - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE def downscale(img, scale: int) -> np.ndarray: diff --git a/nerfstudio/data/dataparsers/instant_ngp_dataparser.py b/nerfstudio/data/dataparsers/instant_ngp_dataparser.py index 8b4bf724c..c9fc244e2 100644 --- a/nerfstudio/data/dataparsers/instant_ngp_dataparser.py +++ b/nerfstudio/data/dataparsers/instant_ngp_dataparser.py @@ -23,7 +23,6 @@ from typing import Dict, Tuple, Type import imageio import numpy as np import torch -from rich.console import Console from nerfstudio.cameras import camera_utils from nerfstudio.cameras.cameras import Cameras, CameraType @@ -34,8 +33,7 @@ from nerfstudio.data.dataparsers.base_dataparser import ( ) from nerfstudio.data.scene_box import SceneBox from nerfstudio.utils.io import load_from_json - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE @dataclass diff --git a/nerfstudio/data/dataparsers/nerfosr_dataparser.py b/nerfstudio/data/dataparsers/nerfosr_dataparser.py index 97f430e1a..2163cd498 100644 --- a/nerfstudio/data/dataparsers/nerfosr_dataparser.py +++ b/nerfstudio/data/dataparsers/nerfosr_dataparser.py @@ -27,7 +27,6 @@ from typing import List, Literal, Tuple, Type import numpy as np import torch -from rich.console import Console from nerfstudio.cameras import camera_utils from nerfstudio.cameras.cameras import Cameras, CameraType @@ -38,8 +37,6 @@ from nerfstudio.data.dataparsers.base_dataparser import ( ) from nerfstudio.data.scene_box import SceneBox -CONSOLE = Console(width=120) - def _find_files(directory: str, exts: List[str]): """Find all files in a directory that have a certain file extension. diff --git a/nerfstudio/data/dataparsers/nerfstudio_dataparser.py b/nerfstudio/data/dataparsers/nerfstudio_dataparser.py index d1f19c7fc..481264a87 100644 --- a/nerfstudio/data/dataparsers/nerfstudio_dataparser.py +++ b/nerfstudio/data/dataparsers/nerfstudio_dataparser.py @@ -23,7 +23,6 @@ from typing import Literal, Optional, Type import numpy as np import torch from PIL import Image -from rich.console import Console from nerfstudio.cameras import camera_utils from nerfstudio.cameras.cameras import CAMERA_MODEL_TO_TYPE, Cameras, CameraType @@ -34,8 +33,8 @@ from nerfstudio.data.dataparsers.base_dataparser import ( ) from nerfstudio.data.scene_box import SceneBox from nerfstudio.utils.io import load_from_json +from nerfstudio.utils.rich_utils import CONSOLE -CONSOLE = Console(width=120) MAX_AUTO_RESOLUTION = 1600 diff --git a/nerfstudio/data/dataparsers/phototourism_dataparser.py b/nerfstudio/data/dataparsers/phototourism_dataparser.py index 8b6049c64..2b6e9488b 100644 --- a/nerfstudio/data/dataparsers/phototourism_dataparser.py +++ b/nerfstudio/data/dataparsers/phototourism_dataparser.py @@ -22,7 +22,6 @@ from typing import Literal, Type import numpy as np import torch -from rich.progress import Console from nerfstudio.cameras import camera_utils from nerfstudio.cameras.cameras import Cameras, CameraType @@ -39,8 +38,7 @@ from nerfstudio.data.utils.colmap_parsing_utils import ( read_cameras_binary, read_images_binary, ) - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE @dataclass diff --git a/nerfstudio/data/dataparsers/sdfstudio_dataparser.py b/nerfstudio/data/dataparsers/sdfstudio_dataparser.py index 5ff403c45..474a27fa3 100644 --- a/nerfstudio/data/dataparsers/sdfstudio_dataparser.py +++ b/nerfstudio/data/dataparsers/sdfstudio_dataparser.py @@ -20,7 +20,6 @@ from pathlib import Path from typing import Type import torch -from rich.console import Console from nerfstudio.cameras import camera_utils from nerfstudio.cameras.cameras import Cameras, CameraType @@ -32,8 +31,6 @@ from nerfstudio.data.dataparsers.base_dataparser import ( from nerfstudio.data.scene_box import SceneBox from nerfstudio.utils.io import load_from_json -CONSOLE = Console() - @dataclass class SDFStudioDataParserConfig(DataParserConfig): diff --git a/nerfstudio/data/dataparsers/sitcoms3d_dataparser.py b/nerfstudio/data/dataparsers/sitcoms3d_dataparser.py index 6dfc8896b..c71fea936 100644 --- a/nerfstudio/data/dataparsers/sitcoms3d_dataparser.py +++ b/nerfstudio/data/dataparsers/sitcoms3d_dataparser.py @@ -25,7 +25,6 @@ from pathlib import Path from typing import Type import torch -from rich.console import Console from nerfstudio.cameras.cameras import Cameras, CameraType from nerfstudio.data.dataparsers.base_dataparser import ( @@ -37,8 +36,6 @@ from nerfstudio.data.dataparsers.base_dataparser import ( from nerfstudio.data.scene_box import SceneBox from nerfstudio.utils.io import load_from_json -CONSOLE = Console() - @dataclass class Sitcoms3DDataParserConfig(DataParserConfig): diff --git a/nerfstudio/data/utils/dataloaders.py b/nerfstudio/data/utils/dataloaders.py index aa30407ea..61e7496ef 100644 --- a/nerfstudio/data/utils/dataloaders.py +++ b/nerfstudio/data/utils/dataloaders.py @@ -24,7 +24,7 @@ from abc import abstractmethod from typing import Dict, Optional, Tuple, Union import torch -from rich.progress import Console, track +from rich.progress import track from torch.utils.data import Dataset from torch.utils.data.dataloader import DataLoader @@ -33,8 +33,7 @@ from nerfstudio.cameras.rays import RayBundle from nerfstudio.data.datasets.base_dataset import InputDataset from nerfstudio.data.utils.nerfstudio_collate import nerfstudio_collate from nerfstudio.utils.misc import get_dict_to_torch - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE class CacheDataloader(DataLoader): diff --git a/nerfstudio/engine/trainer.py b/nerfstudio/engine/trainer.py index cff4b741e..75e4d84df 100644 --- a/nerfstudio/engine/trainer.py +++ b/nerfstudio/engine/trainer.py @@ -28,7 +28,6 @@ from typing import Dict, List, Literal, Optional, Tuple, Type, Union import torch from rich import box, style -from rich.console import Console from rich.panel import Panel from rich.table import Table from torch.cuda.amp.grad_scaler import GradScaler @@ -48,11 +47,10 @@ from nerfstudio.utils.decorators import ( check_viewer_enabled, ) from nerfstudio.utils.misc import step_check +from nerfstudio.utils.rich_utils import CONSOLE from nerfstudio.utils.writer import EventName, TimeWriter from nerfstudio.viewer.server.viewer_state import ViewerState -CONSOLE = Console(width=120) - TRAIN_INTERATION_OUTPUT = Tuple[ # pylint: disable=invalid-name torch.Tensor, Dict[str, torch.Tensor], Dict[str, torch.Tensor] ] diff --git a/nerfstudio/exporter/exporter_utils.py b/nerfstudio/exporter/exporter_utils.py index 2f45badab..713d1a0e8 100644 --- a/nerfstudio/exporter/exporter_utils.py +++ b/nerfstudio/exporter/exporter_utils.py @@ -28,7 +28,6 @@ import numpy as np import open3d as o3d import pymeshlab import torch -from rich.console import Console from rich.progress import ( BarColumn, Progress, @@ -41,9 +40,7 @@ from torchtyping import TensorType from nerfstudio.cameras.cameras import Cameras from nerfstudio.data.datasets.base_dataset import InputDataset from nerfstudio.pipelines.base_pipeline import Pipeline, VanillaPipeline -from nerfstudio.utils.rich_utils import ItersPerSecColumn - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE, ItersPerSecColumn @dataclass @@ -122,6 +119,7 @@ def generate_point_cloud( BarColumn(), TaskProgressColumn(show_speed=True), TimeRemainingColumn(elapsed_when_finished=True, compact=True), + console=CONSOLE, ) points = [] rgbs = [] diff --git a/nerfstudio/exporter/texture_utils.py b/nerfstudio/exporter/texture_utils.py index 9c0bb0ee0..e98eedc14 100644 --- a/nerfstudio/exporter/texture_utils.py +++ b/nerfstudio/exporter/texture_utils.py @@ -28,15 +28,12 @@ import mediapy as media import numpy as np import torch import xatlas -from rich.console import Console from torchtyping import TensorType from nerfstudio.cameras.rays import RayBundle from nerfstudio.exporter.exporter_utils import Mesh from nerfstudio.pipelines.base_pipeline import Pipeline -from nerfstudio.utils.rich_utils import get_progress - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE, get_progress TORCH_DEVICE = Union[torch.device, str] # pylint: disable=invalid-name diff --git a/nerfstudio/exporter/tsdf_utils.py b/nerfstudio/exporter/tsdf_utils.py index 2249fde23..1e38bf02c 100644 --- a/nerfstudio/exporter/tsdf_utils.py +++ b/nerfstudio/exporter/tsdf_utils.py @@ -28,14 +28,12 @@ import numpy as np import pymeshlab import torch import torch.nn.functional as F -from rich.console import Console from skimage import measure from torchtyping import TensorType from nerfstudio.exporter.exporter_utils import Mesh, render_trajectory from nerfstudio.pipelines.base_pipeline import Pipeline - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE TORCH_DEVICE = Union[torch.device, str] # pylint: disable=invalid-name diff --git a/nerfstudio/generative/stable_diffusion.py b/nerfstudio/generative/stable_diffusion.py index a3955712b..64dbf152b 100644 --- a/nerfstudio/generative/stable_diffusion.py +++ b/nerfstudio/generative/stable_diffusion.py @@ -27,13 +27,12 @@ import numpy as np import torch import torch.nn.functional as F import tyro -from rich.console import Console from torch import nn from torch.cuda.amp import custom_bwd, custom_fwd from torch.cuda.amp.grad_scaler import GradScaler from torchtyping import TensorType -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE try: from diffusers import PNDMScheduler, StableDiffusionPipeline diff --git a/nerfstudio/plugins/registry.py b/nerfstudio/plugins/registry.py index 15eb1779d..5654c0775 100644 --- a/nerfstudio/plugins/registry.py +++ b/nerfstudio/plugins/registry.py @@ -21,16 +21,14 @@ import os import sys import typing as t -from rich.progress import Console - from nerfstudio.engine.trainer import TrainerConfig from nerfstudio.plugins.types import MethodSpecification +from nerfstudio.utils.rich_utils import CONSOLE if sys.version_info < (3, 10): from importlib_metadata import entry_points else: from importlib.metadata import entry_points -CONSOLE = Console(width=120) def discover_methods() -> t.Tuple[t.Dict[str, TrainerConfig], t.Dict[str, str]]: diff --git a/nerfstudio/process_data/colmap_converter_to_nerfstudio_dataset.py b/nerfstudio/process_data/colmap_converter_to_nerfstudio_dataset.py index 93a123d93..07ca1f807 100644 --- a/nerfstudio/process_data/colmap_converter_to_nerfstudio_dataset.py +++ b/nerfstudio/process_data/colmap_converter_to_nerfstudio_dataset.py @@ -18,16 +18,13 @@ from dataclasses import dataclass from pathlib import Path from typing import Dict, List, Literal, Optional, Tuple -from rich.console import Console - from nerfstudio.process_data import colmap_utils, hloc_utils, process_data_utils from nerfstudio.process_data.base_converter_to_nerfstudio_dataset import ( BaseConverterToNerfstudioDataset, ) from nerfstudio.process_data.process_data_utils import CAMERA_MODELS from nerfstudio.utils import install_checks - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE @dataclass diff --git a/nerfstudio/process_data/colmap_utils.py b/nerfstudio/process_data/colmap_utils.py index 690080771..91cd63028 100644 --- a/nerfstudio/process_data/colmap_utils.py +++ b/nerfstudio/process_data/colmap_utils.py @@ -25,7 +25,6 @@ import cv2 import numpy as np import requests import torch -from rich.console import Console from rich.progress import track # TODO(1480) use pycolmap instead of colmap_parsing_utils @@ -38,11 +37,9 @@ from nerfstudio.data.utils.colmap_parsing_utils import ( ) from nerfstudio.process_data.process_data_utils import CameraModel from nerfstudio.utils import colormaps -from nerfstudio.utils.rich_utils import status +from nerfstudio.utils.rich_utils import CONSOLE, status from nerfstudio.utils.scripts import run_command -CONSOLE = Console(width=120) - def get_colmap_version(colmap_cmd: str, default_version=3.8) -> float: """Returns the version of COLMAP. diff --git a/nerfstudio/process_data/equirect_utils.py b/nerfstudio/process_data/equirect_utils.py index 340dd7884..e8e213c1b 100644 --- a/nerfstudio/process_data/equirect_utils.py +++ b/nerfstudio/process_data/equirect_utils.py @@ -23,7 +23,6 @@ import cv2 import numpy as np import torch from equilib import Equi2Pers -from rich.console import Console from rich.progress import ( BarColumn, Progress, @@ -32,9 +31,7 @@ from rich.progress import ( TimeRemainingColumn, ) -from nerfstudio.utils.rich_utils import ItersPerSecColumn - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE, ItersPerSecColumn def _crop_bottom(bound_arr: list, fov: int, crop_factor: float) -> List[float]: diff --git a/nerfstudio/process_data/hloc_utils.py b/nerfstudio/process_data/hloc_utils.py index eda02cae1..7c41dff43 100644 --- a/nerfstudio/process_data/hloc_utils.py +++ b/nerfstudio/process_data/hloc_utils.py @@ -23,9 +23,8 @@ import sys from pathlib import Path from typing import Literal -from rich.console import Console - from nerfstudio.process_data.process_data_utils import CameraModel +from nerfstudio.utils.rich_utils import CONSOLE try: # TODO(1480) un-hide pycolmap import @@ -49,8 +48,6 @@ except ImportError: else: _HAS_PIXSFM = True -CONSOLE = Console(width=120) - def run_hloc( image_dir: Path, diff --git a/nerfstudio/process_data/images_to_nerfstudio_dataset.py b/nerfstudio/process_data/images_to_nerfstudio_dataset.py index dc6163816..46ef853d0 100644 --- a/nerfstudio/process_data/images_to_nerfstudio_dataset.py +++ b/nerfstudio/process_data/images_to_nerfstudio_dataset.py @@ -17,14 +17,11 @@ from dataclasses import dataclass from typing import Optional -from rich.console import Console - from nerfstudio.process_data import equirect_utils, process_data_utils from nerfstudio.process_data.colmap_converter_to_nerfstudio_dataset import ( ColmapConverterToNerfstudioDataset, ) - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE @dataclass diff --git a/nerfstudio/process_data/metashape_utils.py b/nerfstudio/process_data/metashape_utils.py index 414a31ff8..53967b964 100644 --- a/nerfstudio/process_data/metashape_utils.py +++ b/nerfstudio/process_data/metashape_utils.py @@ -20,11 +20,9 @@ from pathlib import Path from typing import Dict, List import numpy as np -from rich.console import Console from nerfstudio.process_data.process_data_utils import CAMERA_MODELS - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE def _find_param(calib_xml: ET.Element, param_name: str): diff --git a/nerfstudio/process_data/polycam_utils.py b/nerfstudio/process_data/polycam_utils.py index a101c5062..547f3557f 100644 --- a/nerfstudio/process_data/polycam_utils.py +++ b/nerfstudio/process_data/polycam_utils.py @@ -19,13 +19,10 @@ import sys from pathlib import Path from typing import List, Tuple -from rich.console import Console - from nerfstudio.process_data import process_data_utils from nerfstudio.process_data.process_data_utils import CAMERA_MODELS from nerfstudio.utils import io - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE def polycam_to_json( diff --git a/nerfstudio/process_data/process_data_utils.py b/nerfstudio/process_data/process_data_utils.py index 74a981826..b8a754cee 100644 --- a/nerfstudio/process_data/process_data_utils.py +++ b/nerfstudio/process_data/process_data_utils.py @@ -24,12 +24,10 @@ from typing import List, Literal, Optional, OrderedDict, Tuple import cv2 import numpy as np -from rich.console import Console -from nerfstudio.utils.rich_utils import status +from nerfstudio.utils.rich_utils import CONSOLE, status from nerfstudio.utils.scripts import run_command -CONSOLE = Console(width=120) POLYCAM_UPSCALING_TIMES = 2 diff --git a/nerfstudio/process_data/realitycapture_utils.py b/nerfstudio/process_data/realitycapture_utils.py index 918aa84a5..5ca83f982 100644 --- a/nerfstudio/process_data/realitycapture_utils.py +++ b/nerfstudio/process_data/realitycapture_utils.py @@ -21,11 +21,9 @@ from typing import List import numpy as np from PIL import Image -from rich.console import Console from nerfstudio.process_data.process_data_utils import CAMERA_MODELS - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE def realitycapture_to_json( diff --git a/nerfstudio/process_data/record3d_utils.py b/nerfstudio/process_data/record3d_utils.py index ed7393086..65bbd9677 100644 --- a/nerfstudio/process_data/record3d_utils.py +++ b/nerfstudio/process_data/record3d_utils.py @@ -19,14 +19,11 @@ from pathlib import Path from typing import List import numpy as np -from rich.console import Console from scipy.spatial.transform import Rotation from nerfstudio.process_data.process_data_utils import CAMERA_MODELS from nerfstudio.utils import io -CONSOLE = Console(width=120) - def record3d_to_json(images_paths: List[Path], metadata_path: Path, output_dir: Path, indices: np.ndarray) -> int: """Converts Record3D's metadata and image paths to a JSON file. diff --git a/nerfstudio/process_data/video_to_nerfstudio_dataset.py b/nerfstudio/process_data/video_to_nerfstudio_dataset.py index f8054ff42..3ac26867e 100644 --- a/nerfstudio/process_data/video_to_nerfstudio_dataset.py +++ b/nerfstudio/process_data/video_to_nerfstudio_dataset.py @@ -17,14 +17,11 @@ import shutil from dataclasses import dataclass -from rich.console import Console - from nerfstudio.process_data import equirect_utils, process_data_utils from nerfstudio.process_data.colmap_converter_to_nerfstudio_dataset import ( ColmapConverterToNerfstudioDataset, ) - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE @dataclass diff --git a/nerfstudio/scripts/completions/install.py b/nerfstudio/scripts/completions/install.py index cba1d672b..9f60e3c7e 100644 --- a/nerfstudio/scripts/completions/install.py +++ b/nerfstudio/scripts/completions/install.py @@ -28,10 +28,11 @@ from typing import List, Literal, Optional, Union from typing import get_args as typing_get_args import tyro -from rich.console import Console from rich.prompt import Confirm from typing_extensions import assert_never +from nerfstudio.utils.rich_utils import CONSOLE + if sys.version_info < (3, 10): import importlib_metadata else: @@ -40,7 +41,6 @@ else: ConfigureMode = Literal["install", "uninstall"] ShellType = Literal["zsh", "bash"] -CONSOLE = Console(width=120) HEADER_LINE = "# Source nerfstudio autocompletions." diff --git a/nerfstudio/scripts/docs/add_nb_tags.py b/nerfstudio/scripts/docs/add_nb_tags.py index a110e0d76..f6bff26ed 100644 --- a/nerfstudio/scripts/docs/add_nb_tags.py +++ b/nerfstudio/scripts/docs/add_nb_tags.py @@ -19,9 +19,8 @@ from glob import glob import nbformat as nbf import tyro -from rich.console import Console -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE def main(check: bool = False): diff --git a/nerfstudio/scripts/docs/build_docs.py b/nerfstudio/scripts/docs/build_docs.py index 1959220a1..d699ea630 100644 --- a/nerfstudio/scripts/docs/build_docs.py +++ b/nerfstudio/scripts/docs/build_docs.py @@ -18,10 +18,9 @@ import subprocess import sys import tyro -from rich.console import Console from rich.style import Style -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE LOCAL_TESTS = ["Run license checks", "Run Black", "Python Pylint", "Test with pytest"] diff --git a/nerfstudio/scripts/downloads/download_data.py b/nerfstudio/scripts/downloads/download_data.py index d97dd659b..828c632e6 100644 --- a/nerfstudio/scripts/downloads/download_data.py +++ b/nerfstudio/scripts/downloads/download_data.py @@ -25,15 +25,12 @@ from typing import Union import gdown import tyro -from rich.console import Console from typing_extensions import Annotated from nerfstudio.configs.base_config import PrintableConfig from nerfstudio.utils import install_checks from nerfstudio.utils.scripts import run_command -CONSOLE = Console(width=120) - @dataclass class DatasetDownload(PrintableConfig): diff --git a/nerfstudio/scripts/eval.py b/nerfstudio/scripts/eval.py index 517da3179..b36035a21 100644 --- a/nerfstudio/scripts/eval.py +++ b/nerfstudio/scripts/eval.py @@ -23,11 +23,9 @@ from dataclasses import dataclass from pathlib import Path import tyro -from rich.console import Console from nerfstudio.utils.eval_utils import eval_setup - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE @dataclass diff --git a/nerfstudio/scripts/exporter.py b/nerfstudio/scripts/exporter.py index dfca20637..37fd16412 100644 --- a/nerfstudio/scripts/exporter.py +++ b/nerfstudio/scripts/exporter.py @@ -31,7 +31,6 @@ import numpy as np import open3d as o3d import torch import tyro -from rich.console import Console from typing_extensions import Annotated, Literal from nerfstudio.cameras.rays import RayBundle @@ -46,8 +45,7 @@ from nerfstudio.exporter.marching_cubes import ( ) from nerfstudio.pipelines.base_pipeline import Pipeline, VanillaPipeline from nerfstudio.utils.eval_utils import eval_setup - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE @dataclass diff --git a/nerfstudio/scripts/generative/trace_stable_diffusion.py b/nerfstudio/scripts/generative/trace_stable_diffusion.py index 3a426cb2c..eb72d9455 100644 --- a/nerfstudio/scripts/generative/trace_stable_diffusion.py +++ b/nerfstudio/scripts/generative/trace_stable_diffusion.py @@ -22,11 +22,9 @@ from pathlib import Path import appdirs import torch import tyro -from rich.console import Console from nerfstudio.generative.stable_diffusion import SD_IDENTIFIERS - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE try: from diffusers import StableDiffusionPipeline diff --git a/nerfstudio/scripts/github/run_actions.py b/nerfstudio/scripts/github/run_actions.py index 8f5bb7ce1..42dad8f71 100644 --- a/nerfstudio/scripts/github/run_actions.py +++ b/nerfstudio/scripts/github/run_actions.py @@ -19,10 +19,9 @@ import sys import tyro import yaml -from rich.console import Console from rich.style import Style -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE LOCAL_TESTS = ["Run license checks", "Run isort", "Run Black", "Python Pylint", "Test with pytest"] diff --git a/nerfstudio/scripts/process_data.py b/nerfstudio/scripts/process_data.py index 4c2f3829b..ab9179014 100644 --- a/nerfstudio/scripts/process_data.py +++ b/nerfstudio/scripts/process_data.py @@ -24,7 +24,6 @@ from typing import Union import numpy as np import tyro -from rich.console import Console from typing_extensions import Annotated from nerfstudio.process_data import ( @@ -41,8 +40,7 @@ from nerfstudio.process_data.images_to_nerfstudio_dataset import ( ImagesToNerfstudioDataset, ) from nerfstudio.process_data.video_to_nerfstudio_dataset import VideoToNerfstudioDataset - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE @dataclass diff --git a/nerfstudio/scripts/render.py b/nerfstudio/scripts/render.py index ae6937380..628be9d2e 100644 --- a/nerfstudio/scripts/render.py +++ b/nerfstudio/scripts/render.py @@ -32,7 +32,6 @@ import numpy as np import torch import tyro from rich import box, style -from rich.console import Console from rich.panel import Panel from rich.progress import ( BarColumn, @@ -56,9 +55,7 @@ from nerfstudio.model_components import renderers from nerfstudio.pipelines.base_pipeline import Pipeline from nerfstudio.utils import colormaps, install_checks from nerfstudio.utils.eval_utils import eval_setup -from nerfstudio.utils.rich_utils import ItersPerSecColumn - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE, ItersPerSecColumn def _render_trajectory_video( diff --git a/nerfstudio/scripts/texture.py b/nerfstudio/scripts/texture.py index 98f26b846..2cb7c245b 100644 --- a/nerfstudio/scripts/texture.py +++ b/nerfstudio/scripts/texture.py @@ -23,14 +23,11 @@ from pathlib import Path from typing import Literal, Optional import tyro -from rich.console import Console from nerfstudio.exporter import texture_utils from nerfstudio.exporter.exporter_utils import get_mesh_from_filename from nerfstudio.utils.eval_utils import eval_setup -CONSOLE = Console(width=120) - @dataclass class TextureMesh: diff --git a/nerfstudio/scripts/train.py b/nerfstudio/scripts/train.py index 408e80d2b..a06a43668 100644 --- a/nerfstudio/scripts/train.py +++ b/nerfstudio/scripts/train.py @@ -57,14 +57,13 @@ import torch.distributed as dist import torch.multiprocessing as mp import tyro import yaml -from rich.console import Console from nerfstudio.configs.config_utils import convert_markup_to_ansi from nerfstudio.configs.method_configs import AnnotatedBaseConfigUnion from nerfstudio.engine.trainer import TrainerConfig from nerfstudio.utils import comms, profiler +from nerfstudio.utils.rich_utils import CONSOLE -CONSOLE = Console(width=120) DEFAULT_TIMEOUT = timedelta(minutes=30) # speedup for when input size to model doesn't change (much) diff --git a/nerfstudio/scripts/viewer/run_viewer.py b/nerfstudio/scripts/viewer/run_viewer.py index 62abe8941..a8e273c69 100644 --- a/nerfstudio/scripts/viewer/run_viewer.py +++ b/nerfstudio/scripts/viewer/run_viewer.py @@ -23,7 +23,6 @@ from dataclasses import dataclass, field, fields from pathlib import Path import tyro -from rich.console import Console from nerfstudio.configs.base_config import ViewerConfig from nerfstudio.engine.trainer import TrainerConfig @@ -32,8 +31,6 @@ from nerfstudio.utils import writer from nerfstudio.utils.eval_utils import eval_setup from nerfstudio.viewer.server.viewer_state import ViewerState -CONSOLE = Console(width=120) - @dataclass class ViewerConfigWithoutNumRays(ViewerConfig): diff --git a/nerfstudio/utils/eval_utils.py b/nerfstudio/utils/eval_utils.py index 5b35c33ff..9518394c9 100644 --- a/nerfstudio/utils/eval_utils.py +++ b/nerfstudio/utils/eval_utils.py @@ -24,12 +24,10 @@ from typing import Literal, Optional, Tuple import torch import yaml -from rich.console import Console from nerfstudio.engine.trainer import TrainerConfig from nerfstudio.pipelines.base_pipeline import Pipeline - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE def eval_load_checkpoint(config: TrainerConfig, pipeline: Pipeline) -> Tuple[Path, int]: diff --git a/nerfstudio/utils/install_checks.py b/nerfstudio/utils/install_checks.py index 6393ed423..431a78f4c 100644 --- a/nerfstudio/utils/install_checks.py +++ b/nerfstudio/utils/install_checks.py @@ -17,9 +17,7 @@ import shutil import sys -from rich.console import Console - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE def check_ffmpeg_installed(): diff --git a/nerfstudio/utils/printing.py b/nerfstudio/utils/printing.py index e6ebc18d1..996adcba9 100644 --- a/nerfstudio/utils/printing.py +++ b/nerfstudio/utils/printing.py @@ -16,9 +16,7 @@ from math import floor, log -from rich.console import Console - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE def print_tcnn_speed_warning(method_name: str): diff --git a/nerfstudio/utils/profiler.py b/nerfstudio/utils/profiler.py index 5d5599de6..5904e8eab 100644 --- a/nerfstudio/utils/profiler.py +++ b/nerfstudio/utils/profiler.py @@ -26,7 +26,6 @@ from contextlib import ContextDecorator, contextmanager from pathlib import Path from typing import Callable, Dict, List, Optional, Tuple, Union -from rich.console import Console from torch.profiler import ProfilerActivity, profile, record_function from nerfstudio.configs import base_config as cfg @@ -36,8 +35,7 @@ from nerfstudio.utils.decorators import ( check_profiler_enabled, decorate_all, ) - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE PROFILER = [] PYTORCH_PROFILER = None diff --git a/nerfstudio/utils/scripts.py b/nerfstudio/utils/scripts.py index 54443bae3..102c00452 100644 --- a/nerfstudio/utils/scripts.py +++ b/nerfstudio/utils/scripts.py @@ -17,9 +17,7 @@ import subprocess import sys from typing import Optional -from rich.console import Console - -CONSOLE = Console(width=120) +from nerfstudio.utils.rich_utils import CONSOLE def run_command(cmd: str, verbose=False) -> Optional[str]: diff --git a/nerfstudio/utils/writer.py b/nerfstudio/utils/writer.py index d996a7f36..812295015 100644 --- a/nerfstudio/utils/writer.py +++ b/nerfstudio/utils/writer.py @@ -26,15 +26,14 @@ from typing import Any, Dict, List, Optional, Union import torch import wandb -from rich.console import Console from torch.utils.tensorboard import SummaryWriter from torchtyping import TensorType from nerfstudio.configs import base_config as cfg from nerfstudio.utils.decorators import check_main_thread, decorate_all from nerfstudio.utils.printing import human_format +from nerfstudio.utils.rich_utils import CONSOLE -CONSOLE = Console(width=120) to8b = lambda x: (255 * torch.clamp(x, min=0, max=1)).to(torch.uint8) EVENT_WRITERS = [] EVENT_STORAGE = [] diff --git a/nerfstudio/viewer/server/viewer_state.py b/nerfstudio/viewer/server/viewer_state.py index 513bc480c..27d5f853e 100644 --- a/nerfstudio/viewer/server/viewer_state.py +++ b/nerfstudio/viewer/server/viewer_state.py @@ -22,7 +22,6 @@ from typing import TYPE_CHECKING, List, Literal, Optional import numpy as np import torch from rich import box, style -from rich.console import Console from rich.panel import Panel from rich.table import Table @@ -33,6 +32,7 @@ from nerfstudio.models.base_model import Model from nerfstudio.pipelines.base_pipeline import Pipeline from nerfstudio.utils.decorators import check_main_thread, decorate_all from nerfstudio.utils.io import load_from_json, write_to_json +from nerfstudio.utils.rich_utils import CONSOLE from nerfstudio.utils.writer import GLOBAL_BUFFER, EventName from nerfstudio.viewer.server import viewer_utils from nerfstudio.viewer.server.control_panel import ControlPanel @@ -57,8 +57,6 @@ from nerfstudio.viewer.viser.messages import ( if TYPE_CHECKING: from nerfstudio.engine.trainer import Trainer -CONSOLE = Console(width=120) - @decorate_all([check_main_thread]) class ViewerState: diff --git a/nerfstudio/viewer/server/viewer_utils.py b/nerfstudio/viewer/server/viewer_utils.py index e47f652c9..d108b59c0 100644 --- a/nerfstudio/viewer/server/viewer_utils.py +++ b/nerfstudio/viewer/server/viewer_utils.py @@ -24,7 +24,6 @@ from pathlib import Path from typing import TYPE_CHECKING, Optional, Tuple import torch -from rich.console import Console from nerfstudio.data.scene_box import SceneBox from nerfstudio.models.base_model import Model @@ -33,8 +32,6 @@ from nerfstudio.utils.io import load_from_json if TYPE_CHECKING: from nerfstudio.engine.trainer import Trainer -CONSOLE = Console(width=120) - def get_viewer_version() -> str: """Return the version of the viewer."""