Skip to content

Commit fe5541e

Browse files
jscanvicjscanvic
committed
run unsafe ruff fix
1 parent 884f558 commit fe5541e

File tree

16 files changed

+289
-289
lines changed

16 files changed

+289
-289
lines changed

‎deepinv/datasets/__init__.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
from .datagenerator import generate_dataset, HDF5Dataset
2-
from .patch_dataset import PatchDataset
3-
from .div2k import DIV2K
4-
from .urban100 import Urban100HR
5-
from .set14 import Set14HR
6-
from .cbsd68 import CBSD68
1+
from .datagenerator import generate_dataset as generate_dataset, HDF5Dataset as HDF5Dataset
2+
from .patch_dataset import PatchDataset as PatchDataset
3+
from .div2k import DIV2K as DIV2K
4+
from .urban100 import Urban100HR as Urban100HR
5+
from .set14 import Set14HR as Set14HR
6+
from .cbsd68 import CBSD68 as CBSD68
77
from .fastmri import (
8-
FastMRISliceDataset,
9-
SimpleFastMRISliceDataset,
10-
MRISliceTransform,
8+
FastMRISliceDataset as FastMRISliceDataset,
9+
SimpleFastMRISliceDataset as SimpleFastMRISliceDataset,
10+
MRISliceTransform as MRISliceTransform,
1111
)
12-
from .cmrxrecon import CMRxReconSliceDataset
13-
from .lidc_idri import LidcIdriSliceDataset
14-
from .flickr2k import Flickr2kHR
15-
from .lsdir import LsdirHR
16-
from .fmd import FMD
17-
from .kohler import Kohler
18-
from .utils import download_archive
19-
from .satellite import NBUDataset
12+
from .cmrxrecon import CMRxReconSliceDataset as CMRxReconSliceDataset
13+
from .lidc_idri import LidcIdriSliceDataset as LidcIdriSliceDataset
14+
from .flickr2k import Flickr2kHR as Flickr2kHR
15+
from .lsdir import LsdirHR as LsdirHR
16+
from .fmd import FMD as FMD
17+
from .kohler import Kohler as Kohler
18+
from .utils import download_archive as download_archive
19+
from .satellite import NBUDataset as NBUDataset

‎deepinv/loss/__init__.py‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
from .mc import MCLoss
2-
from .ei import EILoss
3-
from .moi import MOILoss, MOEILoss
4-
from .sup import SupLoss
5-
from .score import ScoreLoss
6-
from .tv import TVLoss
7-
from .r2r import R2RLoss
8-
from .sure import SureGaussianLoss, SurePoissonLoss, SurePGLoss
9-
from .regularisers import JacobianSpectralNorm, FNEJacobianSpectralNorm
10-
from .measplit import SplittingLoss, Neighbor2Neighbor
11-
from .loss import Loss, StackedPhysicsLoss
1+
from .mc import MCLoss as MCLoss
2+
from .ei import EILoss as EILoss
3+
from .moi import MOILoss as MOILoss, MOEILoss as MOEILoss
4+
from .sup import SupLoss as SupLoss
5+
from .score import ScoreLoss as ScoreLoss
6+
from .tv import TVLoss as TVLoss
7+
from .r2r import R2RLoss as R2RLoss
8+
from .sure import SureGaussianLoss as SureGaussianLoss, SurePoissonLoss as SurePoissonLoss, SurePGLoss as SurePGLoss
9+
from .regularisers import JacobianSpectralNorm as JacobianSpectralNorm, FNEJacobianSpectralNorm as FNEJacobianSpectralNorm
10+
from .measplit import SplittingLoss as SplittingLoss, Neighbor2Neighbor as Neighbor2Neighbor
11+
from .loss import Loss as Loss, StackedPhysicsLoss as StackedPhysicsLoss
1212
from .scheduler import (
13-
BaseLossScheduler,
14-
RandomLossScheduler,
15-
InterleavedLossScheduler,
16-
StepLossScheduler,
17-
InterleavedEpochLossScheduler,
13+
BaseLossScheduler as BaseLossScheduler,
14+
RandomLossScheduler as RandomLossScheduler,
15+
InterleavedLossScheduler as InterleavedLossScheduler,
16+
StepLossScheduler as StepLossScheduler,
17+
InterleavedEpochLossScheduler as InterleavedEpochLossScheduler,
1818
)
1919

