Skip to content

Commit 70e70d7

Browse files
sneaxiysneaxiy
committed
fix api.spec
1 parent 6724801 commit 70e70d7

File tree

2 files changed

+27
-20
lines changed

2 files changed

+27
-20
lines changed

‎paddle/fluid/API.spec

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,14 @@ paddle.fluid.layers.unstack ArgSpec(args=['x', 'axis', 'num'], varargs=None, key
178178
paddle.fluid.layers.sequence_enumerate ArgSpec(args=['input', 'win_size', 'pad_value', 'name'], varargs=None, keywords=None, defaults=(0, None))
179179
paddle.fluid.layers.expand ArgSpec(args=['x', 'expand_times', 'name'], varargs=None, keywords=None, defaults=(None,))
180180
paddle.fluid.layers.sequence_concat ArgSpec(args=['input', 'name'], varargs=None, keywords=None, defaults=(None,))
181-
paddle.fluid.layers.scale ArgSpec(args=['x', 'scale', 'bias', 'bias_after_scale'], varargs=None, keywords=None, defaults=(1.0, 0.0, True))
182-
paddle.fluid.layers.elementwise_add ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn'], varargs=None, keywords=None, defaults=(-1, False))
183-
paddle.fluid.layers.elementwise_div ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn'], varargs=None, keywords=None, defaults=(-1, False))
184-
paddle.fluid.layers.elementwise_sub ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn'], varargs=None, keywords=None, defaults=(-1, False))
185-
paddle.fluid.layers.elementwise_mul ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn'], varargs=None, keywords=None, defaults=(-1, False))
186-
paddle.fluid.layers.elementwise_max ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn'], varargs=None, keywords=None, defaults=(-1, False))
187-
paddle.fluid.layers.elementwise_min ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn'], varargs=None, keywords=None, defaults=(-1, False))
188-
paddle.fluid.layers.elementwise_pow ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn'], varargs=None, keywords=None, defaults=(-1, False))
181+
paddle.fluid.layers.scale ArgSpec(args=['x', 'scale', 'bias', 'bias_after_scale', 'act', 'name'], varargs=None, keywords=None, defaults=(1.0, 0.0, True, None, None))
182+
paddle.fluid.layers.elementwise_add ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
183+
paddle.fluid.layers.elementwise_div ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
184+
paddle.fluid.layers.elementwise_sub ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
185+
paddle.fluid.layers.elementwise_mul ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
186+
paddle.fluid.layers.elementwise_max ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
187+
paddle.fluid.layers.elementwise_min ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
188+
paddle.fluid.layers.elementwise_pow ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
189189
paddle.fluid.layers.data ArgSpec(args=['name', 'shape', 'append_batch_size', 'dtype', 'lod_level', 'type', 'stop_gradient'], varargs=None, keywords=None, defaults=(True, 'float32', 0, VarType.LOD_TENSOR, True))
190190
paddle.fluid.layers.open_files ArgSpec(args=['filenames', 'shapes', 'lod_levels', 'dtypes', 'thread_num', 'buffer_size', 'pass_num', 'is_test'], varargs=None, keywords=None, defaults=(None, None, 1, None))
191191
paddle.fluid.layers.read_file ArgSpec(args=['reader'], varargs=None, keywords=None, defaults=None)

‎python/paddle/fluid/layers/nn.py

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6471,7 +6471,13 @@ def _elementwise_op(helper):
64716471
assert y is not None, 'y cannot be None in {}'.format(op_type)
64726472
axis = helper.kwargs.get('axis', -1)
64736473
use_mkldnn = helper.kwargs.get('use_mkldnn', False)
6474-
out = helper.create_tmp_variable(dtype=x.dtype)
6474+
name = helper.kwargs.get('name', None)
6475+
if name is None:
6476+
out = helper.create_tmp_variable(dtype=x.dtype)
6477+
else:
6478+
out = helper.create_variable(
6479+
name=name, dtype=x.dtype, persistable=False)
6480+
64756481
helper.append_op(
64766482
type=op_type,
64776483
inputs={'X': x,
@@ -6483,7 +6489,7 @@ def _elementwise_op(helper):
64836489

64846490

64856491
@templatedoc()
6486-
def scale(x, scale=1.0, bias=0.0, bias_after_scale=True, name=None):
6492+
def scale(x, scale=1.0, bias=0.0, bias_after_scale=True, act=None, name=None):
64876493
"""
64886494
${comment}
64896495
@@ -6492,14 +6498,14 @@ def scale(x, scale=1.0, bias=0.0, bias_after_scale=True, name=None):
64926498
scale(${scale_type}): ${scale_comment}
64936499
bias(${bias_type}): ${bias_comment}
64946500
bias_after_scale(${bias_after_scale_type}): ${bias_after_scale_comment}
6501+
act(basestring|None): Activation applied to the output.
64956502
name(basestring|None): Name of the output.
64966503
64976504
Returns:
64986505
out(${out_type}): ${out_comment}
64996506
"""
65006507

65016508
helper = LayerHelper('scale', **locals())
6502-
out = helper.create_tmp_variable(dtype=x.dtype)
65036509
if name is None:
65046510
out = helper.create_tmp_variable(dtype=x.dtype)
65056511
else:
@@ -6515,34 +6521,34 @@ def scale(x, scale=1.0, bias=0.0, bias_after_scale=True, name=None):
65156521
'bias': float(bias),
65166522
'bias_after_scale': bias_after_scale
65176523
})
6518-
return out
6524+
return helper.append_activation(out)
65196525

65206526

6521-
def elementwise_add(x, y, axis=-1, use_mkldnn=False, act=None):
6527+
def elementwise_add(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
65226528
return _elementwise_op(LayerHelper('elementwise_add', **locals()))
65236529

65246530

6525-
def elementwise_div(x, y, axis=-1, use_mkldnn=False, act=None):
6531+
def elementwise_div(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
65266532
return _elementwise_op(LayerHelper('elementwise_div', **locals()))
65276533

65286534

6529-
def elementwise_sub(x, y, axis=-1, use_mkldnn=False, act=None):
6535+
def elementwise_sub(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
65306536
return _elementwise_op(LayerHelper('elementwise_sub', **locals()))
65316537

65326538

6533-
def elementwise_mul(x, y, axis=-1, use_mkldnn=False, act=None):
6539+
def elementwise_mul(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
65346540
return _elementwise_op(LayerHelper('elementwise_mul', **locals()))
65356541

65366542

6537-
def elementwise_max(x, y, axis=-1, use_mkldnn=False, act=None):
6543+
def elementwise_max(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
65386544
return _elementwise_op(LayerHelper('elementwise_max', **locals()))
65396545

65406546

6541-
def elementwise_min(x, y, axis=-1, use_mkldnn=False, act=None):
6547+
def elementwise_min(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
65426548
return _elementwise_op(LayerHelper('elementwise_min', **locals()))
65436549

65446550

6545-
def elementwise_pow(x, y, axis=-1, use_mkldnn=False, act=None):
6551+
def elementwise_pow(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
65466552
return _elementwise_op(LayerHelper('elementwise_pow', **locals()))
65476553

65486554

@@ -6554,5 +6560,6 @@ def elementwise_pow(x, y, axis=-1, use_mkldnn=False, act=None):
65546560
func.__doc__ = _generate_doc_string_(
65556561
op_proto,
65566562
additional_args_lines=[
6557-
"act(basestring|None): Activation to be applied to the output."
6563+
"act (basestring|None): Activation applied to the output.",
6564+
"name (basestring|None): Name of the output."
65586565
])

0 commit comments

Comments
 (0)