diff --git a/imperative/python/megengine/functional/__init__.py b/imperative/python/megengine/functional/__init__.py index 4dc2675aaf3c2130c2c5b4e27434ed99cd9884e2..37455891a26dd00cb60e6ec3a4482034fe0bbb95 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 55037d8dbce4f4f86f3aaa2b192227ae7066e40d..3da95a79cb3ae542264f13f7e3e699b26edf5400 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 d5b756401bf1f7a2abc0e7eb13b9c20bfde4d8af..d8935cd790917c20d4dd53ebed0ee3206c4310f8 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 25f96a2628daa85973892c38638dfb7497ac05b2..ec99c5ca7a09388121f7beb40dbffd68c2aff53b 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,