From 9bed69601f7497023fb2237a8cea5897e3492b72 Mon Sep 17 00:00:00 2001 From: Matthew Tancik Date: Tue, 18 Oct 2022 16:49:27 -0700 Subject: [PATCH] Support python 3.7 (#802) * Support python 3.7 * Update docs --- README.md | 6 +++++- docs/quickstart/installation.md | 6 +++++- nerfstudio/cameras/camera_optimizers.py | 4 ++-- nerfstudio/cameras/camera_utils.py | 3 ++- nerfstudio/configs/base_config.py | 3 ++- nerfstudio/data/dataparsers/nerfstudio_dataparser.py | 3 ++- nerfstudio/data/dataparsers/record3d_dataparser.py | 3 ++- nerfstudio/field_components/encodings.py | 3 ++- nerfstudio/model_components/renderers.py | 3 ++- nerfstudio/models/nerfacto.py | 3 ++- pyproject.toml | 4 ++-- scripts/completions/install.py | 9 +++------ scripts/downloads/download_data.py | 3 ++- scripts/process_data.py | 4 ++-- scripts/render.py | 4 ++-- 15 files changed, 37 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 8ac9ccf6c..966ceea5e 100644 --- a/README.md +++ b/README.md @@ -72,9 +72,13 @@ For more complex changes (e.g., running with your own data/setting up a new NeRF ## 1. Installation: Setup the environment +### Prerequisites + +CUDA must be installed on the system. This library has been tested with version 11.3. You can find more information about installing CUDA [here](https://docs.nvidia.com/cuda/cuda-quick-start-guide/index.html) + ### Create environment -We recommend using conda to manage dependencies. Make sure to install [Conda](https://docs.conda.io/en/latest/miniconda.html) before proceeding. +Nerfstudio requires `python >= 3.7`. We recommend using conda to manage dependencies. Make sure to install [Conda](https://docs.conda.io/en/latest/miniconda.html) before proceeding. ```bash conda create --name nerfstudio -y python=3.8 diff --git a/docs/quickstart/installation.md b/docs/quickstart/installation.md index 9df96ab24..50199b95f 100644 --- a/docs/quickstart/installation.md +++ b/docs/quickstart/installation.md @@ -1,8 +1,12 @@ # Installation +## Prerequisites + +CUDA must be installed on the system. This library has been tested with version 11.3. You can find more information about installing CUDA [here](https://docs.nvidia.com/cuda/cuda-quick-start-guide/index.html) + ## Create environment -We recommend using conda to manage dependencies. Make sure to install [Conda](https://docs.conda.io/en/latest/miniconda.html) before preceding. +Nerfstudio requires `python >= 3.7`. We recommend using conda to manage dependencies. Make sure to install [Conda](https://docs.conda.io/en/latest/miniconda.html) before preceding. ```bash conda create --name nerfstudio -y python=3.8 diff --git a/nerfstudio/cameras/camera_optimizers.py b/nerfstudio/cameras/camera_optimizers.py index c773d5e71..891cd272a 100644 --- a/nerfstudio/cameras/camera_optimizers.py +++ b/nerfstudio/cameras/camera_optimizers.py @@ -20,13 +20,13 @@ from __future__ import annotations import functools from dataclasses import dataclass, field -from typing import Literal, Type, Union +from typing import Type, Union import torch import tyro from torch import nn from torchtyping import TensorType -from typing_extensions import assert_never +from typing_extensions import Literal, assert_never from nerfstudio.cameras.lie_groups import exp_map_SE3, exp_map_SO3xR3 from nerfstudio.configs import base_config as cfg diff --git a/nerfstudio/cameras/camera_utils.py b/nerfstudio/cameras/camera_utils.py index 5ae29ca49..35f6c1503 100644 --- a/nerfstudio/cameras/camera_utils.py +++ b/nerfstudio/cameras/camera_utils.py @@ -17,11 +17,12 @@ Camera transformation helper code. """ import math -from typing import List, Literal, Optional, Tuple +from typing import List, Optional, Tuple import numpy as np import torch from torchtyping import TensorType +from typing_extensions import Literal _EPS = np.finfo(float).eps * 4.0 diff --git a/nerfstudio/configs/base_config.py b/nerfstudio/configs/base_config.py index e2c518d37..3f1aff36a 100644 --- a/nerfstudio/configs/base_config.py +++ b/nerfstudio/configs/base_config.py @@ -21,10 +21,11 @@ from __future__ import annotations from dataclasses import dataclass from datetime import datetime from pathlib import Path -from typing import Any, Dict, List, Literal, Optional, Tuple, Type +from typing import Any, Dict, List, Optional, Tuple, Type import yaml from rich.console import Console +from typing_extensions import Literal from nerfstudio.configs.config_utils import to_immutable_dict diff --git a/nerfstudio/data/dataparsers/nerfstudio_dataparser.py b/nerfstudio/data/dataparsers/nerfstudio_dataparser.py index 085904d63..66cfbd967 100644 --- a/nerfstudio/data/dataparsers/nerfstudio_dataparser.py +++ b/nerfstudio/data/dataparsers/nerfstudio_dataparser.py @@ -18,12 +18,13 @@ from __future__ import annotations import math from dataclasses import dataclass, field from pathlib import Path, PureWindowsPath -from typing import Literal, Optional, Type +from typing import Optional, Type import numpy as np import torch from PIL import Image from rich.console import Console +from typing_extensions import Literal from nerfstudio.cameras import camera_utils from nerfstudio.cameras.cameras import CAMERA_MODEL_TO_TYPE, Cameras, CameraType diff --git a/nerfstudio/data/dataparsers/record3d_dataparser.py b/nerfstudio/data/dataparsers/record3d_dataparser.py index e3ba5d858..513f9b4c6 100644 --- a/nerfstudio/data/dataparsers/record3d_dataparser.py +++ b/nerfstudio/data/dataparsers/record3d_dataparser.py @@ -17,11 +17,12 @@ from __future__ import annotations from dataclasses import dataclass, field from pathlib import Path -from typing import Literal, Type +from typing import Type import numpy as np import torch from scipy.spatial.transform import Rotation +from typing_extensions import Literal from nerfstudio.cameras import camera_utils from nerfstudio.cameras.cameras import Cameras, CameraType diff --git a/nerfstudio/field_components/encodings.py b/nerfstudio/field_components/encodings.py index b65bcb08b..7e149e531 100644 --- a/nerfstudio/field_components/encodings.py +++ b/nerfstudio/field_components/encodings.py @@ -17,13 +17,14 @@ Encoding functions """ from abc import abstractmethod -from typing import Literal, Optional +from typing import Optional import numpy as np import torch import torch.nn.functional as F from torch import nn from torchtyping import TensorType +from typing_extensions import Literal from nerfstudio.field_components.base_field_component import FieldComponent from nerfstudio.utils.math import components_from_spherical_harmonics, expected_sin diff --git a/nerfstudio/model_components/renderers.py b/nerfstudio/model_components/renderers.py index 64b8bced3..025194ee4 100644 --- a/nerfstudio/model_components/renderers.py +++ b/nerfstudio/model_components/renderers.py @@ -27,12 +27,13 @@ Example: """ import math -from typing import Literal, Optional, Union +from typing import Optional, Union import nerfacc import torch from torch import nn from torchtyping import TensorType +from typing_extensions import Literal from nerfstudio.cameras.rays import RaySamples from nerfstudio.utils.math import components_from_spherical_harmonics diff --git a/nerfstudio/models/nerfacto.py b/nerfstudio/models/nerfacto.py index 6f6293f60..6929c2fda 100644 --- a/nerfstudio/models/nerfacto.py +++ b/nerfstudio/models/nerfacto.py @@ -19,7 +19,7 @@ NeRF implementation that combines many recent advancements. from __future__ import annotations from dataclasses import dataclass, field -from typing import Dict, List, Literal, Tuple, Type +from typing import Dict, List, Tuple, Type import numpy as np import torch @@ -27,6 +27,7 @@ from torch.nn import Parameter from torchmetrics import PeakSignalNoiseRatio from torchmetrics.functional import structural_similarity_index_measure from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity +from typing_extensions import Literal from nerfstudio.cameras.rays import RayBundle from nerfstudio.engine.callbacks import ( diff --git a/pyproject.toml b/pyproject.toml index a4630212c..716e476d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ version = "0.1.5.1" description = "All-in-one repository for state-of-the-art NeRFs" readme = "README.md" license = { text="Apache 2.0"} -requires-python = ">=3.8" +requires-python = ">=3.7.3" classifiers = [ "Development Status :: 3 - Alpha", "Programming Language :: Python", @@ -30,7 +30,7 @@ dependencies = [ "mediapy==1.1.0", "msgpack==1.0.4", "msgpack_numpy==0.4.8", - "nerfacc==0.2.0", + "nerfacc==0.2.1", "opencv-python==4.6.0.66", "plotly==5.7.0", "protobuf==3.20.0", diff --git a/scripts/completions/install.py b/scripts/completions/install.py index 3d413aa16..37cfd9fbc 100755 --- a/scripts/completions/install.py +++ b/scripts/completions/install.py @@ -10,12 +10,12 @@ import shutil import stat import subprocess import sys -from typing import List, Literal, Union +from typing import List, Union import tyro from rich.console import Console from rich.prompt import Confirm -from typing_extensions import assert_never +from typing_extensions import Literal, assert_never ConfigureMode = Literal["install", "uninstall"] ShellType = Literal["zsh", "bash"] @@ -175,10 +175,7 @@ def _update_rc( assert_never(mode) -def main( - mode: ConfigureMode = "install", - /, -) -> None: +def main(mode: ConfigureMode = "install") -> None: """Main script. Args: diff --git a/scripts/downloads/download_data.py b/scripts/downloads/download_data.py index d75e4a1f1..e37ac82c5 100644 --- a/scripts/downloads/download_data.py +++ b/scripts/downloads/download_data.py @@ -4,11 +4,12 @@ import shutil import sys import zipfile from pathlib import Path -from typing import Literal, Optional +from typing import Optional import gdown import tyro from rich.console import Console +from typing_extensions import Literal CONSOLE = Console(width=120) diff --git a/scripts/process_data.py b/scripts/process_data.py index 797ee4aa1..775e4fba4 100755 --- a/scripts/process_data.py +++ b/scripts/process_data.py @@ -9,7 +9,7 @@ from contextlib import nullcontext from dataclasses import dataclass from enum import Enum from pathlib import Path -from typing import List, Literal, Optional, Tuple, Union +from typing import List, Optional, Tuple, Union import appdirs import numpy as np @@ -17,7 +17,7 @@ import requests import tyro from rich.console import Console from rich.progress import track -from typing_extensions import Annotated +from typing_extensions import Annotated, Literal from nerfstudio.utils import colmap_utils, install_checks diff --git a/scripts/render.py b/scripts/render.py index 5ada54af4..b37d7dfdb 100644 --- a/scripts/render.py +++ b/scripts/render.py @@ -8,7 +8,7 @@ import dataclasses import json import sys from pathlib import Path -from typing import Literal, Optional +from typing import Optional import mediapy as media import torch @@ -21,7 +21,7 @@ from rich.progress import ( TextColumn, TimeRemainingColumn, ) -from typing_extensions import assert_never +from typing_extensions import Literal, assert_never from nerfstudio.cameras.camera_paths import get_path_from_json, get_spiral_path from nerfstudio.cameras.cameras import Cameras