Making _preset.py classes

datumbox · datumbox · commit a696473d7000 · 2022-03-16T13:17:22.000Z
diff --git a/torchvision/models/alexnet.py b/torchvision/models/alexnet.py
@@ -4,7 +4,7 @@
 import torch
 import torch.nn as nn
 
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/convnext.py b/torchvision/models/convnext.py
@@ -7,7 +7,7 @@
 
 from ..ops.misc import Conv2dNormActivation
 from ..ops.stochastic_depth import StochasticDepth
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/densenet.py b/torchvision/models/densenet.py
@@ -9,7 +9,7 @@
 import torch.utils.checkpoint as cp
 from torch import Tensor
 
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/detection/faster_rcnn.py b/torchvision/models/detection/faster_rcnn.py
@@ -5,7 +5,7 @@
 from torchvision.ops import MultiScaleRoIAlign
 
 from ...ops import misc as misc_nn_ops
-from ...transforms import ObjectDetectionEval, InterpolationMode
+from ...transforms._presets import ObjectDetectionEval, InterpolationMode
 from .._api import WeightsEnum, Weights
 from .._meta import _COCO_CATEGORIES
 from .._utils import handle_legacy_interface, _ovewrite_value_param
diff --git a/torchvision/models/detection/fcos.py b/torchvision/models/detection/fcos.py
@@ -11,7 +11,7 @@
 from ...ops import boxes as box_ops
 from ...ops import misc as misc_nn_ops
 from ...ops.feature_pyramid_network import LastLevelP6P7
-from ...transforms import ObjectDetectionEval, InterpolationMode
+from ...transforms._presets import ObjectDetectionEval, InterpolationMode
 from ...utils import _log_api_usage_once
 from .._api import WeightsEnum, Weights
 from .._meta import _COCO_CATEGORIES
diff --git a/torchvision/models/detection/keypoint_rcnn.py b/torchvision/models/detection/keypoint_rcnn.py
@@ -5,7 +5,7 @@
 from torchvision.ops import MultiScaleRoIAlign
 
 from ...ops import misc as misc_nn_ops
-from ...transforms import ObjectDetectionEval, InterpolationMode
+from ...transforms._presets import ObjectDetectionEval, InterpolationMode
 from .._api import WeightsEnum, Weights
 from .._meta import _COCO_PERSON_CATEGORIES, _COCO_PERSON_KEYPOINT_NAMES
 from .._utils import handle_legacy_interface, _ovewrite_value_param
diff --git a/torchvision/models/detection/mask_rcnn.py b/torchvision/models/detection/mask_rcnn.py
@@ -5,7 +5,7 @@
 from torchvision.ops import MultiScaleRoIAlign
 
 from ...ops import misc as misc_nn_ops
-from ...transforms import ObjectDetectionEval, InterpolationMode
+from ...transforms._presets import ObjectDetectionEval, InterpolationMode
 from .._api import WeightsEnum, Weights
 from .._meta import _COCO_CATEGORIES
 from .._utils import handle_legacy_interface, _ovewrite_value_param
diff --git a/torchvision/models/detection/retinanet.py b/torchvision/models/detection/retinanet.py
@@ -10,7 +10,7 @@
 from ...ops import boxes as box_ops
 from ...ops import misc as misc_nn_ops
 from ...ops.feature_pyramid_network import LastLevelP6P7
-from ...transforms import ObjectDetectionEval, InterpolationMode
+from ...transforms._presets import ObjectDetectionEval, InterpolationMode
 from ...utils import _log_api_usage_once
 from .._api import WeightsEnum, Weights
 from .._meta import _COCO_CATEGORIES
diff --git a/torchvision/models/detection/ssd.py b/torchvision/models/detection/ssd.py
@@ -7,7 +7,7 @@
 from torch import nn, Tensor
 
 from ...ops import boxes as box_ops
-from ...transforms import ObjectDetectionEval, InterpolationMode
+from ...transforms._presets import ObjectDetectionEval, InterpolationMode
 from ...utils import _log_api_usage_once
 from .._api import WeightsEnum, Weights
 from .._meta import _COCO_CATEGORIES
diff --git a/torchvision/models/detection/ssdlite.py b/torchvision/models/detection/ssdlite.py
@@ -7,7 +7,7 @@
 from torch import nn, Tensor
 
 from ...ops.misc import Conv2dNormActivation
-from ...transforms import ObjectDetectionEval, InterpolationMode
+from ...transforms._presets import ObjectDetectionEval, InterpolationMode
 from ...utils import _log_api_usage_once
 from .. import mobilenet
 from .._api import WeightsEnum, Weights
