Remove __module__ hacks (#976)

* Remove __module__ hacks * Remove unused imports * Fix typo in reference * Explicit link
microsoft · Dec 26, 2022 · fd06985 · fd06985
1 parent b7add14
commit fd06985
Show file tree

Hide file tree

Showing 39 changed files with 3 additions and 174 deletions.
diff --git a/tests/models/test_changestar.py b/tests/models/test_changestar.py
@@ -6,14 +6,9 @@
 import pytest
 import torch
 import torch.nn as nn
-from torch.nn.modules import Module
 
 from torchgeo.models import ChangeMixin, ChangeStar, ChangeStarFarSeg
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-Module.__module__ = "torch.nn"
-
 BACKBONE = ["resnet18", "resnet34", "resnet50", "resnet101"]
 IN_CHANNELS = [64, 128]
 INNNR_CHANNELS = [16, 32, 64]

diff --git a/torchgeo/datamodules/__init__.py b/torchgeo/datamodules/__init__.py
@@ -54,7 +54,3 @@
     "Vaihingen2DDataModule",
     "XView2DataModule",
 )
-
-# https://stackoverflow.com/questions/40018681
-for module in __all__:
-    globals()[module].__module__ = "torchgeo.datamodules"
diff --git a/torchgeo/datamodules/bigearthnet.py b/torchgeo/datamodules/bigearthnet.py
@@ -13,10 +13,6 @@
 
 from ..datasets import BigEarthNet
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 class BigEarthNetDataModule(pl.LightningDataModule):
     """LightningDataModule implementation for the BigEarthNet dataset.

diff --git a/torchgeo/datamodules/chesapeake.py b/torchgeo/datamodules/chesapeake.py
@@ -16,10 +16,6 @@
 from ..samplers.batch import RandomBatchGeoSampler
 from ..samplers.single import GridGeoSampler
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 class ChesapeakeCVPRDataModule(LightningDataModule):
     """LightningDataModule implementation for the Chesapeake CVPR Land Cover dataset.

diff --git a/torchgeo/datamodules/cowc.py b/torchgeo/datamodules/cowc.py
@@ -12,10 +12,6 @@
 
 from ..datasets import COWCCounting
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 class COWCCountingDataModule(pl.LightningDataModule):
     """LightningDataModule implementation for the COWC Counting dataset."""

diff --git a/torchgeo/datamodules/cyclone.py b/torchgeo/datamodules/cyclone.py
@@ -12,10 +12,6 @@
 
 from ..datasets import TropicalCyclone
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 class TropicalCycloneDataModule(pl.LightningDataModule):
     """LightningDataModule implementation for the NASA Cyclone dataset.

diff --git a/torchgeo/datamodules/fair1m.py b/torchgeo/datamodules/fair1m.py
@@ -14,10 +14,6 @@
 from ..datasets import FAIR1M
 from .utils import dataset_split
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 def collate_fn(batch: List[Dict[str, Tensor]]) -> Dict[str, Any]:
     """Custom object detection collate fn to handle variable number of boxes.

diff --git a/torchgeo/datamodules/landcoverai.py b/torchgeo/datamodules/landcoverai.py
@@ -12,10 +12,6 @@
 
 from ..datasets import LandCoverAI
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 class LandCoverAIDataModule(pl.LightningDataModule):
     """LightningDataModule implementation for the LandCover.ai dataset.

diff --git a/torchgeo/datamodules/loveda.py b/torchgeo/datamodules/loveda.py
@@ -11,10 +11,6 @@
 
 from ..datasets import LoveDA
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 class LoveDADataModule(pl.LightningDataModule):
     """LightningDataModule implementation for the LoveDA dataset.

diff --git a/torchgeo/datamodules/naip.py b/torchgeo/datamodules/naip.py
@@ -14,10 +14,6 @@
 from ..samplers.batch import RandomBatchGeoSampler
 from ..samplers.single import GridGeoSampler
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 class NAIPChesapeakeDataModule(pl.LightningDataModule):
     """LightningDataModule implementation for the NAIP and Chesapeake datasets.

diff --git a/torchgeo/datamodules/nasa_marine_debris.py b/torchgeo/datamodules/nasa_marine_debris.py
@@ -14,10 +14,6 @@
 from ..datasets import NASAMarineDebris
 from .utils import dataset_split
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 def collate_fn(batch: List[Dict[str, Tensor]]) -> Dict[str, Any]:
     """Custom object detection collate fn to handle variable boxes.

diff --git a/torchgeo/datamodules/resisc45.py b/torchgeo/datamodules/resisc45.py
@@ -14,10 +14,6 @@
 
 from ..datasets import RESISC45
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 class RESISC45DataModule(pl.LightningDataModule):
     """LightningDataModule implementation for the RESISC45 dataset.

diff --git a/torchgeo/datamodules/sen12ms.py b/torchgeo/datamodules/sen12ms.py
@@ -12,10 +12,6 @@
 
 from ..datasets import SEN12MS
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 class SEN12MSDataModule(pl.LightningDataModule):
     """LightningDataModule implementation for the SEN12MS dataset.

