From d4e2d272139c721eae1c2e095551e48cbb79dabb Mon Sep 17 00:00:00 2001
From: Megvii Engine Team <megengine@megvii.com>
Date: Sat, 10 Oct 2020 19:56:59 +0800
Subject: [PATCH] feat(mge): do not export F.nn.conv_bias_activation

GitOrigin-RevId: e536f87fad1f16dd3f3501f65210d2573a939434
---
 imperative/python/megengine/functional/__init__.py        | 1 -
 imperative/python/megengine/functional/nn.py              | 3 ++-
 imperative/python/megengine/module/quantized/conv.py      | 2 +-
 imperative/python/test/unit/functional/test_functional.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/imperative/python/megengine/functional/__init__.py b/imperative/python/megengine/functional/__init__.py
index 4dc2675aa..37455891a 100644
--- a/imperative/python/megengine/functional/__init__.py
+++ b/imperative/python/megengine/functional/__init__.py
@@ -10,7 +10,6 @@
 from .elemwise import *
 from .math import *
 from .nn import *
-from .quantized import conv_bias_activation
 from .tensor import *
 from .utils import *
 
diff --git a/imperative/python/megengine/functional/nn.py b/imperative/python/megengine/functional/nn.py
index 55037d8db..3da95a79c 100644
--- a/imperative/python/megengine/functional/nn.py
+++ b/imperative/python/megengine/functional/nn.py
@@ -1526,4 +1526,5 @@ def nms(boxes: Tensor, scores: Tensor, iou_thresh: float) -> Tensor:
 
 
 
-from .loss import *
+from .loss import *  # isort:skip
+from .quantized import conv_bias_activation  # isort:skip
diff --git a/imperative/python/megengine/module/quantized/conv.py b/imperative/python/megengine/module/quantized/conv.py
index d5b756401..d8935cd79 100644
--- a/imperative/python/megengine/module/quantized/conv.py
+++ b/imperative/python/megengine/module/quantized/conv.py
@@ -11,7 +11,7 @@ import numpy as np
 
 from ... import module as Float
 from ...core.tensor import dtype
-from ...functional import conv_bias_activation
+from ...functional.nn import conv_bias_activation
 from ...tensor import Parameter
 from ..qat import conv as QAT
 from .module import QuantizedModule
diff --git a/imperative/python/test/unit/functional/test_functional.py b/imperative/python/test/unit/functional/test_functional.py
index 25f96a262..ec99c5ca7 100644
--- a/imperative/python/test/unit/functional/test_functional.py
+++ b/imperative/python/test/unit/functional/test_functional.py
@@ -438,7 +438,7 @@ def test_conv_bias():
                 inp = convert_to_nchw4(inp)
                 w = convert_to_nchw4(w)
                 b = convert_to_nchw4(b)
-            return F.conv_bias_activation(
+            return F.nn.conv_bias_activation(
                 inp,
                 w,
                 b,
-- 
GitLab