Browse Source

refactor(functional): hide functional.vision and replace with functional.nn

GitOrigin-RevId: b6888c7f65
release-1.6
Megvii Engine Team 3 years ago
parent
commit
4688bbabad
2 changed files with 14 additions and 12 deletions
  1. +1
    -12
      imperative/python/megengine/functional/nn.py
  2. +13
    -0
      imperative/python/megengine/functional/vision.py

+ 1
- 12
imperative/python/megengine/functional/nn.py View File

@@ -76,7 +76,6 @@ __all__ = [
"relu", "relu",
"relu6", "relu6",
"remap", "remap",
"resize",
"sigmoid", "sigmoid",
"sliding_window", "sliding_window",
"sliding_window_transpose", "sliding_window_transpose",
@@ -1647,17 +1646,7 @@ def pad(
return output return output




interpolate = deprecated_func("1.3", "megengine.functional.vision", "interpolate", True)
roi_pooling = deprecated_func("1.3", "megengine.functional.vision", "roi_pooling", True)
roi_align = deprecated_func("1.3", "megengine.functional.vision", "roi_align", True)
nms = deprecated_func("1.3", "megengine.functional.vision", "nms", True)
resize = deprecated_func("1.3", "megengine.functional.vision", "resize", True)
remap = deprecated_func("1.3", "megengine.functional.vision", "remap", True)
nvof = deprecated_func("1.3", "megengine.functional.vision", "nvof", True)
warp_affine = deprecated_func("1.3", "megengine.functional.vision", "warp_affine", True)
warp_perspective = deprecated_func(
"1.3", "megengine.functional.vision", "warp_perspective", True
)
from .quantized import conv_bias_activation # isort:skip from .quantized import conv_bias_activation # isort:skip
from .loss import * # isort:skip from .loss import * # isort:skip
from .metric import * # isort:skip from .metric import * # isort:skip
from .vision import * # isort:skip

+ 13
- 0
imperative/python/megengine/functional/vision.py View File

@@ -19,6 +19,19 @@ from .elemwise import floor
from .math import argsort from .math import argsort
from .tensor import broadcast_to, concat, expand_dims, reshape, transpose from .tensor import broadcast_to, concat, expand_dims, reshape, transpose


__all__ = [
"correlation",
"cvt_color",
"roi_pooling",
"roi_align",
"nms",
"remap",
"warp_affine",
"warp_perspective",
"interpolate",
"nvof",
]



def cvt_color(inp: Tensor, mode: str = ""): def cvt_color(inp: Tensor, mode: str = ""):
r"""Convert images from one format to another r"""Convert images from one format to another


Loading…
Cancel
Save