Skip to content

Commit 008ab08

Browse files
seiriosPlusseiriosPlus
committed
Merge branch 'release/1.0.0' of github.com:PaddlePaddle/Paddle into release/1.0.0
2 parents da4129f + 8d16de7 commit 008ab08

21 files changed

+437
-217
lines changed

‎paddle/contrib/float16/float16_transpiler.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ def _adjust_input(self, skip=False):
102102
continue
103103
for input_arg in current_op.input_arg_names:
104104
if input_arg in self.input_map:
105-
current_op.rename_input(input_arg,
106-
self.input_map[input_arg])
105+
current_op._rename_input(input_arg,
106+
self.input_map[input_arg])
107107

108108
def _remove_unused_var(self):
109109
'''
@@ -187,7 +187,7 @@ def find_op(var):
187187
shape=var.shape,
188188
persistable=var.persistable)
189189
find_op(var)
190-
var.op.rename_output(var_name, tmp_var_name)
190+
var.op._rename_output(var_name, tmp_var_name)
191191
self.block._insert_op(
192192
i,
193193
type="cast",

‎paddle/fluid/API.spec

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,9 @@ paddle.fluid.Program.global_block ArgSpec(args=['self'], varargs=None, keywords=
66
paddle.fluid.Program.list_vars ArgSpec(args=['self'], varargs=None, keywords=None, defaults=None)
77
paddle.fluid.Program.parse_from_string ArgSpec(args=['binary_str'], varargs=None, keywords=None, defaults=None)
88
paddle.fluid.Program.to_string ArgSpec(args=['self', 'throw_on_error', 'with_details'], varargs=None, keywords=None, defaults=(False,))
9-
paddle.fluid.Operator.__init__ ArgSpec(args=['self', 'block', 'desc', 'type', 'inputs', 'outputs', 'attrs'], varargs=None, keywords=None, defaults=(None, None, None, None))
10-
paddle.fluid.Operator.all_attrs ArgSpec(args=['self'], varargs=None, keywords=None, defaults=None)
11-
paddle.fluid.Operator.attr ArgSpec(args=['self', 'name'], varargs=None, keywords=None, defaults=None)
12-
paddle.fluid.Operator.attr_type ArgSpec(args=['self', 'name'], varargs=None, keywords=None, defaults=None)
13-
paddle.fluid.Operator.block_attr ArgSpec(args=['self', 'name'], varargs=None, keywords=None, defaults=None)
14-
paddle.fluid.Operator.block_attr_id ArgSpec(args=['self', 'name'], varargs=None, keywords=None, defaults=None)
15-
paddle.fluid.Operator.blocks_attr ArgSpec(args=['self', 'name'], varargs=None, keywords=None, defaults=None)
16-
paddle.fluid.Operator.blocks_attr_ids ArgSpec(args=['self', 'name'], varargs=None, keywords=None, defaults=None)
17-
paddle.fluid.Operator.has_attr ArgSpec(args=['self', 'name'], varargs=None, keywords=None, defaults=None)
18-
paddle.fluid.Operator.has_kernel ArgSpec(args=['self', 'op_type'], varargs=None, keywords=None, defaults=None)
19-
paddle.fluid.Operator.input ArgSpec(args=['self', 'name'], varargs=None, keywords=None, defaults=None)
20-
paddle.fluid.Operator.output ArgSpec(args=['self', 'name'], varargs=None, keywords=None, defaults=None)
21-
paddle.fluid.Operator.rename_input ArgSpec(args=['self', 'old_name', 'new_name'], varargs=None, keywords=None, defaults=None)
22-
paddle.fluid.Operator.rename_output ArgSpec(args=['self', 'old_name', 'new_name'], varargs=None, keywords=None, defaults=None)
23-
paddle.fluid.Operator.set_attr ArgSpec(args=['self', 'name', 'val'], varargs=None, keywords=None, defaults=None)
24-
paddle.fluid.Operator.to_string ArgSpec(args=['self', 'throw_on_error'], varargs=None, keywords=None, defaults=None)
259
paddle.fluid.default_startup_program ArgSpec(args=[], varargs=None, keywords=None, defaults=None)
2610
paddle.fluid.default_main_program ArgSpec(args=[], varargs=None, keywords=None, defaults=None)
2711
paddle.fluid.program_guard ArgSpec(args=[], varargs='args', keywords='kwds', defaults=None)
28-
paddle.fluid.get_var ArgSpec(args=['name', 'program'], varargs=None, keywords=None, defaults=(None,))
2912
paddle.fluid.name_scope ArgSpec(args=[], varargs='args', keywords='kwds', defaults=None)
3013
paddle.fluid.Executor.__init__ ArgSpec(args=['self', 'place'], varargs=None, keywords=None, defaults=None)
3114
paddle.fluid.Executor.close ArgSpec(args=['self'], varargs=None, keywords=None, defaults=None)
@@ -170,6 +153,13 @@ paddle.fluid.layers.elementwise_mul ArgSpec(args=['x', 'y', 'out', 'axis', 'use_
170153
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))
171154
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))
172155
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))
156+
paddle.fluid.layers.uniform_random_batch_size_like ArgSpec(args=['input', 'shape', 'dtype', 'input_dim_idx', 'output_dim_idx', 'min', 'max', 'seed'], varargs=None, keywords=None, defaults=('float32', 0, 0, -1.0, 1.0, 0))
157+
paddle.fluid.layers.gaussian_random ArgSpec(args=['shape', 'mean', 'std', 'seed', 'dtype', 'use_mkldnn'], varargs=None, keywords=None, defaults=(0.0, 1.0, 0, 'float32', False))
158+
paddle.fluid.layers.sampling_id ArgSpec(args=['x', 'min', 'max', 'seed', 'dtype'], varargs=None, keywords=None, defaults=(0.0, 1.0, 0, 'float32'))
159+
paddle.fluid.layers.gaussian_random_batch_size_like ArgSpec(args=['input', 'shape', 'input_dim_idx', 'output_dim_idx', 'mean', 'std', 'seed', 'dtype'], varargs=None, keywords=None, defaults=(0, 0, 0.0, 1.0, 0, 'float32'))
160+
paddle.fluid.layers.sum ArgSpec(args=['x', 'use_mkldnn'], varargs=None, keywords=None, defaults=(False,))
161+
paddle.fluid.layers.slice ArgSpec(args=['input', 'axes', 'starts', 'ends'], varargs=None, keywords=None, defaults=None)
162+
paddle.fluid.layers.shape ArgSpec(args=['input'], varargs=None, keywords=None, defaults=None)
173163
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))
174164
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))
175165
paddle.fluid.layers.read_file ArgSpec(args=['reader'], varargs=None, keywords=None, defaults=None)
@@ -241,13 +231,6 @@ paddle.fluid.layers.logical_and ArgSpec(args=[], varargs='args', keywords='kwarg
241231
paddle.fluid.layers.logical_or ArgSpec(args=[], varargs='args', keywords='kwargs', defaults=None)
242232
paddle.fluid.layers.logical_xor ArgSpec(args=[], varargs='args', keywords='kwargs', defaults=None)
243233
paddle.fluid.layers.logical_not ArgSpec(args=[], varargs='args', keywords='kwargs', defaults=None)
244-
paddle.fluid.layers.uniform_random_batch_size_like ArgSpec(args=[], varargs='args', keywords='kwargs', defaults=None)
245-
paddle.fluid.layers.gaussian_random ArgSpec(args=[], varargs='args', keywords='kwargs', defaults=None)
246-
paddle.fluid.layers.sampling_id ArgSpec(args=[], varargs='args', keywords='kwargs', defaults=None)
247-
paddle.fluid.layers.gaussian_random_batch_size_like ArgSpec(args=[], varargs='args', keywords='kwargs', defaults=None)
248-
paddle.fluid.layers.sum ArgSpec(args=[], varargs='args', keywords='kwargs', defaults=None)
249-
paddle.fluid.layers.slice ArgSpec(args=[], varargs='args', keywords='kwargs', defaults=None)
250-
paddle.fluid.layers.shape ArgSpec(args=[], varargs='args', keywords='kwargs', defaults=None)
251234
paddle.fluid.layers.maxout ArgSpec(args=[], varargs='args', keywords='kwargs', defaults=None)
252235
paddle.fluid.layers.sigmoid ArgSpec(args=['x', 'name'], varargs=None, keywords=None, defaults=(None,))
253236
paddle.fluid.layers.logsigmoid ArgSpec(args=['x', 'name'], varargs=None, keywords=None, defaults=(None,))

‎paddle/fluid/framework/ir/graph_traits.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
#include "paddle/fluid/framework/ir/graph_traits.h"
1616

17+
#include <vector>
18+
1719
namespace paddle {
1820
namespace framework {
1921
namespace ir {

‎paddle/fluid/operators/sampling_id_op.cc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,16 @@ class SamplingIdOpMaker : public framework::OpProtoAndCheckerMaker {
5353
SamplingId Operator.
5454
A layer for sampling id from multinomial distribution from the
5555
input. Sampling one id for one sample.)DOC");
56-
AddAttr<float>("min", "Minimum value of random. [default 0.0].")
56+
AddAttr<float>("min", "Minimum value of random. (float, default 0.0).")
5757
.SetDefault(0.0f);
58-
AddAttr<float>("max", "Maximun value of random. [default 1.0].")
58+
AddAttr<float>("max", "Maximun value of random. (float, default 1.0).")
5959
.SetDefault(1.0f);
60-
AddAttr<int>("seed",
61-
"Random seed used for the random number engine. "
62-
"0 means use a seed generated by the system."
63-
"Note that if seed is not 0, this operator will always "
64-
"generate the same random numbers every time. [default 0].")
60+
AddAttr<int>(
61+
"seed",
62+
"Random seed used for the random number engine. "
63+
"0 means use a seed generated by the system."
64+
"Note that if seed is not 0, this operator will always "
65+
"generate the same random numbers every time. (int, default 0).")
6566
.SetDefault(0);
6667
}
6768
};

‎paddle/fluid/operators/sequence_slice_op.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ class SequenceSliceOpKernel : public framework::OpKernel<T> {
7575
}
7676

7777
for (size_t i = 0; i < n; ++i) {
78-
PADDLE_ENFORCE_LT(0, offset_data[i],
78+
PADDLE_ENFORCE_LE(0, offset_data[i],
7979
"The offset[%d] must greater than zero.", i);
8080
PADDLE_ENFORCE_LT(0, length_data[i],
8181
"The length[%d] must greater than zero.", i);
82-
PADDLE_ENFORCE_LT(lod[0][i] + offset_data[i] + length_data[i],
82+
PADDLE_ENFORCE_LE(lod[0][i] + offset_data[i] + length_data[i],
8383
lod[0][i + 1], "The target tensor's length overflow.");
8484
}
8585

‎paddle/fluid/pybind/protobuf.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -285,12 +285,12 @@ void BindOpDesc(pybind11::module *m) {
285285
.def("set_output", &pd::OpDesc::SetOutput)
286286
.def("input_arg_names", &pd::OpDesc::InputArgumentNames)
287287
.def("output_arg_names", &pd::OpDesc::OutputArgumentNames)
288-
.def("rename_input", &pd::OpDesc::RenameInput)
289-
.def("rename_output", &pd::OpDesc::RenameOutput)
288+
.def("_rename_input", &pd::OpDesc::RenameInput)
289+
.def("_rename_output", &pd::OpDesc::RenameOutput)
290290
.def("has_attr", &pd::OpDesc::HasAttr)
291291
.def("attr_type", &pd::OpDesc::GetAttrType)
292292
.def("attr_names", &pd::OpDesc::AttrNames)
293-
.def("set_attr", &pd::OpDesc::SetAttr)
293+
.def("_set_attr", &pd::OpDesc::SetAttr)
294294
.def("attr", &pd::OpDesc::GetAttr)
295295
.def("set_block_attr", &pd::OpDesc::SetBlockAttr)
296296
.def("set_blocks_attr", &pd::OpDesc::SetBlocksAttr)
@@ -300,8 +300,8 @@ void BindOpDesc(pybind11::module *m) {
300300
std::string ser(seriralized);
301301
self.SetAttr(name, ser);
302302
})
303-
.def("block_attr_id", &pd::OpDesc::GetBlockAttrId)
304-
.def("blocks_attr_ids", &pd::OpDesc::GetBlocksAttrIds)
303+
.def("_block_attr_id", &pd::OpDesc::GetBlockAttrId)
304+
.def("_blocks_attr_ids", &pd::OpDesc::GetBlocksAttrIds)
305305
.def("check_attrs", &pd::OpDesc::CheckAttrs)
306306
.def("infer_shape", &pd::OpDesc::InferShape)
307307
.def("infer_var_type", &pd::OpDesc::InferVarType)

‎paddle/scripts/paddle_build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -629,10 +629,10 @@ EOF
629629

630630
function gen_capi_package() {
631631
if [[ ${WITH_C_API} == "ON" ]]; then
632-
install_prefix="${PADDLE_ROOT}/build/capi_output"
633-
rm -rf $install_prefix
634-
make DESTDIR="$install_prefix" install
635-
cd $install_prefix/usr/local
632+
capi_install_prefix=${INSTALL_PREFIX:-/paddle/build}/capi_output
633+
rm -rf $capi_install_prefix
634+
make DESTDIR="$capi_install_prefix" install
635+
cd $capi_install_prefix/
636636
ls | egrep -v "^Found.*item$" | xargs tar -czf ${PADDLE_ROOT}/build/paddle.tgz
637637
fi
638638
}

‎python/paddle/fluid/backward.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ def _rename_arg_(op_descs, old_name, new_name, begin_idx=None, end_idx=None):
3838
op_desc = op_descs[i]
3939
if isinstance(op_desc, tuple):
4040
op_desc = op_desc[0]
41-
op_desc.rename_input(old_name, new_name)
42-
op_desc.rename_output(old_name, new_name)
41+
op_desc._rename_input(old_name, new_name)
42+
op_desc._rename_output(old_name, new_name)
4343

4444

4545
def _create_op_desc_(op_type, inputs, outputs, attrs):
@@ -70,7 +70,7 @@ def _create_op_desc_(op_type, inputs, outputs, attrs):
7070
if isinstance(val, framework.Block):
7171
op_desc.set_block_attr(name, val.desc)
7272
else:
73-
op_desc.set_attr(name, val)
73+
op_desc._set_attr(name, val)
7474
return op_desc
7575

7676

@@ -346,7 +346,7 @@ def _append_backward_ops_(block,
346346
grad_sub_block_list = []
347347
# If the op has its own sub-block, deal with the sub-block first
348348
if op.has_attr("sub_block"):
349-
sub_block = program.block(op.block_attr_id("sub_block"))
349+
sub_block = program.block(op._block_attr_id("sub_block"))
350350
grad_sub_block = program._create_block()
351351
grad_sub_block._set_forward_block_idx(sub_block.idx)
352352
cb = _callback_lookup_(op)
@@ -382,7 +382,7 @@ def _append_backward_ops_(block,
382382
for op_desc in grad_op_descs:
383383
new_op_desc = target_block.desc.append_op()
384384
new_op_desc.copy_from(op_desc)
385-
new_op_desc.set_attr(op_role_attr_name, backward)
385+
new_op_desc._set_attr(op_role_attr_name, backward)
386386
grad_to_var["__current_op_desc__"] = new_op_desc
387387
if callbacks is not None:
388388
assert (isinstance(callbacks, list))
@@ -408,7 +408,7 @@ def _append_backward_vars_(block, start_op_idx, grad_to_var, grad_info_map):
408408
for op_idx in range(start_op_idx, block.desc.op_size()):
409409
op_desc = block.desc.op(op_idx)
410410
if op_desc.has_attr("sub_block"):
411-
sub_block = block.program.block(op_desc.block_attr_id("sub_block"))
411+
sub_block = block.program.block(op_desc._block_attr_id("sub_block"))
412412
_append_backward_vars_(sub_block, 0, grad_to_var, grad_info_map)
413413
new_vars = set()
414414
# create new gradient variables
@@ -438,12 +438,12 @@ def _rename_grad_(block, start_op_idx, grad_to_var, target_grad_map):
438438
op_desc = block.desc.op(op_idx)
439439
for name in op_desc.input_arg_names():
440440
if name in var_map:
441-
op_desc.rename_input(name, var_map[name])
441+
op_desc._rename_input(name, var_map[name])
442442

443443
for name in op_desc.output_arg_names():
444444
if block.desc.find_var(name.encode("ascii")):
445445
new_name = unique_name.generate(name)
446-
op_desc.rename_output(name, new_name)
446+
op_desc._rename_output(name, new_name)
447447
var_map[name] = new_name
448448

449449
for g, ng in six.iteritems(var_map):
@@ -542,9 +542,9 @@ def append_backward(loss, parameter_list=None, no_grad_set=None,
542542
if loss.op is None:
543543
raise ValueError("loss.op is None. Should not happend")
544544

545-
loss.op.set_attr(core.op_proto_and_checker_maker.kOpRoleAttrName(),
546-
int(core.op_proto_and_checker_maker.OpRole.Forward) |
547-
int(core.op_proto_and_checker_maker.OpRole.Loss))
545+
loss.op._set_attr(core.op_proto_and_checker_maker.kOpRoleAttrName(),
546+
int(core.op_proto_and_checker_maker.OpRole.Forward) |
547+
int(core.op_proto_and_checker_maker.OpRole.Loss))
548548

549549
if callbacks is not None:
550550
isinstance(callbacks, list)
@@ -631,7 +631,7 @@ def append_backward(loss, parameter_list=None, no_grad_set=None,
631631
attr_val = [p.name, g.name]
632632
if g.op.has_attr(op_role_var_attr_name):
633633
attr_val.extend(g.op.attr(op_role_var_attr_name))
634-
g.op.set_attr(op_role_var_attr_name, attr_val)
634+
g.op._set_attr(op_role_var_attr_name, attr_val)
635635

636636
return params_and_grads
637637

‎python/paddle/fluid/clip.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ def _append_clip_op(self, block, grad_name):
7575
clip_op_desc.set_type("clip")
7676
clip_op_desc.set_input("X", [grad_name])
7777
clip_op_desc.set_output("Out", [grad_name])
78-
clip_op_desc.set_attr("min", self.min)
79-
clip_op_desc.set_attr("max", self.max)
78+
clip_op_desc._set_attr("min", self.min)
79+
clip_op_desc._set_attr("max", self.max)
8080

8181

8282
def error_clip_callback(block, context):

0 commit comments

Comments
 (0)