20-
from . import metric
21-
from . import adversarial
22-
from . import mri
20+
from . import metric as metric
21+
from . import adversarial as adversarial
22+
from . import mri as mri
2323

2424
from .metric import (
25-
Metric,
26-
MSE,
27-
NMSE,
28-
PSNR,
29-
SSIM,
30-
LpNorm,
31-
L1L2,
32-
MAE,
33-
NIQE,
34-
LPIPS,
35-
QNR,
36-
cal_mse,
37-
cal_psnr,
38-
cal_mae,
25+
Metric as Metric,
26+
MSE as MSE,
27+
NMSE as NMSE,
28+
PSNR as PSNR,
29+
SSIM as SSIM,
30+
LpNorm as LpNorm,
31+
L1L2 as L1L2,
32+
MAE as MAE,
33+
NIQE as NIQE,
34+
LPIPS as LPIPS,
35+
QNR as QNR,
36+
cal_mse as cal_mse,
37+
cal_psnr as cal_psnr,
38+
cal_mae as cal_mae,
3939
)
4040

41-
from .augmentation import AugmentConsistencyLoss
41+
from .augmentation import AugmentConsistencyLoss as AugmentConsistencyLoss

‎deepinv/loss/adversarial/__init__.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from .consistency import (
2-
SupAdversarialGeneratorLoss,
3-
SupAdversarialDiscriminatorLoss,
4-
UnsupAdversarialGeneratorLoss,
5-
UnsupAdversarialDiscriminatorLoss,
2+
SupAdversarialGeneratorLoss as SupAdversarialGeneratorLoss,
3+
SupAdversarialDiscriminatorLoss as SupAdversarialDiscriminatorLoss,
4+
UnsupAdversarialGeneratorLoss as UnsupAdversarialGeneratorLoss,
5+
UnsupAdversarialDiscriminatorLoss as UnsupAdversarialDiscriminatorLoss,
66
)
7-
from .uair import UAIRGeneratorLoss
8-
from .base import DiscriminatorLoss, GeneratorLoss, DiscriminatorMetric
7+
from .uair import UAIRGeneratorLoss as UAIRGeneratorLoss
8+
from .base import DiscriminatorLoss as DiscriminatorLoss, GeneratorLoss as GeneratorLoss, DiscriminatorMetric as DiscriminatorMetric

‎deepinv/loss/metric/__init__.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
from .metric import Metric
1+
from .metric import Metric as Metric
22
from .distortion import (
3-
MSE,
4-
NMSE,
5-
PSNR,
6-
SSIM,
7-
LpNorm,
8-
L1L2,
9-
MAE,
10-
QNR,
11-
SpectralAngleMapper,
12-
ERGAS,
13-
HaarPSI,
3+
MSE as MSE,
4+
NMSE as NMSE,
5+
PSNR as PSNR,
6+
SSIM as SSIM,
7+
LpNorm as LpNorm,
8+
L1L2 as L1L2,
9+
MAE as MAE,
10+
QNR as QNR,
11+
SpectralAngleMapper as SpectralAngleMapper,
12+
ERGAS as ERGAS,
13+
HaarPSI as HaarPSI,
1414
)
15-
from .perceptual import NIQE, LPIPS
16-
from .functional import cal_mse, cal_psnr, cal_mae
15+
from .perceptual import NIQE as NIQE, LPIPS as LPIPS
16+
from .functional import cal_mse as cal_mse, cal_psnr as cal_psnr, cal_mae as cal_mae

‎deepinv/loss/mri/__init__.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from .measplit import (
2-
Phase2PhaseLoss,
3-
Artifact2ArtifactLoss,
4-
WeightedSplittingLoss,
5-
RobustSplittingLoss,
2+
Phase2PhaseLoss as Phase2PhaseLoss,
3+
Artifact2ArtifactLoss as Artifact2ArtifactLoss,
4+
WeightedSplittingLoss as WeightedSplittingLoss,
5+
RobustSplittingLoss as RobustSplittingLoss,
66
)

