From 10e469e947131571119521a657453719468ec5c8 Mon Sep 17 00:00:00 2001 From: Joao Gomes Date: Thu, 24 Feb 2022 15:09:58 +0000 Subject: [PATCH] Revert exposing convNormActivation in ops --- docs/source/ops.rst | 1 - torchvision/models/optical_flow/raft.py | 2 +- torchvision/ops/__init__.py | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/source/ops.rst b/docs/source/ops.rst index 2a960474205..4e05cf79c32 100644 --- a/docs/source/ops.rst +++ b/docs/source/ops.rst @@ -45,5 +45,4 @@ Operators FeaturePyramidNetwork StochasticDepth FrozenBatchNorm2d - ConvNormActivation SqueezeExcitation diff --git a/torchvision/models/optical_flow/raft.py b/torchvision/models/optical_flow/raft.py index 18aa25df625..83645cf38df 100644 --- a/torchvision/models/optical_flow/raft.py +++ b/torchvision/models/optical_flow/raft.py @@ -6,7 +6,7 @@ from torch import Tensor from torch.nn.modules.batchnorm import BatchNorm2d from torch.nn.modules.instancenorm import InstanceNorm2d -from torchvision.ops import ConvNormActivation +from torchvision.ops.misc import ConvNormActivation from ..._internally_replaced_utils import load_state_dict_from_url from ...utils import _log_api_usage_once diff --git a/torchvision/ops/__init__.py b/torchvision/ops/__init__.py index 8ba10080c1f..c0e3f7f238e 100644 --- a/torchvision/ops/__init__.py +++ b/torchvision/ops/__init__.py @@ -14,7 +14,7 @@ from .feature_pyramid_network import FeaturePyramidNetwork from .focal_loss import sigmoid_focal_loss from .giou_loss import generalized_box_iou_loss -from .misc import FrozenBatchNorm2d, ConvNormActivation, SqueezeExcitation +from .misc import FrozenBatchNorm2d, SqueezeExcitation from .poolers import MultiScaleRoIAlign from .ps_roi_align import ps_roi_align, PSRoIAlign from .ps_roi_pool import ps_roi_pool, PSRoIPool @@ -51,7 +51,6 @@ "stochastic_depth", "StochasticDepth", "FrozenBatchNorm2d", - "ConvNormActivation", "SqueezeExcitation", "generalized_box_iou_loss", ]