未验证 提交 6bfdef72 编写于 作者: X XiaoguangHu 提交者: GitHub

clean redundant API alias in 2.0 - part 2 (#30013)

* delete paddle.nn.functional.assign

* fix dynamic to static error
上级 e6a1e875
...@@ -116,14 +116,14 @@ def is_to_variable(node): ...@@ -116,14 +116,14 @@ def is_to_variable(node):
def to_assign_node(node): def to_assign_node(node):
# Transform dygraph api `fluid.dygraph.to_variable` alias `paddle.to_tensor` to static api `paddle.nn.functional.assign`. # Transform dygraph api `fluid.dygraph.to_variable` alias `paddle.to_tensor` to static api `paddle.assign`.
# NOTE: # NOTE:
# 1. Api `to_variable` supports data type {float16, float32, float64, int16, int32, int64, uint8, uint16}, # 1. Api `to_variable` supports data type {float16, float32, float64, int16, int32, int64, uint8, uint16},
# but api `assign` only supports {float32, float64, int32, int64, bool}; # but api `assign` only supports {float32, float64, int32, int64, bool};
# 2. If the input of api `assign` is numpy.ndarray, its size cannot be greater than 1024 * 1024. # 2. If the input of api `assign` is numpy.ndarray, its size cannot be greater than 1024 * 1024.
assert isinstance(node, gast.Call) assert isinstance(node, gast.Call)
assign_api = gast.parse('paddle.nn.functional.assign').body[0].value assign_api = gast.parse('paddle.assign').body[0].value
node.func = assign_api node.func = assign_api
if node.args: if node.args:
...@@ -132,7 +132,7 @@ def to_assign_node(node): ...@@ -132,7 +132,7 @@ def to_assign_node(node):
else: else:
for idx, kw in enumerate(node.keywords): for idx, kw in enumerate(node.keywords):
if kw.arg == 'value' or kw.arg == 'data': if kw.arg == 'value' or kw.arg == 'data':
node.keywords[idx].arg = 'input' node.keywords[idx].arg = 'x'
node.keywords = [node.keywords[idx]] node.keywords = [node.keywords[idx]]
node.args = [] node.args = []
break break
......
...@@ -563,9 +563,9 @@ def assign(input, output=None): ...@@ -563,9 +563,9 @@ def assign(input, output=None):
[3, 4], [3, 4],
[1, 3]]).astype(np.int64) [1, 3]]).astype(np.int64)
result1 = paddle.zeros(shape=[3, 3], dtype='float32') result1 = paddle.zeros(shape=[3, 3], dtype='float32')
paddle.nn.functional.assign(array, result1) # result1 = [[1, 1], [3 4], [1, 3]] paddle.assign(array, result1) # result1 = [[1, 1], [3 4], [1, 3]]
result2 = paddle.nn.functional.assign(data) # result2 = [[2.5, 2.5], [2.5, 2.5], [2.5, 2.5]] result2 = paddle.assign(data) # result2 = [[2.5, 2.5], [2.5, 2.5], [2.5, 2.5]]
result3 = paddle.nn.functional.assign(np.array([[2.5, 2.5], [2.5, 2.5], [2.5, 2.5]], dtype='float32')) # result3 = [[2.5, 2.5], [2.5, 2.5], [2.5, 2.5]] result3 = paddle.assign(np.array([[2.5, 2.5], [2.5, 2.5], [2.5, 2.5]], dtype='float32')) # result3 = [[2.5, 2.5], [2.5, 2.5], [2.5, 2.5]]
""" """
helper = LayerHelper('assign', **locals()) helper = LayerHelper('assign', **locals())
check_type(input, 'input', (Variable, numpy.ndarray), 'assign') check_type(input, 'input', (Variable, numpy.ndarray), 'assign')
......
...@@ -30,7 +30,7 @@ class TestInplace(unittest.TestCase): ...@@ -30,7 +30,7 @@ class TestInplace(unittest.TestCase):
var[0] = 1.1 var[0] = 1.1
self.assertEqual(var.inplace_version, 1) self.assertEqual(var.inplace_version, 1)
paddle.nn.functional.assign(paddle.ones(shape=[3]), var) paddle.assign(paddle.ones(shape=[3]), var)
# NOTE(liym27): assign(input, output) is an inplace operation for output. # NOTE(liym27): assign(input, output) is an inplace operation for output.
# There is inplace-related processing for api assign, var.inplace_version should be 2 not 1. # There is inplace-related processing for api assign, var.inplace_version should be 2 not 1.
......
...@@ -68,7 +68,6 @@ from .common import pad #DEFINE_ALIAS ...@@ -68,7 +68,6 @@ from .common import pad #DEFINE_ALIAS
from .common import cosine_similarity #DEFINE_ALIAS from .common import cosine_similarity #DEFINE_ALIAS
from .common import unfold #DEFINE_ALIAS from .common import unfold #DEFINE_ALIAS
# from .common import bilinear_tensor_product #DEFINE_ALIAS # from .common import bilinear_tensor_product #DEFINE_ALIAS
from .common import assign #DEFINE_ALIAS
from .common import interpolate #DEFINE_ALIAS from .common import interpolate #DEFINE_ALIAS
from .common import upsample #DEFINE_ALIAS from .common import upsample #DEFINE_ALIAS
from .common import bilinear #DEFINE_ALIAS from .common import bilinear #DEFINE_ALIAS
......
...@@ -23,7 +23,6 @@ from ...fluid import dygraph_utils ...@@ -23,7 +23,6 @@ from ...fluid import dygraph_utils
# from ...fluid import one_hot #DEFINE_ALIAS # from ...fluid import one_hot #DEFINE_ALIAS
# from ...fluid.layers import pad2d #DEFINE_ALIAS # from ...fluid.layers import pad2d #DEFINE_ALIAS
from ...fluid.layers import unfold #DEFINE_ALIAS from ...fluid.layers import unfold #DEFINE_ALIAS
from ...fluid.layers import assign #DEFINE_ALIAS
from ...fluid.layers import squeeze #DEFINE_ALIAS from ...fluid.layers import squeeze #DEFINE_ALIAS
from ...fluid.layers import unsqueeze #DEFINE_ALIAS from ...fluid.layers import unsqueeze #DEFINE_ALIAS
from ...tensor import clip from ...tensor import clip
...@@ -53,7 +52,6 @@ __all__ = [ ...@@ -53,7 +52,6 @@ __all__ = [
'pad', 'pad',
'unfold', 'unfold',
# 'bilinear_tensor_product', # 'bilinear_tensor_product',
'assign',
'interpolate', 'interpolate',
'upsample', 'upsample',
'bilinear', 'bilinear',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册