diff --git a/torchvision/models/efficientnet.py b/torchvision/models/efficientnet.py
@@ -10,7 +10,7 @@
 from torchvision.ops import StochasticDepth
 
 from ..ops.misc import Conv2dNormActivation, SqueezeExcitation
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/googlenet.py b/torchvision/models/googlenet.py
@@ -8,7 +8,7 @@
 import torch.nn.functional as F
 from torch import Tensor
 
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/inception.py b/torchvision/models/inception.py
@@ -7,7 +7,7 @@
 import torch.nn.functional as F
 from torch import nn, Tensor
 
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/mnasnet.py b/torchvision/models/mnasnet.py
@@ -6,7 +6,7 @@
 import torch.nn as nn
 from torch import Tensor
 
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/mobilenetv2.py b/torchvision/models/mobilenetv2.py
@@ -7,7 +7,7 @@
 from torch import nn
 
 from ..ops.misc import Conv2dNormActivation
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/mobilenetv3.py b/torchvision/models/mobilenetv3.py
@@ -6,7 +6,7 @@
 from torch import nn, Tensor
 
 from ..ops.misc import Conv2dNormActivation, SqueezeExcitation as SElayer
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/optical_flow/raft.py b/torchvision/models/optical_flow/raft.py
@@ -8,7 +8,7 @@
 from torch.nn.modules.instancenorm import InstanceNorm2d
 from torchvision.ops import Conv2dNormActivation
 
-from ...transforms import OpticalFlowEval, InterpolationMode
+from ...transforms._presets import OpticalFlowEval, InterpolationMode
 from ...utils import _log_api_usage_once
 from .._api import Weights, WeightsEnum
 from .._utils import handle_legacy_interface
diff --git a/torchvision/models/quantization/googlenet.py b/torchvision/models/quantization/googlenet.py
@@ -7,7 +7,7 @@
 from torch import Tensor
 from torch.nn import functional as F
 
-from ...transforms import ImageClassificationEval, InterpolationMode
+from ...transforms._presets import ImageClassificationEval, InterpolationMode
 from .._api import WeightsEnum, Weights
 from .._meta import _IMAGENET_CATEGORIES
 from .._utils import handle_legacy_interface, _ovewrite_named_param
diff --git a/torchvision/models/quantization/inception.py b/torchvision/models/quantization/inception.py
@@ -9,7 +9,7 @@
 from torchvision.models import inception as inception_module
 from torchvision.models.inception import InceptionOutputs, Inception_V3_Weights
 
-from ...transforms import ImageClassificationEval, InterpolationMode
+from ...transforms._presets import ImageClassificationEval, InterpolationMode
 from .._api import WeightsEnum, Weights
 from .._meta import _IMAGENET_CATEGORIES
 from .._utils import handle_legacy_interface, _ovewrite_named_param
diff --git a/torchvision/models/quantization/mobilenetv2.py b/torchvision/models/quantization/mobilenetv2.py
@@ -7,7 +7,7 @@
 from torchvision.models.mobilenetv2 import InvertedResidual, MobileNetV2, MobileNet_V2_Weights
 
 from ...ops.misc import Conv2dNormActivation
-from ...transforms import ImageClassificationEval, InterpolationMode
+from ...transforms._presets import ImageClassificationEval, InterpolationMode
 from .._api import WeightsEnum, Weights
 from .._meta import _IMAGENET_CATEGORIES
 from .._utils import handle_legacy_interface, _ovewrite_named_param
diff --git a/torchvision/models/quantization/mobilenetv3.py b/torchvision/models/quantization/mobilenetv3.py
@@ -6,7 +6,7 @@
 from torch.ao.quantization import QuantStub, DeQuantStub
 
 from ...ops.misc import Conv2dNormActivation, SqueezeExcitation
-from ...transforms import ImageClassificationEval, InterpolationMode
+from ...transforms._presets import ImageClassificationEval, InterpolationMode
 from .._api import WeightsEnum, Weights
 from .._meta import _IMAGENET_CATEGORIES
 from .._utils import handle_legacy_interface, _ovewrite_named_param
diff --git a/torchvision/models/quantization/resnet.py b/torchvision/models/quantization/resnet.py
@@ -13,7 +13,7 @@
     ResNeXt101_32X8D_Weights,
 )
 
-from ...transforms import ImageClassificationEval, InterpolationMode
+from ...transforms._presets import ImageClassificationEval, InterpolationMode
 from .._api import WeightsEnum, Weights
 from .._meta import _IMAGENET_CATEGORIES
 from .._utils import handle_legacy_interface, _ovewrite_named_param
