Skip to content

Commit f1a08a3

Browse files
sneaxiysneaxiy
committed
test=develop
1 parent fde9e0c commit f1a08a3

File tree

2 files changed

+27
-80
lines changed

2 files changed

+27
-80
lines changed

‎paddle/fluid/API.spec

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,14 @@ paddle.fluid.layers.unstack ArgSpec(args=['x', 'axis', 'num'], varargs=None, key
145145
paddle.fluid.layers.sequence_enumerate ArgSpec(args=['input', 'win_size', 'pad_value', 'name'], varargs=None, keywords=None, defaults=(0, None))
146146
paddle.fluid.layers.expand ArgSpec(args=['x', 'expand_times', 'name'], varargs=None, keywords=None, defaults=(None,))
147147
paddle.fluid.layers.sequence_concat ArgSpec(args=['input', 'name'], varargs=None, keywords=None, defaults=(None,))
148-
paddle.fluid.layers.scale ArgSpec(args=['x', 'scale', 'bias', 'bias_after_scale', 'out', 'act', 'name'], varargs=None, keywords=None, defaults=(1.0, 0.0, True, None, None, None))
149-
paddle.fluid.layers.elementwise_add ArgSpec(args=['x', 'y', 'out', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(None, -1, False, None, None))
150-
paddle.fluid.layers.elementwise_div ArgSpec(args=['x', 'y', 'out', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(None, -1, False, None, None))
151-
paddle.fluid.layers.elementwise_sub ArgSpec(args=['x', 'y', 'out', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(None, -1, False, None, None))
152-
paddle.fluid.layers.elementwise_mul ArgSpec(args=['x', 'y', 'out', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(None, -1, False, None, None))
153-
paddle.fluid.layers.elementwise_max ArgSpec(args=['x', 'y', 'out', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(None, -1, False, None, None))
154-
paddle.fluid.layers.elementwise_min ArgSpec(args=['x', 'y', 'out', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(None, -1, False, None, None))
155-
paddle.fluid.layers.elementwise_pow ArgSpec(args=['x', 'y', 'out', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(None, -1, False, None, None))
148+
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))
149+
paddle.fluid.layers.elementwise_add ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
150+
paddle.fluid.layers.elementwise_div ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
151+
paddle.fluid.layers.elementwise_sub ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
152+
paddle.fluid.layers.elementwise_mul ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
153+
paddle.fluid.layers.elementwise_max ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
154+
paddle.fluid.layers.elementwise_min ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
155+
paddle.fluid.layers.elementwise_pow ArgSpec(args=['x', 'y', 'axis', 'use_mkldnn', 'act', 'name'], varargs=None, keywords=None, defaults=(-1, False, None, None))
156156
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))
157157
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))
158158
paddle.fluid.layers.read_file ArgSpec(args=['reader'], varargs=None, keywords=None, defaults=None)

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

Lines changed: 19 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -6471,14 +6471,12 @@ 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.kwargs.get('out', None)
6475-
if out is None:
6476-
name = helper.kwargs.get('name', None)
6477-
if name is None:
6478-
out = helper.create_tmp_variable(dtype=x.dtype)
6479-
else:
6480-
out = helper.create_variable(
6481-
name=name, dtype=x.dtype, persistable=False)
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)
64826480

64836481
helper.append_op(
64846482
type=op_type,
@@ -6491,13 +6489,7 @@ def _elementwise_op(helper):
64916489

64926490

64936491
@templatedoc()
6494-
def scale(x,
6495-
scale=1.0,
6496-
bias=0.0,
6497-
bias_after_scale=True,
6498-
out=None,
6499-
act=None,
6500-
name=None):
6492+
def scale(x, scale=1.0, bias=0.0, bias_after_scale=True, act=None, name=None):
65016493
"""
65026494
${comment}
65036495
@@ -6506,7 +6498,6 @@ def scale(x,
65066498
scale(${scale_type}): ${scale_comment}
65076499
bias(${bias_type}): ${bias_comment}
65086500
bias_after_scale(${bias_after_scale_type}): ${bias_after_scale_comment}
6509-
out(Tensor): Output tensor.
65106501
act(basestring|None): Activation applied to the output.
65116502
name(basestring|None): Name of the output.
65126503
@@ -6515,12 +6506,11 @@ def scale(x,
65156506
"""
65166507

65176508
helper = LayerHelper('scale', **locals())
6518-
if out is None:
6519-
if name is None:
6520-
out = helper.create_tmp_variable(dtype=x.dtype)
6521-
else:
6522-
out = helper.create_variable(
6523-
name=name, dtype=x.dtype, persistable=False)
6509+
if name is None:
6510+
out = helper.create_tmp_variable(dtype=x.dtype)
6511+
else:
6512+
out = helper.create_variable(
6513+
name=name, dtype=x.dtype, persistable=False)
65246514

65256515
helper.append_op(
65266516
type='scale',
@@ -6534,73 +6524,31 @@ def scale(x,
65346524
return helper.append_activation(out)
65356525

65366526

6537-
def elementwise_add(x,
6538-
y,
6539-
out=None,
6540-
axis=-1,
6541-
use_mkldnn=False,
6542-
act=None,
6543-
name=None):
6527+
def elementwise_add(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
65446528
return _elementwise_op(LayerHelper('elementwise_add', **locals()))
65456529

65466530

6547-
def elementwise_div(x,
6548-
y,
6549-
out=None,
6550-
axis=-1,
6551-
use_mkldnn=False,
6552-
act=None,
6553-
name=None):
6531+
def elementwise_div(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
65546532
return _elementwise_op(LayerHelper('elementwise_div', **locals()))
65556533

65566534

6557-
def elementwise_sub(x,
6558-
y,
6559-
out=None,
6560-
axis=-1,
6561-
use_mkldnn=False,
6562-
act=None,
6563-
name=None):
6535+
def elementwise_sub(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
65646536
return _elementwise_op(LayerHelper('elementwise_sub', **locals()))
65656537

65666538

6567-
def elementwise_mul(x,
6568-
y,
6569-
out=None,
6570-
axis=-1,
6571-
use_mkldnn=False,
6572-
act=None,
6573-
name=None):
6539+
def elementwise_mul(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
65746540
return _elementwise_op(LayerHelper('elementwise_mul', **locals()))
65756541

65766542

6577-
def elementwise_max(x,
6578-
y,
6579-
out=None,
6580-
axis=-1,
6581-
use_mkldnn=False,
6582-
act=None,
6583-
name=None):
6543+
def elementwise_max(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
65846544
return _elementwise_op(LayerHelper('elementwise_max', **locals()))
65856545

65866546

6587-
def elementwise_min(x,
6588-
y,
6589-
out=None,
6590-
axis=-1,
6591-
use_mkldnn=False,
6592-
act=None,
6593-
name=None):
6547+
def elementwise_min(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
65946548
return _elementwise_op(LayerHelper('elementwise_min', **locals()))
65956549

65966550

6597-
def elementwise_pow(x,
6598-
y,
6599-
out=None,
6600-
axis=-1,
6601-
use_mkldnn=False,
6602-
act=None,
6603-
name=None):
6551+
def elementwise_pow(x, y, axis=-1, use_mkldnn=False, act=None, name=None):
66046552
return _elementwise_op(LayerHelper('elementwise_pow', **locals()))
66056553

66066554

@@ -6612,7 +6560,6 @@ def elementwise_pow(x,
66126560
func.__doc__ = _generate_doc_string_(
66136561
op_proto,
66146562
additional_args_lines=[
6615-
"out (Tensor): The output tensor of elementwise op.",
66166563
"act (basestring|None): Activation applied to the output.",
66176564
"name (basestring|None): Name of the output."
66186565
])

0 commit comments

Comments
 (0)