‎deepinv/models/__init__.py‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
from .base import Denoiser, Reconstructor
2-
from .drunet import DRUNet
3-
from .scunet import SCUNet
4-
from .ae import AutoEncoder
5-
from .dncnn import DnCNN
6-
from .dsccp import DScCP
7-
from .artifactremoval import ArtifactRemoval
8-
from .tv import TVDenoiser
9-
from .tgv import TGVDenoiser
10-
from .wavdict import WaveletDenoiser, WaveletDictDenoiser
11-
from .GSPnP import GSDRUNet
12-
from .median import MedianFilter
13-
from .dip import DeepImagePrior, ConvDecoder
14-
from .diffunet import DiffUNet
15-
from .swinir import SwinIR
16-
from .PDNet import PDNet_PrimalBlock, PDNet_DualBlock
17-
from .bm3d import BM3D
18-
from .equivariant import EquivariantDenoiser
19-
from .epll import EPLLDenoiser
20-
from .restormer import Restormer
21-
from .icnn import ICNN
1+
from .base import Denoiser as Denoiser, Reconstructor as Reconstructor
2+
from .drunet import DRUNet as DRUNet
3+
from .scunet import SCUNet as SCUNet
4+
from .ae import AutoEncoder as AutoEncoder
5+
from .dncnn import DnCNN as DnCNN
6+
from .dsccp import DScCP as DScCP
7+
from .artifactremoval import ArtifactRemoval as ArtifactRemoval
8+
from .tv import TVDenoiser as TVDenoiser
9+
from .tgv import TGVDenoiser as TGVDenoiser
10+
from .wavdict import WaveletDenoiser as WaveletDenoiser, WaveletDictDenoiser as WaveletDictDenoiser
11+
from .GSPnP import GSDRUNet as GSDRUNet
12+
from .median import MedianFilter as MedianFilter
13+
from .dip import DeepImagePrior as DeepImagePrior, ConvDecoder as ConvDecoder
14+
from .diffunet import DiffUNet as DiffUNet
15+
from .swinir import SwinIR as SwinIR
16+
from .PDNet import PDNet_PrimalBlock as PDNet_PrimalBlock, PDNet_DualBlock as PDNet_DualBlock
17+
from .bm3d import BM3D as BM3D
18+
from .equivariant import EquivariantDenoiser as EquivariantDenoiser
19+
from .epll import EPLLDenoiser as EPLLDenoiser
20+
from .restormer import Restormer as Restormer
21+
from .icnn import ICNN as ICNN
2222
from .gan import (
23-
PatchGANDiscriminator,
24-
ESRGANDiscriminator,
25-
CSGMGenerator,
26-
DCGANGenerator,
27-
DCGANDiscriminator,
23+
PatchGANDiscriminator as PatchGANDiscriminator,
24+
ESRGANDiscriminator as ESRGANDiscriminator,
25+
CSGMGenerator as CSGMGenerator,
26+
DCGANGenerator as DCGANGenerator,
27+
DCGANDiscriminator as DCGANDiscriminator,
2828
)
29-
from .complex import to_complex_denoiser
30-
from .dynamic import TimeAgnosticNet, TimeAveragingNet
31-
from .varnet import VarNet
32-
from .modl import MoDL
33-
from .multispectral import PanNet
34-
from .unet import UNet
35-
from .ncsnpp import NCSNpp
36-
from .guided_diffusion import ADMUNet
37-
from .precond import EDMPrecond
29+
from .complex import to_complex_denoiser as to_complex_denoiser
30+
from .dynamic import TimeAgnosticNet as TimeAgnosticNet, TimeAveragingNet as TimeAveragingNet
31+
from .varnet import VarNet as VarNet
32+
from .modl import MoDL as MoDL
33+
from .multispectral import PanNet as PanNet
34+
from .unet import UNet as UNet
35+
from .ncsnpp import NCSNpp as NCSNpp
36+
from .guided_diffusion import ADMUNet as ADMUNet
37+
from .precond import EDMPrecond as EDMPrecond