diff --git a/torchvision/models/quantization/shufflenetv2.py b/torchvision/models/quantization/shufflenetv2.py
@@ -6,7 +6,7 @@
 from torch import Tensor
 from torchvision.models import shufflenetv2
 
-from ...transforms import ImageClassificationEval, InterpolationMode
+from ...transforms._presets import ImageClassificationEval, InterpolationMode
 from .._api import WeightsEnum, Weights
 from .._meta import _IMAGENET_CATEGORIES
 from .._utils import handle_legacy_interface, _ovewrite_named_param
diff --git a/torchvision/models/regnet.py b/torchvision/models/regnet.py
@@ -7,7 +7,7 @@
 from torch import nn, Tensor
 
 from ..ops.misc import Conv2dNormActivation, SqueezeExcitation
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/resnet.py b/torchvision/models/resnet.py
@@ -5,7 +5,7 @@
 import torch.nn as nn
 from torch import Tensor
 
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/segmentation/deeplabv3.py b/torchvision/models/segmentation/deeplabv3.py
@@ -5,7 +5,7 @@
 from torch import nn
 from torch.nn import functional as F
 
-from ...transforms import SemanticSegmentationEval, InterpolationMode
+from ...transforms._presets import SemanticSegmentationEval, InterpolationMode
 from .._api import WeightsEnum, Weights
 from .._meta import _VOC_CATEGORIES
 from .._utils import IntermediateLayerGetter, handle_legacy_interface, _ovewrite_value_param
diff --git a/torchvision/models/segmentation/fcn.py b/torchvision/models/segmentation/fcn.py
@@ -3,7 +3,7 @@
 
 from torch import nn
 
-from ...transforms import SemanticSegmentationEval, InterpolationMode
+from ...transforms._presets import SemanticSegmentationEval, InterpolationMode
 from .._api import WeightsEnum, Weights
 from .._meta import _VOC_CATEGORIES
 from .._utils import IntermediateLayerGetter, handle_legacy_interface, _ovewrite_value_param
diff --git a/torchvision/models/segmentation/lraspp.py b/torchvision/models/segmentation/lraspp.py
@@ -5,7 +5,7 @@
 from torch import nn, Tensor
 from torch.nn import functional as F
 
-from ...transforms import SemanticSegmentationEval, InterpolationMode
+from ...transforms._presets import SemanticSegmentationEval, InterpolationMode
 from ...utils import _log_api_usage_once
 from .._api import WeightsEnum, Weights
 from .._meta import _VOC_CATEGORIES
diff --git a/torchvision/models/shufflenetv2.py b/torchvision/models/shufflenetv2.py
@@ -5,7 +5,7 @@
 import torch.nn as nn
 from torch import Tensor
 
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/squeezenet.py b/torchvision/models/squeezenet.py
@@ -5,7 +5,7 @@
 import torch.nn as nn
 import torch.nn.init as init
 
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/vgg.py b/torchvision/models/vgg.py
@@ -4,7 +4,7 @@
 import torch
 import torch.nn as nn
 
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/models/video/resnet.py b/torchvision/models/video/resnet.py
@@ -4,7 +4,7 @@
 import torch.nn as nn
 from torch import Tensor
 
-from ...transforms import VideoClassificationEval, InterpolationMode
+from ...transforms._presets import VideoClassificationEval, InterpolationMode
 from ...utils import _log_api_usage_once
 from .._api import WeightsEnum, Weights
 from .._meta import _KINETICS400_CATEGORIES
diff --git a/torchvision/models/vision_transformer.py b/torchvision/models/vision_transformer.py
@@ -7,7 +7,7 @@
 import torch.nn as nn
 
 from ..ops.misc import Conv2dNormActivation
-from ..transforms import ImageClassificationEval, InterpolationMode
+from ..transforms._presets import ImageClassificationEval, InterpolationMode
 from ..utils import _log_api_usage_once
 from ._api import WeightsEnum, Weights
 from ._meta import _IMAGENET_CATEGORIES
diff --git a/torchvision/transforms/__init__.py b/torchvision/transforms/__init__.py
@@ -1,9 +1,2 @@
 from .transforms import *
 from .autoaugment import *
-from ._presets import (
-    ObjectDetectionEval,
-    ImageClassificationEval,
-    SemanticSegmentationEval,
-    VideoClassificationEval,
-    OpticalFlowEval,
-)
diff --git a/torchvision/transforms/_presets.py b/torchvision/transforms/_presets.py
@@ -1,3 +1,7 @@
+"""
+This file is part of the private API. Please do not use directly these classes as they will be modified on
+future versions without warning. The classes should be accessed only via the transforms argument of Weights.
+"""
 from typing import Dict, Optional, Tuple
 
 import torch
