Flag unused imports in CI (deepinv#557)

jscanvic · web-flow · commit 55ca5fc3c633 · 2025-07-24T15:06:51.000+01:00
* create pr

* enable rule F401 of ruff in continuous integration

* run ruff --fix on unused imports

* black

* run unsafe ruff fix

* black

* fix the 4 last errors manually

* disable ruff for an import with side effects

* black

* ignore ruff false positive for fixture

* black

* trigger ci

* ignore ruff false positive for (other) fixture

* apply ruff safe fix

ruff check --target-version "py310" --fix --select "F401"

* apply ruff unsafe fix

ruff check --target-version "py310" --preview --fix --unsafe-fixes --select "F401"

* black

* get rid of no-op

* add missing import

* add missing import

* restore __init__.py files from the main branch

git restore --source=upstream/main -- '**/__init__.py'

* disable the unused imports rules for init files

* apply ruff safe fix

ruff check --target-version "py310" --fix --select "F401"

* restore mistakenly removed imports
diff --git a/.github/scripts/bump_version.py b/.github/scripts/bump_version.py
@@ -1,4 +1,3 @@
-import re
 from pathlib import Path
 import tomlkit
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,9 +15,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'   # minimum supported version 
+          python-version: '3.10'   # minimum supported version
       - uses: psf/black@stable
       - name: Install and run ruff
         run: |
           pip install ruff
-          ruff check --target-version "py310" --select "UP006"
+          ruff check --target-version "py310" --select "UP006" --select "F401"
diff --git a/deepinv/datasets/fastmri.py b/deepinv/datasets/fastmri.py
@@ -22,12 +22,10 @@
 from typing import Any, Callable, NamedTuple, Optional, Union, Any
 from collections import defaultdict
 import pickle
-import math
 import warnings
 import os
 import h5py
 from tqdm import tqdm
-import numpy as np
 import torch
 from torchvision.transforms import Compose, CenterCrop
 
diff --git a/deepinv/datasets/lidc_idri.py b/deepinv/datasets/lidc_idri.py
@@ -6,7 +6,6 @@
 )
 import os
 
-import numpy
 import torch
 import numpy as np
 
diff --git a/deepinv/loss/adversarial/uair.py b/deepinv/loss/adversarial/uair.py
@@ -1,6 +1,6 @@
 import torch.nn as nn
 from torch import Tensor
-from .base import GeneratorLoss, DiscriminatorLoss
+from .base import GeneratorLoss
 from deepinv.physics import Physics
 
 
diff --git a/deepinv/loss/augmentation.py b/deepinv/loss/augmentation.py
@@ -12,7 +12,6 @@
 from deepinv.transform.base import Transform, Identity
 from deepinv.transform.rotate import Rotate
 from deepinv.transform.shift import Shift
-from deepinv.physics.forward import LinearPhysics
 
 
 class AugmentConsistencyLoss(Loss):
diff --git a/deepinv/loss/mc.py b/deepinv/loss/mc.py
@@ -3,7 +3,6 @@
 import torch
 from deepinv.loss.loss import Loss
 from deepinv.loss.metric.metric import Metric
-from deepinv.transform.base import Transform
 
 
 class MCLoss(Loss):
diff --git a/deepinv/loss/metric/distortion.py b/deepinv/loss/metric/distortion.py
@@ -4,7 +4,6 @@
 
 import torch
 from torch import Tensor
