diff --git a/nerfstudio/configs/base_config.py b/nerfstudio/configs/base_config.py index 4f1d82238..315659acb 100644 --- a/nerfstudio/configs/base_config.py +++ b/nerfstudio/configs/base_config.py @@ -17,7 +17,6 @@ from __future__ import annotations -import warnings from dataclasses import dataclass from pathlib import Path from typing import Any, List, Literal, Optional, Tuple, Type @@ -25,8 +24,6 @@ from typing import Any, List, Literal, Optional, Tuple, Type # model instances from nerfstudio.utils import writer -warnings.filterwarnings("ignore", module="torchvision") - # Pretty printing class class PrintableConfig: diff --git a/nerfstudio/models/base_surface_model.py b/nerfstudio/models/base_surface_model.py index f7af6e2c1..f8d3bca10 100644 --- a/nerfstudio/models/base_surface_model.py +++ b/nerfstudio/models/base_surface_model.py @@ -25,8 +25,8 @@ from typing import Any, Dict, List, Literal, Tuple, Type, cast import torch import torch.nn.functional as F from torch.nn import Parameter -from torchmetrics import PeakSignalNoiseRatio from torchmetrics.functional import structural_similarity_index_measure +from torchmetrics.image import PeakSignalNoiseRatio from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity from nerfstudio.cameras.rays import RayBundle diff --git a/nerfstudio/models/instant_ngp.py b/nerfstudio/models/instant_ngp.py index 95f059b60..abdc892dd 100644 --- a/nerfstudio/models/instant_ngp.py +++ b/nerfstudio/models/instant_ngp.py @@ -24,8 +24,8 @@ from typing import Dict, List, Literal, Optional, Tuple, Type import nerfacc import torch from torch.nn import Parameter -from torchmetrics import PeakSignalNoiseRatio from torchmetrics.functional import structural_similarity_index_measure +from torchmetrics.image import PeakSignalNoiseRatio from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity from nerfstudio.cameras.rays import RayBundle diff --git a/nerfstudio/models/mipnerf.py b/nerfstudio/models/mipnerf.py index f0deb9bc4..9a3fdabe2 100644 --- a/nerfstudio/models/mipnerf.py +++ b/nerfstudio/models/mipnerf.py @@ -21,8 +21,8 @@ from typing import Dict, List, Tuple import torch from torch.nn import Parameter -from torchmetrics import PeakSignalNoiseRatio from torchmetrics.functional import structural_similarity_index_measure +from torchmetrics.image import PeakSignalNoiseRatio from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity from nerfstudio.cameras.rays import RayBundle diff --git a/nerfstudio/models/nerfacto.py b/nerfstudio/models/nerfacto.py index 2dbbee939..79e5b180e 100644 --- a/nerfstudio/models/nerfacto.py +++ b/nerfstudio/models/nerfacto.py @@ -24,8 +24,8 @@ from typing import Dict, List, Literal, Tuple, Type import numpy as np import torch from torch.nn import Parameter -from torchmetrics import PeakSignalNoiseRatio from torchmetrics.functional import structural_similarity_index_measure +from torchmetrics.image import PeakSignalNoiseRatio from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity from nerfstudio.cameras.rays import RayBundle, RaySamples diff --git a/nerfstudio/models/semantic_nerfw.py b/nerfstudio/models/semantic_nerfw.py index bf7914b1c..106f1794a 100644 --- a/nerfstudio/models/semantic_nerfw.py +++ b/nerfstudio/models/semantic_nerfw.py @@ -24,8 +24,8 @@ from typing import Dict, List, Tuple, Type import numpy as np import torch from torch.nn import Parameter -from torchmetrics import PeakSignalNoiseRatio from torchmetrics.functional import structural_similarity_index_measure +from torchmetrics.image import PeakSignalNoiseRatio from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity from nerfstudio.cameras.rays import RayBundle diff --git a/nerfstudio/models/tensorf.py b/nerfstudio/models/tensorf.py index 742818b64..160ef1b86 100644 --- a/nerfstudio/models/tensorf.py +++ b/nerfstudio/models/tensorf.py @@ -24,8 +24,8 @@ from typing import Dict, List, Literal, Tuple, Type, cast import numpy as np import torch from torch.nn import Parameter -from torchmetrics import PeakSignalNoiseRatio from torchmetrics.functional import structural_similarity_index_measure +from torchmetrics.image import PeakSignalNoiseRatio from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity from nerfstudio.cameras.rays import RayBundle diff --git a/nerfstudio/models/vanilla_nerf.py b/nerfstudio/models/vanilla_nerf.py index 4a23bf0e5..62d6b96b7 100644 --- a/nerfstudio/models/vanilla_nerf.py +++ b/nerfstudio/models/vanilla_nerf.py @@ -23,8 +23,8 @@ from typing import Any, Dict, List, Tuple, Type import torch from torch.nn import Parameter -from torchmetrics import PeakSignalNoiseRatio from torchmetrics.functional import structural_similarity_index_measure +from torchmetrics.image import PeakSignalNoiseRatio from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity from nerfstudio.cameras.rays import RayBundle diff --git a/pyproject.toml b/pyproject.toml index e4de87116..804dab015 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,7 +50,7 @@ dependencies = [ "tensorboard>=2.13.0", "torch>=1.13.1", "torchvision>=0.14.1", - "torchmetrics[image]>=0.9.3", + "torchmetrics[image]>=1.0.1", "typing_extensions>=4.4.0", "viser>=0.0.12", "nuscenes-devkit>=1.1.1",