diff --git a/imperative/python/megengine/functional/__init__.py b/imperative/python/megengine/functional/__init__.py index c2a78a46..86e1ea25 100644 --- a/imperative/python/megengine/functional/__init__.py +++ b/imperative/python/megengine/functional/__init__.py @@ -1,13 +1,11 @@ # -*- coding: utf-8 -*- # pylint: disable=redefined-builtin -from . import metric, utils, vision from .elemwise import * from .math import * from .nn import * from .tensor import * -from .utils import * -from . import distributed # isort:skip +from . import utils, vision, distributed # isort:skip # delete namespace # pylint: disable=undefined-variable diff --git a/imperative/python/megengine/functional/nn.py b/imperative/python/megengine/functional/nn.py index f4b998e3..29517e12 100644 --- a/imperative/python/megengine/functional/nn.py +++ b/imperative/python/megengine/functional/nn.py @@ -43,6 +43,7 @@ from .debug_param import get_execution_strategy from .distributed import all_reduce_sum from .elemwise import _elwise, exp, log, log1p, maximum, minimum from .math import max, sum +from .metric import topk_accuracy from .tensor import broadcast_to, concat, expand_dims, ones, squeeze, zeros __all__ = [ @@ -85,6 +86,7 @@ __all__ = [ "softmax", "softplus", "sync_batch_norm", + "topk_accuracy", "warp_affine", "warp_perspective", "pixel_shuffle", @@ -1960,5 +1962,4 @@ def pixel_shuffle(inp: Tensor, upscale_factor: int) -> Tensor: from .quantized import conv_bias_activation # isort:skip from .loss import * # isort:skip -from .metric import * # isort:skip from .vision import * # isort:skip diff --git a/imperative/python/megengine/functional/utils.py b/imperative/python/megengine/functional/utils.py index b24272d0..5b337fb4 100644 --- a/imperative/python/megengine/functional/utils.py +++ b/imperative/python/megengine/functional/utils.py @@ -7,8 +7,6 @@ from ..utils.deprecation import deprecated_func from .elemwise import abs, maximum, minimum from .tensor import ones, zeros -__all__ = ["topk_accuracy"] - def _assert_equal( expect: Tensor, actual: Tensor, *, maxerr: float = 0.0001, verbose: bool = False