‎deepinv/optim/__init__.py‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
from .data_fidelity import (
2-
DataFidelity,
3-
StackedPhysicsDataFidelity,
4-
L2,
5-
L1,
6-
IndicatorL2,
7-
PoissonLikelihood,
8-
AmplitudeLoss,
9-
LogPoissonLikelihood,
10-
ZeroFidelity,
2+
DataFidelity as DataFidelity,
3+
StackedPhysicsDataFidelity as StackedPhysicsDataFidelity,
4+
L2 as L2,
5+
L1 as L1,
6+
IndicatorL2 as IndicatorL2,
7+
PoissonLikelihood as PoissonLikelihood,
8+
AmplitudeLoss as AmplitudeLoss,
9+
LogPoissonLikelihood as LogPoissonLikelihood,
10+
ZeroFidelity as ZeroFidelity,
1111
)
12-
from .optimizers import BaseOptim, optim_builder
13-
from .fixed_point import FixedPoint
12+
from .optimizers import BaseOptim as BaseOptim, optim_builder as optim_builder
13+
from .fixed_point import FixedPoint as FixedPoint
1414
from .prior import (
15-
Prior,
16-
ScorePrior,
17-
Tikhonov,
18-
PnP,
19-
RED,
20-
L1Prior,
21-
TVPrior,
22-
PatchPrior,
23-
WaveletPrior,
24-
PatchNR,
25-
Zero,
26-
L12Prior,
15+
Prior as Prior,
16+
ScorePrior as ScorePrior,
17+
Tikhonov as Tikhonov,
18+
PnP as PnP,
19+
RED as RED,
20+
L1Prior as L1Prior,
21+
TVPrior as TVPrior,
22+
PatchPrior as PatchPrior,
23+
WaveletPrior as WaveletPrior,
24+
PatchNR as PatchNR,
25+
Zero as Zero,
26+
L12Prior as L12Prior,
2727
)
28-
from .optim_iterators.optim_iterator import OptimIterator
29-
from .epll import EPLL
30-
from .dpir import DPIR
31-
from .bregman import Bregman, BurgEntropy, NegEntropy, BregmanL2, Bregman_ICNN
32-
from .potential import Potential
28+
from .optim_iterators.optim_iterator import OptimIterator as OptimIterator
29+
from .epll import EPLL as EPLL
30+
from .dpir import DPIR as DPIR
31+
from .bregman import Bregman as Bregman, BurgEntropy as BurgEntropy, NegEntropy as NegEntropy, BregmanL2 as BregmanL2, Bregman_ICNN as Bregman_ICNN
32+
from .potential import Potential as Potential
3333
from .distance import (
34-
Distance,
35-
L2Distance,
36-
IndicatorL2Distance,
37-
PoissonLikelihoodDistance,
38-
L1Distance,
39-
AmplitudeLossDistance,
40-
LogPoissonLikelihoodDistance,
41-
ZeroDistance,
34+
Distance as Distance,
35+
L2Distance as L2Distance,
36+
IndicatorL2Distance as IndicatorL2Distance,
37+
PoissonLikelihoodDistance as PoissonLikelihoodDistance,
38+
L1Distance as L1Distance,
39+
AmplitudeLossDistance as AmplitudeLossDistance,
40+
LogPoissonLikelihoodDistance as LogPoissonLikelihoodDistance,
41+
ZeroDistance as ZeroDistance,
4242
)

‎deepinv/optim/optim_iterators/__init__.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from .optim_iterator import OptimIterator, fStep, gStep
2-
from .admm import ADMMIteration
3-
from .pgd import PGDIteration, FISTAIteration, PMDIteration
4-
from .primal_dual_CP import CPIteration
5-
from .hqs import HQSIteration
6-
from .drs import DRSIteration
7-
from .gradient_descent import GDIteration, MDIteration
8-
from .spectral_methods import SMIteration
1+
from .optim_iterator import OptimIterator as OptimIterator, fStep as fStep, gStep as gStep
2+
from .admm import ADMMIteration as ADMMIteration
3+
from .pgd import PGDIteration as PGDIteration, FISTAIteration as FISTAIteration, PMDIteration as PMDIteration
4+
from .primal_dual_CP import CPIteration as CPIteration
5+
from .hqs import HQSIteration as HQSIteration
6+
from .drs import DRSIteration as DRSIteration
7+
from .gradient_descent import GDIteration as GDIteration, MDIteration as MDIteration
8+
from .spectral_methods import SMIteration as SMIteration

0 commit comments

Comments
 (0)