-from torch.nn import MSELoss, L1Loss
 from torchmetrics.functional.image import (
     structural_similarity_index_measure,
     multiscale_structural_similarity_index_measure,
diff --git a/deepinv/loss/moi.py b/deepinv/loss/moi.py
@@ -1,6 +1,5 @@
 from typing import Union, Optional
 
-import numpy as np
 import torch
 
 from deepinv.loss.loss import Loss
diff --git a/deepinv/loss/score.py b/deepinv/loss/score.py
@@ -1,5 +1,4 @@
 import torch
-import deepinv.physics
 from deepinv.loss.loss import Loss
 from deepinv.models.base import Reconstructor
 
diff --git a/deepinv/loss/sure.py b/deepinv/loss/sure.py
@@ -1,7 +1,5 @@
 import torch
-import torch.nn as nn
 import numpy as np
-import deepinv.physics
 from deepinv.loss.loss import Loss
 
 
diff --git a/deepinv/models/equivariant.py b/deepinv/models/equivariant.py
@@ -1,5 +1,4 @@
 from typing import Optional
-import torch
 from deepinv.transform import Transform, Rotate, Reflect
 from .base import Denoiser
 
diff --git a/deepinv/models/icnn.py b/deepinv/models/icnn.py
@@ -1,5 +1,4 @@
 # Code borrowed from https://github.com/ZhenghanFang/learned-proximal-networks
-import numpy as np
 import torch
 from torch import nn
 
diff --git a/deepinv/models/varnet.py b/deepinv/models/varnet.py
@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Union, TYPE_CHECKING
+from typing import Union
 from warnings import warn
 
 import torch
@@ -11,9 +11,6 @@
 from deepinv.models import DnCNN
 from deepinv.physics.mri import MRIMixin, MRI, MultiCoilMRI
 
-if TYPE_CHECKING:
-    from deepinv.physics.forward import Physics
-
 
 class VarNet(ArtifactRemoval, MRIMixin):
     """
diff --git a/deepinv/optim/bregman.py b/deepinv/optim/bregman.py
@@ -1,5 +1,4 @@
 import torch
-import torch.nn as nn
 from deepinv.optim.potential import Potential
 
 
diff --git a/deepinv/optim/distance.py b/deepinv/optim/distance.py
@@ -1,6 +1,5 @@
 import torch
 from deepinv.optim.potential import Potential
-from deepinv.utils.tensorlist import TensorList
 
 
 class Distance(Potential):
diff --git a/deepinv/optim/optim_iterators/optim_iterator.py b/deepinv/optim/optim_iterators/optim_iterator.py
@@ -1,4 +1,3 @@
-import torch
 import torch.nn as nn
 
 
diff --git a/deepinv/optim/optim_iterators/primal_dual_CP.py b/deepinv/optim/optim_iterators/primal_dual_CP.py
@@ -1,5 +1,3 @@
-import torch
-
 from .optim_iterator import OptimIterator, fStep, gStep
 
 
diff --git a/deepinv/optim/prior.py b/deepinv/optim/prior.py
@@ -13,7 +13,6 @@
 from deepinv.models.tv import TVDenoiser
 from deepinv.models.wavdict import WaveletDenoiser, WaveletDictDenoiser
 from deepinv.utils import patch_extractor
-from typing import Callable
 
 
 class Prior(Potential):
diff --git a/deepinv/physics/blur.py b/deepinv/physics/blur.py
@@ -1,7 +1,6 @@
 from torchvision.transforms.functional import rotate
 import torchvision
 import torch
-import numpy as np
 import torch.fft as fft
 from torch import Tensor
 from deepinv.physics.forward import LinearPhysics, DecomposablePhysics
diff --git a/deepinv/physics/forward.py b/deepinv/physics/forward.py
@@ -2,7 +2,6 @@
 from typing import Union
 import copy
 import inspect
-import itertools
 import collections.abc
 
 import torch
diff --git a/deepinv/physics/functional/astra.py b/deepinv/physics/functional/astra.py
@@ -5,7 +5,6 @@
 
 try:
     import astra
-    from astra import experimental
 except:
     astra = ImportError("The astra-toolbox package is not installed.")
 
diff --git a/deepinv/physics/generator/base.py b/deepinv/physics/generator/base.py
@@ -1,7 +1,6 @@
 import torch
 import torch.nn as nn
 from typing import Union
-import warnings
 from hashlib import sha256
 
 
diff --git a/deepinv/physics/tomography.py b/deepinv/physics/tomography.py
@@ -16,6 +16,9 @@
 
 try:
     import astra
+
+    # NOTE: This import is used by its side effects.
+    from astra import experimental  # noqa: F401
 except:
     astra = ImportError("The astra-toolbox package is not installed.")
 
diff --git a/deepinv/sampling/diffusion.py b/deepinv/sampling/diffusion.py
@@ -3,10 +3,8 @@
 from tqdm import tqdm
 from deepinv.models import Reconstructor
 
-from typing import Dict, Any
 
 import deepinv.physics
-from deepinv.utils.plotting import plot
 from deepinv.sampling import BaseSampling
 from deepinv.sampling.sampling_iterators import DiffusionIterator
 
diff --git a/deepinv/sampling/sampling_iterators/SKRock.py b/deepinv/sampling/sampling_iterators/SKRock.py
@@ -1,4 +1,3 @@
-import torch.nn as nn
 from deepinv.sampling.utils import projbox
 import torch
 import numpy as np
diff --git a/deepinv/tests/conftest.py b/deepinv/tests/conftest.py
@@ -8,7 +8,6 @@
 import matplotlib
 import matplotlib.pyplot as plt
 import importlib
-from contextlib import contextmanager
 
 
 @pytest.fixture
diff --git a/deepinv/tests/test_adversarial.py b/deepinv/tests/test_adversarial.py
@@ -5,7 +5,9 @@
 
 import deepinv as dinv
 from deepinv.loss import adversarial
-from test_loss import dataset, physics
+
+# NOTE: They're injected in tests as fixtures.
+from test_loss import dataset, physics  # noqa: F401
 
 ADVERSARIAL_COMBOS = ["DeblurGAN", "CSGM", "AmbientGAN", "UAIR"]
 
diff --git a/deepinv/tests/test_datasets.py b/deepinv/tests/test_datasets.py
@@ -30,7 +30,6 @@
 from deepinv.physics.generator import GaussianMaskGenerator
 
 from unittest.mock import patch
-import unittest.mock as mock
 import io
 
 
@@ -591,7 +590,6 @@ def download_CMRxRecon():
 
 
 def test_CMRxReconSliceDataset(download_CMRxRecon):
-    from math import prod
 
     img_size = (12, 512, 256)
 
diff --git a/deepinv/tests/test_loss.py b/deepinv/tests/test_loss.py
@@ -11,7 +11,8 @@
 from deepinv.loss.regularisers import JacobianSpectralNorm, FNEJacobianSpectralNorm
 from deepinv.loss.scheduler import RandomLossScheduler, InterleavedLossScheduler
 
-from conftest import non_blocking_plots
+# NOTE: It's used as a fixture.
+from conftest import non_blocking_plots  # noqa: F401
 
 LOSSES = [
     "sup",
diff --git a/deepinv/tests/test_loss_train.py b/deepinv/tests/test_loss_train.py
@@ -8,7 +8,7 @@
 import deepinv as dinv
 from deepinv.optim.data_fidelity import L2
 from deepinv.optim.prior import PnP
-from dummy import DummyCircles, DummyModel
+from dummy import DummyCircles
 from deepinv.unfolded import unfolded_builder
 from deepinv.physics import Inpainting, GaussianNoise, Blur, Pansharpen
 from deepinv.physics.generator import (
diff --git a/deepinv/tests/test_physics.py b/deepinv/tests/test_physics.py
@@ -9,7 +9,7 @@
 from deepinv.physics.forward import adjoint_function
 import deepinv as dinv
 from deepinv.optim.data_fidelity import L2
-from deepinv.physics.mri import MRI, MRIMixin, DynamicMRI, MultiCoilMRI, SequentialMRI
+from deepinv.physics.mri import MRI, MRIMixin, DynamicMRI, MultiCoilMRI
 from deepinv.utils import TensorList
 
 
diff --git a/deepinv/tests/test_physics_functional.py b/deepinv/tests/test_physics_functional.py
@@ -8,7 +8,6 @@
 
 import deepinv as dinv
 import torch
-import pytest
 
 
 def test_conv2d_adjointness(device):
diff --git a/deepinv/tests/test_trainer.py b/deepinv/tests/test_trainer.py
@@ -13,14 +13,13 @@
 
 from unittest.mock import patch
 import math
-import builtins
 import io
 import contextlib
 import re
-import tempfile
-import os
 
-from conftest import non_blocking_plots
+# NOTE: It's used as a fixture.
+from conftest import non_blocking_plots  # noqa: F401
+
 
 NO_LEARNING = ["A_dagger", "A_adjoint", "prox_l2", "y"]
 
diff --git a/deepinv/tests/test_utils.py b/deepinv/tests/test_utils.py
@@ -6,21 +6,21 @@
 import numpy as np
 import contextlib
 from contextlib import nullcontext
-import matplotlib
 import random
 import unittest.mock as mock
 from unittest.mock import patch
 import subprocess
 import os
 import inspect
-import itertools
 import pathlib
 import torchvision
 import torchvision.transforms as transforms
 import PIL
 import io
 import copy
-from conftest import non_blocking_plots
+
+# NOTE: It's used as a fixture.
+from conftest import non_blocking_plots  # noqa: F401
 
 
 @pytest.fixture
diff --git a/deepinv/training/testing.py b/deepinv/training/testing.py
@@ -1,4 +1,3 @@
-import torch
 from deepinv.loss.metric import PSNR
 from deepinv.training import Trainer
 
diff --git a/deepinv/transform/reflect.py b/deepinv/transform/reflect.py
@@ -1,8 +1,5 @@
 from typing import Union, Iterable
 import torch
-from torchvision.transforms.functional import rotate
-from torchvision.transforms import InterpolationMode
-import numpy as np
 from deepinv.transform.base import Transform, TransformParam
 import itertools
 
diff --git a/deepinv/utils/demo.py b/deepinv/utils/demo.py
@@ -9,12 +9,9 @@
 import numpy as np
 import torch
 from torch.utils.data import Dataset
-from torch.nn import Module
 import torchvision
 from torchvision import transforms
 
-from deepinv.models.base import Reconstructor, Denoiser
-
 
 def get_git_root():
     import git
diff --git a/deepinv/utils/metric.py b/deepinv/utils/metric.py
@@ -1,5 +1,3 @@
-import torch
-import numpy as np
 import warnings
 
 
diff --git a/deepinv/utils/parameters.py b/deepinv/utils/parameters.py
@@ -1,6 +1,3 @@
-import numpy as np
-
-
 def get_GSPnP_params(problem, noise_level_img):
     r"""
     Default parameters for the GSPnP Plug-and-Play algorithm.
diff --git a/deepinv/utils/plotting.py b/deepinv/utils/plotting.py
@@ -4,7 +4,6 @@
 from pathlib import Path
 from collections.abc import Iterable
 from typing import Union
-from itertools import zip_longest
 from functools import partial
 from warnings import warn
 
@@ -21,7 +20,6 @@
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 
 from PIL import Image
-import io
 
 
 def config_matplotlib(fontsize=17):
diff --git a/examples/adversarial-learning/demo_gan_imaging.py b/examples/adversarial-learning/demo_gan_imaging.py
@@ -33,9 +33,7 @@
 
 import torch
 from torch.utils.data import DataLoader, random_split
-from torchvision.datasets import ImageFolder
 from torchvision.transforms import Compose, ToTensor, CenterCrop, Resize
-from torchvision.datasets.utils import download_and_extract_archive
 
 import deepinv as dinv
 from deepinv.loss import adversarial
diff --git a/examples/basics/demo_phase_retrieval.py b/examples/basics/demo_phase_retrieval.py
@@ -27,7 +27,6 @@
 from deepinv.optim.phase_retrieval import (
     correct_global_phase,
     cosine_similarity,
-    spectral_methods,
 )
 from deepinv.models.complex import to_complex_denoiser
 
diff --git a/examples/basics/demo_spc.py b/examples/basics/demo_spc.py
diff --git a/examples/external-libraries/_demo_astra_tomography.py b/examples/external-libraries/_demo_astra_tomography.py
diff --git a/examples/optimization/demo_3D_wavelets.py b/examples/optimization/demo_3D_wavelets.py
diff --git a/examples/optimization/demo_wavelet_prior.py b/examples/optimization/demo_wavelet_prior.py
diff --git a/examples/plug-and-play/demo_PnP_mirror_descent.py b/examples/plug-and-play/demo_PnP_mirror_descent.py
diff --git a/examples/sampling/demo_dps.py b/examples/sampling/demo_dps.py
diff --git a/examples/self-supervised-learning/demo_artifact2artifact.py b/examples/self-supervised-learning/demo_artifact2artifact.py
diff --git a/examples/unfolded/demo_DEQ.py b/examples/unfolded/demo_DEQ.py
diff --git a/pyproject.toml b/pyproject.toml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import re`
`2`	`1`	`from pathlib import Path`
`3`	`2`	`import tomlkit`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`)`
`7`	`7`	`import os`
`8`	`8`
`9`		`-import numpy`
`10`	`9`	`import torch`
`11`	`10`	`import numpy as np`
`12`	`11`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import torch`
`2`		`-import deepinv.physics`
`3`	`2`	`from deepinv.loss.loss import Loss`
`4`	`3`	`from deepinv.models.base import Reconstructor`
`5`	`4`