diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml index 6c03b9566..6330c1171 100644 --- a/.github/workflows/code_checks.yml +++ b/.github/workflows/code_checks.yml @@ -27,6 +27,8 @@ jobs: - name: Run license checks run: | ./scripts/licensing/license_headers.sh --check + - name: Run isort + run: isort . --profile black --check - name: Run Black run: black nerfactory/ scripts/ notebooks/ --check - name: Python Pylint diff --git a/.vscode/settings.json b/.vscode/settings.json index d84fbc08b..325dd6c8b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,10 @@ }, "editor.defaultFormatter": "esbenp.prettier-vscode", "[python]": { - "editor.defaultFormatter": "ms-python.python" + "editor.defaultFormatter": "ms-python.python", + "editor.codeActionsOnSave": { + "source.organizeImports": true + }, }, "editor.formatOnSave": true, "python.envFile": "${workspaceFolder}/.env", diff --git a/nerfactory/cameras/camera_paths.py b/nerfactory/cameras/camera_paths.py index 8b24971fa..8c3a3ebae 100644 --- a/nerfactory/cameras/camera_paths.py +++ b/nerfactory/cameras/camera_paths.py @@ -21,10 +21,14 @@ from dataclasses import dataclass from typing import List, Tuple import torch -from nerfactory.cameras.cameras import Camera, get_camera, get_intrinsics_from_intrinsics_matrix -from nerfactory.cameras.utils import get_interpolated_poses_many import nerfactory.cameras.utils as camera_utils +from nerfactory.cameras.cameras import ( + Camera, + get_camera, + get_intrinsics_from_intrinsics_matrix, +) +from nerfactory.cameras.utils import get_interpolated_poses_many @dataclass diff --git a/nerfactory/data/colmap_utils.py b/nerfactory/data/colmap_utils.py index e0c7db998..d85872c1c 100644 --- a/nerfactory/data/colmap_utils.py +++ b/nerfactory/data/colmap_utils.py @@ -35,12 +35,12 @@ Original file at https://github.com/colmap/colmap/blob/1a4d0bad2e90aa65ce997c9d1 # # Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -import os -import collections -import numpy as np -import struct import argparse +import collections +import os +import struct +import numpy as np CameraModel = collections.namedtuple("CameraModel", ["model_id", "model_name", "num_params"]) Camera = collections.namedtuple("Camera", ["id", "model", "width", "height", "params"]) diff --git a/nerfactory/data/dataloader.py b/nerfactory/data/dataloader.py index c86a335ff..5bf036992 100644 --- a/nerfactory/data/dataloader.py +++ b/nerfactory/data/dataloader.py @@ -19,24 +19,27 @@ Data loader. import random from abc import abstractmethod from typing import Dict, List, Optional, Tuple, Union -from omegaconf import ListConfig import torch +from omegaconf import ListConfig from torch import nn from torchtyping import TensorType - from nerfactory.cameras.cameras import Camera, get_camera from nerfactory.cameras.rays import RayBundle from nerfactory.data.image_dataset import ImageDataset from nerfactory.data.image_sampler import ImageSampler from nerfactory.data.pixel_sampler import PixelSampler -from nerfactory.data.structs import DatasetInputs, BaseDataContainer +from nerfactory.data.structs import BaseDataContainer, DatasetInputs from nerfactory.data.utils import get_dataset_inputs_from_dataset_config from nerfactory.graphs.modules.ray_generator import RayGenerator from nerfactory.utils import profiler from nerfactory.utils.config import DataConfig -from nerfactory.utils.misc import IterableWrapper, get_dict_to_torch, instantiate_from_dict_config +from nerfactory.utils.misc import ( + IterableWrapper, + get_dict_to_torch, + instantiate_from_dict_config, +) @profiler.time_function diff --git a/nerfactory/data/format/friends.py b/nerfactory/data/format/friends.py index ee51a076a..be1389d5c 100644 --- a/nerfactory/data/format/friends.py +++ b/nerfactory/data/format/friends.py @@ -21,7 +21,11 @@ import os import numpy as np import torch -from nerfactory.data.colmap_utils import read_cameras_binary, read_images_binary, read_pointsTD_binary +from nerfactory.data.colmap_utils import ( + read_cameras_binary, + read_images_binary, + read_pointsTD_binary, +) from nerfactory.data.structs import DatasetInputs, PointCloud, SceneBounds, Semantics from nerfactory.utils import profiler from nerfactory.utils.io import load_from_json diff --git a/nerfactory/data/image_dataset.py b/nerfactory/data/image_dataset.py index a5c279a4d..d58b5425c 100644 --- a/nerfactory/data/image_dataset.py +++ b/nerfactory/data/image_dataset.py @@ -27,7 +27,6 @@ from PIL import Image from torchtyping import TensorType from nerfactory.data.structs import Semantics - from nerfactory.utils.misc import is_not_none diff --git a/nerfactory/data/image_sampler.py b/nerfactory/data/image_sampler.py index 9ac4288e6..a271b42c1 100644 --- a/nerfactory/data/image_sampler.py +++ b/nerfactory/data/image_sampler.py @@ -16,8 +16,8 @@ Code for sampling images from a dataset of images. """ -from abc import abstractmethod import random +from abc import abstractmethod from typing import Union import torch diff --git a/nerfactory/engine/trainer.py b/nerfactory/engine/trainer.py index 64f0bb32c..132355dfb 100644 --- a/nerfactory/engine/trainer.py +++ b/nerfactory/engine/trainer.py @@ -27,7 +27,11 @@ from torch.nn.parallel import DistributedDataParallel as DDP from torchtyping import TensorType from nerfactory.cameras.rays import RayBundle -from nerfactory.data.dataloader import EvalDataloader, setup_dataset_eval, setup_dataset_train +from nerfactory.data.dataloader import ( + EvalDataloader, + setup_dataset_eval, + setup_dataset_train, +) from nerfactory.graphs.base import setup_graph from nerfactory.optimizers.optimizers import setup_optimizers from nerfactory.utils import profiler, writer diff --git a/nerfactory/fields/modules/__init__.py b/nerfactory/fields/modules/__init__.py index c4df6c625..9189165d1 100644 --- a/nerfactory/fields/modules/__init__.py +++ b/nerfactory/fields/modules/__init__.py @@ -13,6 +13,6 @@ # limitations under the License. """init field modules""" +from .base import FieldModule from .encoding import Encoding, ScalingAndOffset from .mlp import MLP -from .base import FieldModule diff --git a/nerfactory/fields/modules/embedding.py b/nerfactory/fields/modules/embedding.py index 6066996f4..354e49cd5 100644 --- a/nerfactory/fields/modules/embedding.py +++ b/nerfactory/fields/modules/embedding.py @@ -19,6 +19,7 @@ Code for embeddings. import torch from torchtyping import TensorType + from nerfactory.fields.modules.base import FieldModule diff --git a/nerfactory/fields/modules/mlp.py b/nerfactory/fields/modules/mlp.py index 461d44e38..f61ba7451 100644 --- a/nerfactory/fields/modules/mlp.py +++ b/nerfactory/fields/modules/mlp.py @@ -15,7 +15,7 @@ """ Multi Layer Perceptron """ -from typing import Tuple, Optional +from typing import Optional, Tuple import torch from torch import nn diff --git a/nerfactory/fields/nerf_field.py b/nerfactory/fields/nerf_field.py index 88cefb527..3d8e3c8d6 100644 --- a/nerfactory/fields/nerf_field.py +++ b/nerfactory/fields/nerf_field.py @@ -21,11 +21,16 @@ import torch from torch import nn from torchtyping import TensorType -from nerfactory.fields.modules.encoding import Encoding, Identity -from nerfactory.fields.modules.field_heads import DensityFieldHead, FieldHead, FieldHeadNames, RGBFieldHead -from nerfactory.fields.modules.mlp import MLP -from nerfactory.fields.base import Field from nerfactory.cameras.rays import RaySamples +from nerfactory.fields.base import Field +from nerfactory.fields.modules.encoding import Encoding, Identity +from nerfactory.fields.modules.field_heads import ( + DensityFieldHead, + FieldHead, + FieldHeadNames, + RGBFieldHead, +) +from nerfactory.fields.modules.mlp import MLP from nerfactory.fields.modules.spatial_distortions import SpatialDistortion diff --git a/nerfactory/fields/nerfw_field.py b/nerfactory/fields/nerfw_field.py index 6269ccc18..f02860c6a 100644 --- a/nerfactory/fields/nerfw_field.py +++ b/nerfactory/fields/nerfw_field.py @@ -20,6 +20,8 @@ import torch from torch import nn from torchtyping import TensorType +from nerfactory.cameras.rays import RaySamples +from nerfactory.fields.base import Field from nerfactory.fields.modules.embedding import Embedding from nerfactory.fields.modules.encoding import Encoding, Identity from nerfactory.fields.modules.field_heads import ( @@ -31,8 +33,6 @@ from nerfactory.fields.modules.field_heads import ( UncertaintyFieldHead, ) from nerfactory.fields.modules.mlp import MLP -from nerfactory.fields.base import Field -from nerfactory.cameras.rays import RaySamples class VanillaNerfWField(Field): diff --git a/nerfactory/graphs/base.py b/nerfactory/graphs/base.py index 17ef4fa22..2a5e935a6 100644 --- a/nerfactory/graphs/base.py +++ b/nerfactory/graphs/base.py @@ -31,7 +31,11 @@ from nerfactory.data.structs import DatasetInputs, SceneBounds from nerfactory.graphs.modules.ray_generator import RayGenerator from nerfactory.utils import profiler from nerfactory.utils.config import GraphConfig -from nerfactory.utils.misc import get_masked_dict, instantiate_from_dict_config, is_not_none +from nerfactory.utils.misc import ( + get_masked_dict, + instantiate_from_dict_config, + is_not_none, +) @profiler.time_function diff --git a/nerfactory/graphs/mipnerf.py b/nerfactory/graphs/mipnerf.py index f4f2e3a72..e3535be5a 100644 --- a/nerfactory/graphs/mipnerf.py +++ b/nerfactory/graphs/mipnerf.py @@ -22,19 +22,22 @@ from typing import Dict, List import torch from torch.nn import Parameter from torchmetrics import PeakSignalNoiseRatio -from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity from torchmetrics.functional import structural_similarity_index_measure +from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity +from nerfactory.cameras.rays import RayBundle from nerfactory.fields.modules.encoding import NeRFEncoding from nerfactory.fields.modules.field_heads import FieldHeadNames from nerfactory.fields.nerf_field import NeRFField from nerfactory.graphs.base import Graph -from nerfactory.optimizers.loss import MSELoss from nerfactory.graphs.modules.ray_sampler import PDFSampler, UniformSampler -from nerfactory.renderers.renderers import AccumulationRenderer, DepthRenderer, RGBRenderer -from nerfactory.utils import colors -from nerfactory.cameras.rays import RayBundle -from nerfactory.utils import visualization, writer +from nerfactory.optimizers.loss import MSELoss +from nerfactory.renderers.renderers import ( + AccumulationRenderer, + DepthRenderer, + RGBRenderer, +) +from nerfactory.utils import colors, visualization, writer class MipNerfGraph(Graph): diff --git a/nerfactory/graphs/mipnerf_360.py b/nerfactory/graphs/mipnerf_360.py index 6273db268..8d699183d 100644 --- a/nerfactory/graphs/mipnerf_360.py +++ b/nerfactory/graphs/mipnerf_360.py @@ -22,21 +22,24 @@ from typing import Dict, List import torch from torch.nn import Parameter from torchmetrics import PeakSignalNoiseRatio -from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity from torchmetrics.functional import structural_similarity_index_measure +from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity +from nerfactory.cameras.rays import RayBundle from nerfactory.fields.modules.encoding import NeRFEncoding from nerfactory.fields.modules.field_heads import FieldHeadNames from nerfactory.fields.modules.spatial_distortions import SceneContraction from nerfactory.fields.nerf_field import NeRFField from nerfactory.graphs.base import Graph from nerfactory.graphs.modules.ray_losses import distortion_loss -from nerfactory.optimizers.loss import MSELoss from nerfactory.graphs.modules.ray_sampler import PDFSampler, UniformSampler -from nerfactory.renderers.renderers import AccumulationRenderer, DepthRenderer, RGBRenderer -from nerfactory.utils import colors -from nerfactory.cameras.rays import RayBundle -from nerfactory.utils import visualization, writer +from nerfactory.optimizers.loss import MSELoss +from nerfactory.renderers.renderers import ( + AccumulationRenderer, + DepthRenderer, + RGBRenderer, +) +from nerfactory.utils import colors, visualization, writer class MipNerf360Graph(Graph): diff --git a/nerfactory/graphs/modules/ray_generator.py b/nerfactory/graphs/modules/ray_generator.py index 6c768d525..18000b1d7 100644 --- a/nerfactory/graphs/modules/ray_generator.py +++ b/nerfactory/graphs/modules/ray_generator.py @@ -17,8 +17,9 @@ Ray generator. """ from torch import nn from torchtyping import TensorType -from nerfactory.cameras.rays import RayBundle + from nerfactory.cameras.cameras import get_camera_model +from nerfactory.cameras.rays import RayBundle class RayGenerator(nn.Module): diff --git a/nerfactory/graphs/modules/scene_colliders.py b/nerfactory/graphs/modules/scene_colliders.py index 69cedc3b8..00be90ade 100644 --- a/nerfactory/graphs/modules/scene_colliders.py +++ b/nerfactory/graphs/modules/scene_colliders.py @@ -18,8 +18,9 @@ Ray generator. import torch from torch import nn from torchtyping import TensorType -from nerfactory.data.structs import SceneBounds + from nerfactory.cameras.rays import RayBundle +from nerfactory.data.structs import SceneBounds class SceneBoundsCollider(nn.Module): diff --git a/nerfactory/graphs/nerfw.py b/nerfactory/graphs/nerfw.py index 21bc5b354..8a7d9b7b7 100644 --- a/nerfactory/graphs/nerfw.py +++ b/nerfactory/graphs/nerfw.py @@ -18,20 +18,24 @@ NeRF-W (NeRF in the wild) implementation. import torch from torchmetrics import PeakSignalNoiseRatio -from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity from torchmetrics.functional import structural_similarity_index_measure +from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity +from nerfactory.cameras.rays import RayBundle from nerfactory.fields.modules.encoding import NeRFEncoding from nerfactory.fields.modules.field_heads import FieldHeadNames from nerfactory.fields.nerf_field import NeRFField from nerfactory.fields.nerfw_field import VanillaNerfWField from nerfactory.graphs.base import Graph -from nerfactory.optimizers.loss import MSELoss from nerfactory.graphs.modules.ray_sampler import PDFSampler, UniformSampler -from nerfactory.renderers.renderers import AccumulationRenderer, DepthRenderer, RGBRenderer, UncertaintyRenderer -from nerfactory.utils import colors -from nerfactory.cameras.rays import RayBundle -from nerfactory.utils import visualization, writer +from nerfactory.optimizers.loss import MSELoss +from nerfactory.renderers.renderers import ( + AccumulationRenderer, + DepthRenderer, + RGBRenderer, + UncertaintyRenderer, +) +from nerfactory.utils import colors, visualization, writer class NerfWGraph(Graph): diff --git a/nerfactory/graphs/semantic_nerf.py b/nerfactory/graphs/semantic_nerf.py index ba6c36342..c9759223f 100644 --- a/nerfactory/graphs/semantic_nerf.py +++ b/nerfactory/graphs/semantic_nerf.py @@ -21,16 +21,21 @@ from typing import Dict, Optional, Tuple import torch from torch import nn from torchtyping import TensorType -from nerfactory.data.structs import Semantics -from nerfactory.fields.modules.encoding import Encoding, Identity, NeRFEncoding -from nerfactory.fields.modules.field_heads import DensityFieldHead, FieldHeadNames, RGBFieldHead, SemanticFieldHead -from nerfactory.fields.modules.mlp import MLP +from nerfactory.cameras.rays import RayBundle, RaySamples +from nerfactory.data.structs import Semantics from nerfactory.fields.base import Field +from nerfactory.fields.modules.encoding import Encoding, Identity, NeRFEncoding +from nerfactory.fields.modules.field_heads import ( + DensityFieldHead, + FieldHeadNames, + RGBFieldHead, + SemanticFieldHead, +) +from nerfactory.fields.modules.mlp import MLP from nerfactory.fields.nerf_field import NeRFField from nerfactory.graphs.vanilla_nerf import NeRFGraph from nerfactory.renderers.renderers import SemanticRenderer -from nerfactory.cameras.rays import RaySamples, RayBundle from nerfactory.utils import writer diff --git a/nerfactory/graphs/vanilla_nerf.py b/nerfactory/graphs/vanilla_nerf.py index c68ac34b1..e7f664655 100644 --- a/nerfactory/graphs/vanilla_nerf.py +++ b/nerfactory/graphs/vanilla_nerf.py @@ -22,19 +22,22 @@ from typing import Dict, List import torch from torch.nn import Parameter from torchmetrics import PeakSignalNoiseRatio -from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity from torchmetrics.functional import structural_similarity_index_measure +from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity +from nerfactory.cameras.rays import RayBundle from nerfactory.fields.modules.encoding import NeRFEncoding from nerfactory.fields.modules.field_heads import FieldHeadNames from nerfactory.fields.nerf_field import NeRFField from nerfactory.graphs.base import Graph -from nerfactory.optimizers.loss import MSELoss from nerfactory.graphs.modules.ray_sampler import PDFSampler, UniformSampler -from nerfactory.renderers.renderers import AccumulationRenderer, DepthRenderer, RGBRenderer -from nerfactory.utils import colors -from nerfactory.cameras.rays import RayBundle -from nerfactory.utils import visualization, writer +from nerfactory.optimizers.loss import MSELoss +from nerfactory.renderers.renderers import ( + AccumulationRenderer, + DepthRenderer, + RGBRenderer, +) +from nerfactory.utils import colors, visualization, writer class NeRFGraph(Graph): diff --git a/nerfactory/renderers/renderers.py b/nerfactory/renderers/renderers.py index a57008a85..672c6d6f5 100644 --- a/nerfactory/renderers/renderers.py +++ b/nerfactory/renderers/renderers.py @@ -32,8 +32,8 @@ from typing import Optional import torch from torch import nn from torchtyping import TensorType -from nerfactory.cameras.rays import RaySamples +from nerfactory.cameras.rays import RaySamples from nerfactory.utils.math import components_from_spherical_harmonics diff --git a/nerfactory/utils/colors.py b/nerfactory/utils/colors.py index 8e12d2127..9b5688ccf 100644 --- a/nerfactory/utils/colors.py +++ b/nerfactory/utils/colors.py @@ -14,8 +14,9 @@ """Common Colors""" from typing import Union -from omegaconf import ListConfig + import torch +from omegaconf import ListConfig from torchtyping import TensorType WHITE = torch.tensor([1.0, 1.0, 1.0]) diff --git a/nerfactory/utils/config.py b/nerfactory/utils/config.py index 481969cd1..6b99a9a0e 100644 --- a/nerfactory/utils/config.py +++ b/nerfactory/utils/config.py @@ -16,7 +16,8 @@ from dataclasses import dataclass from typing import Any, Dict, Optional -from omegaconf import DictConfig, MISSING + +from omegaconf import MISSING, DictConfig @dataclass diff --git a/nerfactory/utils/io.py b/nerfactory/utils/io.py index 4dba8be87..aaa18d33d 100644 --- a/nerfactory/utils/io.py +++ b/nerfactory/utils/io.py @@ -19,7 +19,7 @@ import json import logging import os import pickle -from typing import Any, Tuple, Optional +from typing import Any, Optional, Tuple def load_from_json(filename: str): diff --git a/nerfactory/utils/misc.py b/nerfactory/utils/misc.py index f478191c1..cf26b02e2 100644 --- a/nerfactory/utils/misc.py +++ b/nerfactory/utils/misc.py @@ -18,10 +18,10 @@ Miscellaneous helper code. import hashlib import json +from math import floor, log from pydoc import locate from typing import Any, Callable, Dict -from math import floor, log import torch from omegaconf import DictConfig diff --git a/nerfactory/utils/profiler.py b/nerfactory/utils/profiler.py index bece98d74..41728ed2b 100644 --- a/nerfactory/utils/profiler.py +++ b/nerfactory/utils/profiler.py @@ -21,7 +21,11 @@ from typing import Callable from nerfactory.utils import comms from nerfactory.utils.config import LoggingConfig -from nerfactory.utils.decorators import check_main_thread, check_profiler_enabled, decorate_all +from nerfactory.utils.decorators import ( + check_main_thread, + check_profiler_enabled, + decorate_all, +) PROFILER = [] diff --git a/nerfactory/utils/writer.py b/nerfactory/utils/writer.py index 4ff3afde5..531577a95 100644 --- a/nerfactory/utils/writer.py +++ b/nerfactory/utils/writer.py @@ -27,11 +27,11 @@ from typing import Dict import imageio import numpy as np import torch +import wandb from omegaconf import ListConfig from torch.utils.tensorboard import SummaryWriter from torchtyping import TensorType -import wandb from nerfactory.utils.config import LoggingConfig from nerfactory.utils.decorators import check_main_thread, decorate_all from nerfactory.utils.misc import human_format diff --git a/nerfactory/viewer/server/cameras.py b/nerfactory/viewer/server/cameras.py index 5a453d010..026592def 100644 --- a/nerfactory/viewer/server/cameras.py +++ b/nerfactory/viewer/server/cameras.py @@ -15,6 +15,7 @@ """Logic to render Camera objects in the Viewer""" from typing import List, Optional, Tuple + import cv2 import numpy as np diff --git a/nerfactory/viewer/server/commands.py b/nerfactory/viewer/server/commands.py index db99b69a1..fb71748f9 100644 --- a/nerfactory/viewer/server/commands.py +++ b/nerfactory/viewer/server/commands.py @@ -20,6 +20,7 @@ from dataclasses import dataclass from typing import Any, Dict, List import numpy as np + from nerfactory.viewer.server.geometry import ( Mesh, MeshPhongMaterial, diff --git a/nerfactory/viewer/server/server.py b/nerfactory/viewer/server/server.py index 79f1f669d..8201bf9d5 100644 --- a/nerfactory/viewer/server/server.py +++ b/nerfactory/viewer/server/server.py @@ -19,12 +19,12 @@ from __future__ import absolute_import, division, print_function import sys from typing import Callable, List, Optional +import msgpack +import msgpack_numpy import tornado.gen import tornado.ioloop import tornado.web import tornado.websocket -import msgpack -import msgpack_numpy import umsgpack import zmq import zmq.eventloop.ioloop diff --git a/nerfactory/viewer/server/utils.py b/nerfactory/viewer/server/utils.py index 0145c829e..b769190bd 100644 --- a/nerfactory/viewer/server/utils.py +++ b/nerfactory/viewer/server/utils.py @@ -16,10 +16,15 @@ """ from typing import Any, Dict, List, Optional, Tuple + import numpy as np import torch -from nerfactory.cameras.cameras import Camera, get_camera, get_intrinsics_from_intrinsics_matrix +from nerfactory.cameras.cameras import ( + Camera, + get_camera, + get_intrinsics_from_intrinsics_matrix, +) from nerfactory.viewer.server.visualizer import Viewer diff --git a/nerfactory/viewer/server/viewer_utils.py b/nerfactory/viewer/server/viewer_utils.py index 1c3a63d19..96153a26b 100644 --- a/nerfactory/viewer/server/viewer_utils.py +++ b/nerfactory/viewer/server/viewer_utils.py @@ -25,17 +25,21 @@ from typing import Any, Dict, List, Optional import numpy as np import torch -from nerfactory.utils.decorators import check_visualizer_enabled, decorate_all import nerfactory.viewer.server.cameras as c import nerfactory.viewer.server.geometry as g -from nerfactory.cameras.cameras import Camera, get_camera, get_intrinsics_from_intrinsics_matrix +from nerfactory.cameras.cameras import ( + Camera, + get_camera, + get_intrinsics_from_intrinsics_matrix, +) from nerfactory.cameras.rays import RayBundle from nerfactory.data.image_dataset import ImageDataset from nerfactory.data.structs import DatasetInputs from nerfactory.graphs.base import Graph from nerfactory.utils import profiler from nerfactory.utils.config import ViewerConfig +from nerfactory.utils.decorators import check_visualizer_enabled, decorate_all from nerfactory.viewer.server.transformations import get_translation_matrix from nerfactory.viewer.server.utils import get_intrinsics_matrix_and_camera_to_world_h from nerfactory.viewer.server.visualizer import Viewer diff --git a/notebooks/notebook_imports.py b/notebooks/notebook_imports.py index d11e1aab0..9165b4d67 100644 --- a/notebooks/notebook_imports.py +++ b/notebooks/notebook_imports.py @@ -2,12 +2,12 @@ import imageio import mediapy as media -# ipython stuff -from IPython import get_ipython - # plotly stuff import plotly.graph_objects as go +# ipython stuff +from IPython import get_ipython + def setup_ipynb(): """ diff --git a/scripts/benchmarking/run_benchmark.py b/scripts/benchmarking/run_benchmark.py index 2a9970c18..1cfca5fe5 100644 --- a/scripts/benchmarking/run_benchmark.py +++ b/scripts/benchmarking/run_benchmark.py @@ -7,15 +7,14 @@ import logging import os from typing import Any, Dict +import numpy as np from hydra import compose, initialize from hydra.core.global_hydra import GlobalHydra -import numpy as np from omegaconf import DictConfig from tqdm import tqdm from scripts.run_eval import run_inference_from_config - OBJECT_LIST = ["mic", "ficus", "chair", "hotdog", "materials", "drums", "ship", "lego"] diff --git a/scripts/debugging/run_actions.py b/scripts/debugging/run_actions.py index c1460a292..b35cc8e30 100644 --- a/scripts/debugging/run_actions.py +++ b/scripts/debugging/run_actions.py @@ -5,7 +5,7 @@ import sys import dcargs import yaml -LOCAL_TESTS = ["Run license checks", "Run Black", "Python Pylint", "Test with pytest"] +LOCAL_TESTS = ["Run license checks", "Run isort", "Run Black", "Python Pylint", "Test with pytest"] def run_command(command: str, continue_on_fail: bool = False) -> None: diff --git a/scripts/run_data_preprocessor.py b/scripts/run_data_preprocessor.py index 467c63a58..74cf05de1 100644 --- a/scripts/run_data_preprocessor.py +++ b/scripts/run_data_preprocessor.py @@ -5,6 +5,7 @@ Script to process different dataset types into our format. # TODO(ethan): we should write a script here to convert from other datasets to our formats # e.g., Blender, LLFF, ShapeNet, DTU from typing import List + from hydra import compose, initialize from nerfactory.data.utils import get_dataset_inputs diff --git a/scripts/run_eval.py b/scripts/run_eval.py index 783cf8fb5..4fc4dd3a7 100644 --- a/scripts/run_eval.py +++ b/scripts/run_eval.py @@ -12,8 +12,16 @@ from hydra import compose, initialize from omegaconf import DictConfig from tqdm import tqdm -from nerfactory.cameras.camera_paths import CameraPath, get_interpolated_camera_path, get_spiral_path -from nerfactory.data.dataloader import EvalDataloader, setup_dataset_eval, setup_dataset_train +from nerfactory.cameras.camera_paths import ( + CameraPath, + get_interpolated_camera_path, + get_spiral_path, +) +from nerfactory.data.dataloader import ( + EvalDataloader, + setup_dataset_eval, + setup_dataset_train, +) from nerfactory.graphs.base import Graph, setup_graph from nerfactory.utils.misc import human_format from nerfactory.utils.writer import TimeWriter diff --git a/scripts/run_viewer_bridge_server.py b/scripts/run_viewer_bridge_server.py index 2edaec9ca..709fa9ae0 100644 --- a/scripts/run_viewer_bridge_server.py +++ b/scripts/run_viewer_bridge_server.py @@ -1,6 +1,7 @@ """View Bridge Server""" import argparse + from nerfactory.viewer.server.server import ZMQWebSocketBridge diff --git a/tests/cameras/test_rays.py b/tests/cameras/test_rays.py index 69cceec52..c536da0c6 100644 --- a/tests/cameras/test_rays.py +++ b/tests/cameras/test_rays.py @@ -4,6 +4,7 @@ Test the ray classes. import pytest import torch + from nerfactory.cameras.rays import Frustums diff --git a/tests/fields/modules/test_encodings.py b/tests/fields/modules/test_encodings.py index 38abb9bf0..c9f8e0e5d 100644 --- a/tests/fields/modules/test_encodings.py +++ b/tests/fields/modules/test_encodings.py @@ -3,6 +3,7 @@ Encoding Tests """ import pytest import torch + from nerfactory.fields.modules import encoding diff --git a/tests/fields/modules/test_field_outputs.py b/tests/fields/modules/test_field_outputs.py index eeba23d43..833a0fe45 100644 --- a/tests/fields/modules/test_field_outputs.py +++ b/tests/fields/modules/test_field_outputs.py @@ -1,9 +1,9 @@ """ Field output tests """ +import pytest import torch from torch import nn -import pytest from nerfactory.fields.modules.field_heads import ( DensityFieldHead, diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py index 2438ac0a1..3968521ab 100644 --- a/tests/fields/test_fields.py +++ b/tests/fields/test_fields.py @@ -3,8 +3,8 @@ Test the fields """ import torch -from nerfactory.fields.instant_ngp_field import TCNNInstantNGPField from nerfactory.cameras.rays import Frustums, RaySamples +from nerfactory.fields.instant_ngp_field import TCNNInstantNGPField def test_tcnn_instant_ngp_field(): diff --git a/tests/graphs/modules/test_ray_sampler.py b/tests/graphs/modules/test_ray_sampler.py index 6c8a98537..95f7ec020 100644 --- a/tests/graphs/modules/test_ray_sampler.py +++ b/tests/graphs/modules/test_ray_sampler.py @@ -2,6 +2,8 @@ Test samplers """ import torch + +from nerfactory.cameras.rays import RayBundle from nerfactory.graphs.modules.ray_sampler import ( LinearDisparitySampler, LogSampler, @@ -9,8 +11,6 @@ from nerfactory.graphs.modules.ray_sampler import ( SqrtSampler, UniformSampler, ) - -from nerfactory.cameras.rays import RayBundle from nerfactory.graphs.modules.scene_colliders import NearFarCollider diff --git a/tests/viewer/test_viewer.py b/tests/viewer/test_viewer.py index d6d50e43a..ed16dd033 100644 --- a/tests/viewer/test_viewer.py +++ b/tests/viewer/test_viewer.py @@ -16,8 +16,11 @@ from nerfactory.cameras.camera_paths import InterpolatedCameraPath from nerfactory.cameras.cameras import get_camera from nerfactory.data.utils import get_dataset_inputs from nerfactory.utils.io import get_absolute_path +from nerfactory.viewer.server.transformations import ( + get_rotation_matrix, + get_translation_matrix, +) from nerfactory.viewer.server.viewer_utils import get_default_vis, set_camera -from nerfactory.viewer.server.transformations import get_rotation_matrix, get_translation_matrix def test_drawing():