From bb154c88013475adcb3cbb7d89879fd6be56aeb5 Mon Sep 17 00:00:00 2001 From: Ethan Weber Date: Fri, 27 Jan 2023 23:22:56 +0000 Subject: [PATCH] cleanup --- nerfstudio/data/datamanagers/base_datamanager.py | 5 +---- nerfstudio/data/pixel_samplers.py | 2 +- nerfstudio/engine/trainer.py | 7 ++++++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nerfstudio/data/datamanagers/base_datamanager.py b/nerfstudio/data/datamanagers/base_datamanager.py index 340816145..7fcc6b44a 100644 --- a/nerfstudio/data/datamanagers/base_datamanager.py +++ b/nerfstudio/data/datamanagers/base_datamanager.py @@ -45,11 +45,8 @@ from nerfstudio.data.dataparsers.friends_dataparser import FriendsDataParserConf from nerfstudio.data.dataparsers.instant_ngp_dataparser import ( InstantNGPDataParserConfig, ) -<<<<<<< HEAD -from nerfstudio.data.dataparsers.mipnerf360_dataparser import Mipnerf360DataParserConfig -======= from nerfstudio.data.dataparsers.minimal_dataparser import MinimalDataParserConfig ->>>>>>> main +from nerfstudio.data.dataparsers.mipnerf360_dataparser import Mipnerf360DataParserConfig from nerfstudio.data.dataparsers.nerfstudio_dataparser import NerfstudioDataParserConfig from nerfstudio.data.dataparsers.nuscenes_dataparser import NuScenesDataParserConfig from nerfstudio.data.dataparsers.phototourism_dataparser import ( diff --git a/nerfstudio/data/pixel_samplers.py b/nerfstudio/data/pixel_samplers.py index 30ab961f0..29db22dd5 100644 --- a/nerfstudio/data/pixel_samplers.py +++ b/nerfstudio/data/pixel_samplers.py @@ -234,4 +234,4 @@ class EquirectangularPixelSampler(PixelSampler): # pylint: disable=too-few-publ * torch.tensor([num_images, image_height, image_width], device=device) ).long() - return indices \ No newline at end of file + return indices diff --git a/nerfstudio/engine/trainer.py b/nerfstudio/engine/trainer.py index 9fa06fe9d..847799c92 100644 --- a/nerfstudio/engine/trainer.py +++ b/nerfstudio/engine/trainer.py @@ -128,7 +128,12 @@ class Trainer: self._check_viewer_warnings() # set up writers/profilers if enabled writer_log_path = self.base_dir / config.logging.relative_log_dir - writer.setup_event_writer(config.is_wandb_enabled(), config.is_tensorboard_enabled(), log_dir=writer_log_path, wandb_name=config.wandb_name) + writer.setup_event_writer( + config.is_wandb_enabled(), + config.is_tensorboard_enabled(), + log_dir=writer_log_path, + wandb_name=config.wandb_name, + ) writer.setup_local_writer(config.logging, max_iter=config.max_num_iterations, banner_messages=banner_messages) writer.put_config(name="config", config_dict=dataclasses.asdict(config), step=0) profiler.setup_profiler(config.logging)