From 18be9fa7642806a35dc2e2bb53f637ecbef1ae53 Mon Sep 17 00:00:00 2001 From: terrance Date: Fri, 26 May 2023 22:02:58 +0000 Subject: [PATCH] remove old comments --- .../data/datamanagers/random_cameras_datamanager.py | 12 ------------ nerfstudio/engine/trainer.py | 1 + ...fusion_utils.py => positional_text_embeddings.py} | 0 nerfstudio/models/dreamfusion.py | 2 +- 4 files changed, 2 insertions(+), 13 deletions(-) rename nerfstudio/generative/{dreamfusion_utils.py => positional_text_embeddings.py} (100%) diff --git a/nerfstudio/data/datamanagers/random_cameras_datamanager.py b/nerfstudio/data/datamanagers/random_cameras_datamanager.py index 391e6a503..4269b428a 100644 --- a/nerfstudio/data/datamanagers/random_cameras_datamanager.py +++ b/nerfstudio/data/datamanagers/random_cameras_datamanager.py @@ -247,18 +247,6 @@ class RandomCamerasDataManager(DataManager): # pylint: disable=abstract-method """Returns the next batch of data from the train dataloader.""" self.train_count += 1 - - # # TODO Reimplement when cameras are fully working - # if step > 2000: - # cameras, _, _ = random_train_pose( - # self.config.train_images_per_batch, self.config.train_resolution, device=self.device - # ) - - # ray_bundle = cameras.generate_rays( - # torch.tensor(list(range(self.config.train_images_per_batch))) - # ).flatten() - # return ray_bundle, {"initialization": False} - horizontal_range = min((step / max(1, self.config.horizontal_rotation_warmup)), 1) * 180 cameras, vertical_rotation, central_rotation = random_train_pose( diff --git a/nerfstudio/engine/trainer.py b/nerfstudio/engine/trainer.py index 10dd33849..e856c32ba 100644 --- a/nerfstudio/engine/trainer.py +++ b/nerfstudio/engine/trainer.py @@ -231,6 +231,7 @@ class Trainer: """Train the model.""" assert self.pipeline.datamanager.train_dataset is not None, "Missing DatsetInputs" + # don't want to call save_dataparser_transform if pipeline's datamanager does not have a dataparser if isinstance(self.pipeline.datamanager, VanillaDataManager): self.pipeline.datamanager.train_dataparser_outputs.save_dataparser_transform( self.base_dir / "dataparser_transforms.json" diff --git a/nerfstudio/generative/dreamfusion_utils.py b/nerfstudio/generative/positional_text_embeddings.py similarity index 100% rename from nerfstudio/generative/dreamfusion_utils.py rename to nerfstudio/generative/positional_text_embeddings.py diff --git a/nerfstudio/models/dreamfusion.py b/nerfstudio/models/dreamfusion.py index 52a254b84..3bd163416 100644 --- a/nerfstudio/models/dreamfusion.py +++ b/nerfstudio/models/dreamfusion.py @@ -37,7 +37,7 @@ from nerfstudio.fields.density_fields import HashMLPDensityField from nerfstudio.fields.dreamfusion_field import DreamFusionField from nerfstudio.generative.stable_diffusion import StableDiffusion from nerfstudio.generative.deepfloyd import DeepFloyd -from nerfstudio.generative.dreamfusion_utils import PositionalTextEmbeddings +from nerfstudio.generative.positional_text_embeddings import PositionalTextEmbeddings from nerfstudio.model_components.losses import ( MSELoss, distortion_loss,