diff --git a/torchgeo/datamodules/so2sat.py b/torchgeo/datamodules/so2sat.py
@@ -13,10 +13,6 @@
 
 from ..datasets import So2Sat
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 class So2SatDataModule(pl.LightningDataModule):
     """LightningDataModule implementation for the So2Sat dataset.

diff --git a/torchgeo/datamodules/spacenet.py b/torchgeo/datamodules/spacenet.py
@@ -13,10 +13,6 @@
 from ..datasets import SpaceNet1
 from .utils import dataset_split
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 class SpaceNet1DataModule(pl.LightningDataModule):
     """LightningDataModule implementation for the SpaceNet1 dataset.

diff --git a/torchgeo/datamodules/ucmerced.py b/torchgeo/datamodules/ucmerced.py
@@ -13,10 +13,6 @@
 
 from ..datasets import UCMerced
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 class UCMercedDataModule(pl.LightningDataModule):
     """LightningDataModule implementation for the UC Merced dataset.

diff --git a/torchgeo/datasets/__init__.py b/torchgeo/datasets/__init__.py
@@ -211,7 +211,3 @@
     "stack_samples",
     "unbind_samples",
 )
-
-# https://stackoverflow.com/questions/40018681
-for module in __all__:
-    globals()[module].__module__ = "torchgeo.datasets"
diff --git a/torchgeo/datasets/geo.py b/torchgeo/datasets/geo.py
@@ -32,11 +32,6 @@
 
 from .utils import BoundingBox, concat_samples, disambiguate_timestamp, merge_samples
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-Dataset.__module__ = "torch.utils.data"
-ImageFolder.__module__ = "torchvision.datasets"
-
 
 class GeoDataset(Dataset[Dict[str, Any]], abc.ABC):
     """Abstract base class for datasets containing geospatial information.
@@ -275,8 +270,8 @@ class RasterDataset(GeoDataset):
     #:
     #: * ``date``: used to calculate ``mint`` and ``maxt`` for ``index`` insertion
     #:
-    #: When :attr:`separate_files`` is True, the following additional groups are
-    #: searched for to find other files:
+    #: When :attr:`~RasterDataset.separate_files` is True, the following additional
+    #: groups are searched for to find other files:
     #:
     #: * ``band``: replaced with requested band name
     filename_regex = ".*"

diff --git a/torchgeo/losses/__init__.py b/torchgeo/losses/__init__.py
@@ -6,7 +6,3 @@
 from .qr import QRLoss, RQLoss
 
 __all__ = ("QRLoss", "RQLoss")
-
-# https://stackoverflow.com/questions/40018681
-for module in __all__:
-    globals()[module].__module__ = "torchgeo.losses"
diff --git a/torchgeo/losses/qr.py b/torchgeo/losses/qr.py
@@ -4,10 +4,6 @@
 import torch.nn.functional as F
 from torch.nn.modules import Module
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-Module.__module__ = "torch.nn"
-
 
 class QRLoss(Module):
     """The QR (forward) loss between class probabilities and predictions.

diff --git a/torchgeo/models/__init__.py b/torchgeo/models/__init__.py
@@ -21,7 +21,3 @@
     "RCF",
     "resnet50",
 )
-
-# https://stackoverflow.com/questions/40018681
-for module in __all__:
-    globals()[module].__module__ = "torchgeo.models"
diff --git a/torchgeo/models/changestar.py b/torchgeo/models/changestar.py
@@ -13,10 +13,6 @@
 
 from .farseg import FarSeg
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-Module.__module__ = "torch.nn"
-
 
 class ChangeMixin(Module):
     """This module enables any segmentation model to detect binary change.

diff --git a/torchgeo/models/farseg.py b/torchgeo/models/farseg.py
@@ -25,18 +25,6 @@
 from torchvision.models import resnet
 from torchvision.ops import FeaturePyramidNetwork as FPN
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-Module.__module__ = "torch.nn"
-ModuleList.__module__ = "nn.ModuleList"
-Sequential.__module__ = "nn.Sequential"
-Conv2d.__module__ = "nn.Conv2d"
-BatchNorm2d.__module__ = "nn.BatchNorm2d"
-ReLU.__module__ = "nn.ReLU"
-UpsamplingBilinear2d.__module__ = "nn.UpsamplingBilinear2d"
-Sigmoid.__module__ = "nn.Sigmoid"
-Identity.__module__ = "nn.Identity"
-
 
 class FarSeg(Module):
     """Foreground-Aware Relation Network (FarSeg).

diff --git a/torchgeo/models/fcn.py b/torchgeo/models/fcn.py
@@ -7,10 +7,6 @@
 from torch import Tensor
 from torch.nn.modules import Module
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-Module.__module__ = "torch.nn"
-
 
 class FCN(Module):
     """A simple 5 layer FCN with leaky relus and 'same' padding."""

diff --git a/torchgeo/models/fcsiam.py b/torchgeo/models/fcsiam.py
@@ -11,8 +11,6 @@
 from segmentation_models_pytorch.base.model import SegmentationModel
 from torch import Tensor
 
-Unet.__module__ = "segmentation_models_pytorch"
-
 
 class FCSiamConc(SegmentationModel):  # type: ignore[misc]
     """Fully-convolutional Siamese Concatenation (FC-Siam-conc).

diff --git a/torchgeo/models/rcf.py b/torchgeo/models/rcf.py
@@ -8,10 +8,7 @@
 import torch
 import torch.nn.functional as F
 from torch import Tensor
-from torch.nn.modules import Conv2d, Module
-
-Module.__module__ = "torch.nn"
-Conv2d.__module__ = "torch.nn"
+from torch.nn.modules import Module
 
 
 class RCF(Module):

diff --git a/torchgeo/samplers/__init__.py b/torchgeo/samplers/__init__.py
@@ -24,7 +24,3 @@
     # Constants
     "Units",
 )
-
-# https://stackoverflow.com/questions/40018681
-for module in __all__:
-    globals()[module].__module__ = "torchgeo.samplers"
diff --git a/torchgeo/samplers/batch.py b/torchgeo/samplers/batch.py
@@ -14,10 +14,6 @@
 from .constants import Units
 from .utils import _to_tuple, get_random_bounding_box, tile_to_chips
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-Sampler.__module__ = "torch.utils.data"
-
 
 class BatchGeoSampler(Sampler[List[BoundingBox]], abc.ABC):
     """Abstract base class for sampling from :class:`~torchgeo.datasets.GeoDataset`.

diff --git a/torchgeo/samplers/single.py b/torchgeo/samplers/single.py
@@ -14,10 +14,6 @@
 from .constants import Units
 from .utils import _to_tuple, get_random_bounding_box, tile_to_chips
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-Sampler.__module__ = "torch.utils.data"
-
 
 class GeoSampler(Sampler[BoundingBox], abc.ABC):
     """Abstract base class for sampling from :class:`~torchgeo.datasets.GeoDataset`.

diff --git a/torchgeo/trainers/__init__.py b/torchgeo/trainers/__init__.py
@@ -17,7 +17,3 @@
     "RegressionTask",
     "SemanticSegmentationTask",
 )
-
-# https://stackoverflow.com/questions/40018681
-for module in __all__:
-    globals()[module].__module__ = "torchgeo.trainers"
diff --git a/torchgeo/trainers/byol.py b/torchgeo/trainers/byol.py
@@ -20,10 +20,6 @@
 
 from . import utils
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-Module.__module__ = "torch.nn"
-
 
 def normalized_mse(x: Tensor, y: Tensor) -> Tensor:
     """Computes the normalized mean squared error between x and y.

diff --git a/torchgeo/trainers/classification.py b/torchgeo/trainers/classification.py
@@ -13,7 +13,6 @@
 import torch.nn as nn
 from segmentation_models_pytorch.losses import FocalLoss, JaccardLoss
 from torch import Tensor
-from torch.nn.modules import Conv2d, Linear
 from torch.optim.lr_scheduler import ReduceLROnPlateau
 from torchmetrics import MetricCollection
 from torchmetrics.classification import (
@@ -27,11 +26,6 @@
 from ..datasets.utils import unbind_samples
 from . import utils
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-Conv2d.__module__ = "nn.Conv2d"
-Linear.__module__ = "nn.Linear"
-
 
 class ClassificationTask(pl.LightningModule):
     """LightningModule for image classification.

diff --git a/torchgeo/trainers/detection.py b/torchgeo/trainers/detection.py
@@ -12,7 +12,6 @@
 from packaging.version import parse
 from torch import Tensor
 from torch.optim.lr_scheduler import ReduceLROnPlateau
-from torch.utils.data import DataLoader
 from torchmetrics.detection.mean_ap import MeanAveragePrecision
 from torchvision.models.detection import FasterRCNN
 from torchvision.models.detection.backbone_utils import resnet_fpn_backbone
@@ -36,10 +35,6 @@
 
 from ..datasets.utils import unbind_samples
 
-# https://github.com/pytorch/pytorch/issues/60979
-# https://github.com/pytorch/pytorch/pull/61045
-DataLoader.__module__ = "torch.utils.data"
-
 
 class ObjectDetectionTask(pl.LightningModule):
     """LightningModule for object detection of images.