2849 Commits (d2b6d2ef8a42feed15ac5ce4cd43877436f8abe1)

Author	SHA1	Message	Date
fengjiayi	f04c97a035	refine test_understand_sentiment_lstm (#5781) ... * fix * Fix a bug	9 years ago
Zhaolong Xing	3e9ea34821	fix prelu doc (#5807)	9 years ago
Abhinav Arora	4a2b0ae4d3	Implementing the MSRA initializer for rectifier units	9 years ago
guosheng	b6b7ab63c6	Fix calculations in gru_unit_op to be consistent with gru_op	9 years ago
whs	95de6f517a	Merge pull request #5800 from wanghaoshuang/fix_pnp ... Refine doc of pnpair evaluator	9 years ago
chengduoZH	7177c276ca	reorder parameters of layer	9 years ago
Zhaolong Xing	51e7c26fdc	Merge pull request #5641 from NHZlX/fix_prelu ... Fix prelu python api	9 years ago
sweetsky0901	822f28343b	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d	9 years ago
sweetsky0901	200f07c219	add test	9 years ago
Yu Yang	f2ca07e88a	IfElse Python API (#5624) ... * Forward of raw if-else op * add backward part of mnist if-else unittest * refine fill_constant_batch_size_like layer * add draft ifelse operator * Complete IfElse Op * add unittest of ifelse api * merge baidu/develop * Stash * Merge develop branch * Support int/int64 for fill_constant_batch_size_like	9 years ago
guosheng	f191c82010	Merge branch 'develop' of https://github.com/PaddlePaddle/paddle into fix-GRUUnitOp-dev	9 years ago
wanghaoshuang	9f54fa24bf	Rename info to query_id and add more comments.	9 years ago
ranqiu92	51c75a931c	Merge pull request #5742 from ranqiu92/doc ... Update annotations of layers.py	9 years ago
Tao Luo	3c4d4065ae	Merge pull request #5775 from luotao1/ProtoData ... remove ProtoData	9 years ago
Abhinav Arora	e930f49673	Improve the initializer Interface for fc, sequence_conv and conv2d layers (#5760) ... * Improve the initializer Interface for fc, sequence_conv and conv2d layers * Fix some typos in python code * Fix CI	9 years ago
wangmeng28	b80cdcea11	Merge remote-tracking branch 'upstream/develop' into factorization_machine_layer	9 years ago
sweetsky0901	7ce06c8b61	Merge pull request #5571 from sweetsky0901/my_maxout_op ... Add maxout operator.	9 years ago
wangmeng28	13ec6f99fe	Merge remote-tracking branch 'upstream/develop' into factorization_machine_layer	9 years ago
fengjiayi	d5be1d4dd0	use Evaluator in book tests (#5778)	9 years ago
sweetsky0901	9cb2ff6a3b	del num_channels	9 years ago
sweetsky0901	95cbbd772e	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	9 years ago
Cao Ying	d2e30a2c4f	Merge pull request #5771 from lcy-seso/softsign ... add the softsign activation.	9 years ago
sweetsky0901	350cc61f3f	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	9 years ago
caoying03	fafd3e0fc0	Merge branch 'develop' into softsign	9 years ago
Luo Tao	76501c8258	remove ProtoData, update related files	9 years ago
chengduo	9db4d01928	Merge pull request #5772 from chengduoZH/fix_layer.py.conv2dbug ... fix bug (conv2d groups: 'num_channels % groups is not 0:' )	9 years ago
wanghaox	6ac42378ac	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	9 years ago
wanghaox	76fc1a82e1	for code review 4	9 years ago
chengduoZH	bc3ec53671	remove conflict	9 years ago
chengduo	134eaf21b3	Merge pull request #5602 from chengduoZH/add_cudnn_pool3d ... Add cudnn pool3d	9 years ago
wanghaox	52f2366d2b	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	9 years ago
chengduoZH	3872ea050e	fix bug (conv2d groups )	9 years ago
guosheng	3e7fff4188	Fix calculations in gru_unit_op	9 years ago
caoying03	dffa8fabb2	add softsign activation.	9 years ago
wangmeng28	5392a503a7	Merge remote-tracking branch 'upstream/develop' into factorization_machine_layer	9 years ago
wangmeng28	d5a6c81dc5	Update docs for factorization machine layer	9 years ago
wanghaox	f7c156284c	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into sub_sequence_op	9 years ago
wanghaox	794117bb93	fix some comments	9 years ago
Cao Ying	6da78d976c	Merge pull request #5764 from lcy-seso/fix_layer_helper_unitest ... remove redundant tests in layer helper's unittest.	9 years ago
wanghaox	13d39eaf97	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	9 years ago
Cao Ying	56ec40ad9c	Merge pull request #4924 from ranqiu92/attention ... Add the configuration helper for multi-head attention.	9 years ago
wanghaox	2d7a652869	del framework test_maxout_op	9 years ago
Cao Ying	01d6ccb4e2	Merge pull request #5763 from ranqiu92/dot_product_attention ... update the dot_product_attention.	9 years ago
caoying03	cdde045afe	remove redundant tests in layer helper's unittest.	9 years ago
wanghaox	4c113cc776	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	9 years ago
Cao Ying	c6ec26df3a	Merge pull request #5736 from lcy-seso/l2_distance ... Add the L2 distance layer.	9 years ago
wanghaox	a6a01c15f5	add test_maxout_op framework to fluis	9 years ago
wanghaox	63f8c5fe58	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	9 years ago
ranqiu	f22402933e	Refine multi_head_attention	9 years ago
ranqiu	d29901b825	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into attention	9 years ago
ranqiu	81abcdea39	Refine dot_product_attention	9 years ago
Qiao Longfei	569f7c4773	enforce shape of backward target to be {1} (#5745) ... * enforce shape of backward target to be {1} * fix test_regularizer.py * rm unused code * fix backward_test * fix a type bug * fix test_program	9 years ago
chengduoZH	6a1c22361c	fix unit test	9 years ago
Abhinav Arora	6cfcf6245a	Adding logical operators for beam search and control flow (#5708)	9 years ago
chengduoZH	5238c9fb0b	input type should be different	9 years ago
wanghaox	360354670c	fix some codes	9 years ago
chengduoZH	dec61ab6df	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into add_cudnn_pool3d	9 years ago
wangmeng28	5ee63bb67c	Merge remote-tracking branch 'upstream/develop' into factorization_machine_layer	9 years ago
peterzhang2029	9580c45077	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into add_bn_eq	9 years ago
chengduo	0f83674c7d	Merge pull request #5603 from chengduoZH/Add_conv3d_transpose_cudnn_op ... add conv3d_trans_cudnn_op	9 years ago
caoying03	37190b7c14	small fix.	9 years ago
caoying03	29fc94b265	Merge branch 'develop' into l2_distance	9 years ago
Guo Sheng	7a57b3b788	Merge pull request #5623 from guoshengCS/fix-H0-GRUOp ... Fix data order of H0 in GRU Operator	9 years ago
ranqiu92	093c526d43	Merge pull request #5724 from ranqiu92/dot_product ... add dot_prod_layer	9 years ago
caoying03	929efdc592	follow comments.	9 years ago
caoying03	4772b78ced	add config_helper.	9 years ago
fengjiayi	044d671e73	Rename 'argu' in framework.py to 'arg' (#5723)	9 years ago
ranqiu	b0c88e3dd0	Update annotations of layers.py	9 years ago
Tao Luo	56f28a0f65	Merge pull request #5732 from tensor-tang/rename ... rename all Mkldnn to MKLDNN	9 years ago
Tao Luo	9b56074083	Merge pull request #5705 from tensor-tang/mkldnn_concat ... enable mkldnn_concat layer	9 years ago
ranqiu	2e1cd3313d	Update dot_prod_layer	9 years ago
tensor-tang	f5df46e1a4	rename all Mkldnn to MKLDNN	9 years ago
chengduoZH	0bc2f41da9	remove conflict	9 years ago
QI JUN	a391a44dd0	remove v2 framework (#5722)	9 years ago
ranqiu	aa2507187e	add dot_prod_layer	9 years ago
Qiao Longfei	0ce38b77f2	correct optimizer import (#5699)	9 years ago
chengduo	06d155b539	Merge pull request #5718 from chengduoZH/Add_pad_and_stride_for_conv_transpose_op ... Add padding for conv_transpose_op	9 years ago
chengduoZH	eb07047699	add padding	9 years ago
peterzhang2029	27d7b2cbb4	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into add_bn_eq	9 years ago
guosheng	afd1f36186	Merge branch 'develop' of https://github.com/PaddlePaddle/paddle into fix-H0-GRUOp-dev	9 years ago
wangmeng28	571ef90ce2	Merge remote-tracking branch 'upstream/develop' into factorization_machine_layer	9 years ago
Yan Chunwei	186581d2cc	add is empty op (#5639)	9 years ago
peterzhang2029	ac46018108	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into add_bn_eq	9 years ago
Yang Yang(Tony)	18f0c40a97	feature/while_grad_op (#5554) ... * first commit * Python API for while op * Python Unittest for simple while_op forward * fix out to be list * Fix UT * VarType * Fix several bugs * Fix bug * Fix bug * Fix Bug * Fix bug * Fix unittest * Remove debug log * Add comments * add PADDLE_ENFORCE * while_grad_op first commit * Add `BlockDescBind::FindRecursiveOrCreateVar()` and fix bugs * not sure how to setdim of while outputs * push for test * add executor vlog * fix bug of while_op cond * Several enhancement for code 1. Backward always infer shape & infer var type. Since there are RENAME variables will be created when creating backward operator, but their shape & var types are not inferenced. 2. Never use SomePtr-> directly, since every pointer could be nullptr if it is a function return value. Add `detail::Ref` to cast pointer to reference safely. 3. Enhance error message for backward. 4. Infer data type of variable in `sum` and `tensor_write` * Fix bugs of while_op gradient * Fix several bugs of while_op grad * fix fill zeros like * fix 3 >= 3 * fix place holder shouldn't be null * fail on sum op * Fix SumOp of TensorList * clean up * pass while test * fix test_array_write_read * pass sum op * Support int/int64 for fill_constant_batch_size_like * Fix compile	9 years ago
peterzhang2029	8a49f7f16b	add epsilon in bn	9 years ago
tensor-tang	88feb517d4	Merge remote-tracking branch 'upstream/develop' into mkldnn_concat	9 years ago
tensor-tang	739858c889	add python interface for mkldnn_concat	9 years ago
wangmeng28	d6e35ecdd5	Merge remote-tracking branch 'upstream/develop' into factorization_machine_layer	9 years ago
wangmeng28	7a1a586355	Update variable names and docs for factorization machine layer	9 years ago
chengduoZH	7e91da41e7	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into add_cudnn_pool3d	9 years ago
wanghaox	7bb26805e5	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into sub_sequence_op	9 years ago
wanghaox	1d95173cfe	change offset and length's rank to 2, dim[0] for batch size	9 years ago
Tao Luo	6cf7f1e4b9	Merge pull request #5671 from tensor-tang/autocpu ... auto set cpu env when mkldnn or mklml enabled	9 years ago
Qiao Longfei	a76b61443b	mv test_beam_search_op.py to fluid (#5687)	9 years ago
Cao Ying	82849ad167	Merge pull request #5678 from ranqiu92/doc ... Update annotations of layers.py.	9 years ago
wanghaox	40a6c4882d	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into sub_sequence_op	9 years ago
guosheng	75426e013a	Refine GRU Operator	9 years ago
QI JUN	d7bf372d26	support adagrad sparse update (#5272) ... * adam sparse support * fix gpu build error * fix ci * fix ci * fix adagrad sparse update bug * fix gpu build error	9 years ago
helinwang	92b0c69946	Merge pull request #5645 from helinwang/model ... Remove unused model.py	9 years ago
Helin Wang	36f1d16f54	Remove unused model.py	9 years ago
wanghaoshuang	e60eb1eacd	fix unitest	9 years ago
wanghaoshuang	668dc53fcc	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into nce_op	9 years ago
wanghaoshuang	09d32b068c	Add unitest and comments.	9 years ago
qingqing01	f95c291b5e	Merge pull request #5651 from emailweixu/fix_conv_bias ... Fix conv2d bias	9 years ago
ranqiu	bf4b5320d8	Update annotations of layers.py	9 years ago
chengduoZH	00e0881bfb	remove conflict	9 years ago
chengduoZH	f91422ecc4	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into refine_im2col	9 years ago
Yan Chunwei	09866fb75f	feature/beam search op (#5052)	9 years ago
tensor-tang	d66d6c6ea3	auto set cpu environment in V2 API	9 years ago
wanghaox	4c426f191b	update sequence_slice_op.h, change some code	9 years ago
wanghaox	3ef776ef28	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	9 years ago
wanghaox	8d9babf204	maxout code review 2nd	9 years ago
xuwei06	81bb26f3bd	Removing debug print and moving assert	9 years ago
chengduoZH	e825a49259	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into add_cudnn_pool3d	9 years ago
xzl	b7ebaf71bb	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into fix_prelu	9 years ago
xzl	2ab928d185	modify the prelu test and regenerate the proto	9 years ago
xzl	f9469d33a7	add check for input height and width and input channel	9 years ago
chengduoZH	c5330fa772	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into Add_conv3d_transpose_cudnn_op	9 years ago
chengduoZH	e25bfc7508	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into refine_im2col	9 years ago
Qiao Longfei	2506c74f3f	rm unused dir framework (#5652)	9 years ago
kexinzhao	d7bf066809	Adding interface for decayed adagrad optimizer (#5644) ... * add decayed adagrad python code * fix typo and order * small fix	9 years ago
Qiao Longfei	1db1a0dcea	mv test_beam_search_decode_op.py to fluid (#5642)	9 years ago
ranqiu	06c7686aa1	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into attention	9 years ago
xuwei06	a5c9e6ace2	Fix conv2d bias ... The size of the bias parameter should be the number of filters.	9 years ago
Cao Ying	374e16852d	Merge pull request #5517 from ranqiu92/doc ... Update the annotations of layers.py.	9 years ago
Helin Wang	c089b7649f	Fix test	9 years ago
helinwang	7176bcf0b5	Merge branch 'develop' into demo	9 years ago
helinwang	d1d21004dd	Merge pull request #5331 from dzhwinter/feature/evaluator ... Feature/evaluator	9 years ago
dzhwinter	2d7ac80b43	"relauch ci" (#5314)	9 years ago
Dong Zhihong	b32faa06eb	"fix import error"	9 years ago
Helin Wang	3157ce6123	Simpily demo, add paddle.default_main_program() and paddle.default_startup_program ... - Removed all main_program and startup_program in the demo. - Using paddle.default_main_program() hides the implementation detail (e.g., using g_main_program) from the user, we can change the implementation in the future much easier.	9 years ago
Dong Zhihong	2f33f74a35	Merge remote-tracking branch 'origin/develop' into feature/evaluator	9 years ago
Abhinav Arora	c3a61349e4	Adding greater than and less than equal ops to compare op (#5609) ... * Adding greater than and less than equal ops to compare op * Changing the name of the less_than_equal and greater_than_equal op * Also changing the name of the functors	9 years ago
xzl	c1b23535c0	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into fix_prelu	9 years ago
xzl	a0e77692f3	Embarrassed, i forget to do the type check	9 years ago
xzl	1906e63f39	fix prelu(add filter_num output_x output_y) and add channel_shared param	9 years ago
Zhaolong Xing	d7319c2220	Merge pull request #5165 from NHZlX/add_dilation ... Add dilation for exconv layer	9 years ago
Zhaolong Xing	3e6f768409	Merge pull request #4891 from NHZlX/poolmaxpool_with_mask ... max pool Layer with mask	9 years ago
wanghaox	9a18e78e69	update sequence slice op, fix some error	9 years ago
ranqiu	ac29d00cff	Update doc of layers.py	9 years ago
ranqiu	de2bc5da28	Update annotations of layers.py according to comments	9 years ago
wanghaox	29c25828b0	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into sub_sequence_op	9 years ago
Qiao Longfei	4adc8a7aa1	Change framework to fluid (#5637) ... * init commit * change some dir name	9 years ago
wanghaox	f319fb1ce1	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	9 years ago
peterzhang2029	f06d8f0dd4	Merge pull request #5622 from peterzhang2029/notation_fix ... Fix error in networks' docstrings .	9 years ago
xzl	f3818bd335	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into add_dilation	9 years ago
xzl	fbd8a3307c	regenerate the proto for support the dilation	9 years ago
ranqiu	1baeebc8e7	Update the annotations of layers	9 years ago
peterzhang2029	e97354152c	unify the bias	9 years ago
Dong Zhihong	12858baa6c	"relauch ci"	9 years ago
Qiao Longfei	7345de3ad1	Beam search decode op python (#5631) ... * fix lod_tensor_array * init test beam search decode op * add test_beam_search_decode_op	9 years ago
Dong Zhihong	fc117ecfa6	Merge remote-tracking branch 'origin/develop' into feature/evaluator	9 years ago
peterzhang2029	2b93934d2a	refine doc	9 years ago
wangmeng28	e5135e8b4f	Merge remote-tracking branch 'upstream/develop' into factorization_machine_layer	9 years ago
wanghaox	494edc6c07	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	9 years ago
wanghaox	bd773b9c84	modify for maxoutop code review	9 years ago
xzl	469b3ad589	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into add_dilation	9 years ago
Yibing Liu	2f3d1c345f	Merge pull request #4747 from kuke/seq_reshape_op_dev ... Add Lod Reset Operator	9 years ago
wanghaox	8e7c8bb5c6	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into sub_sequence_op	9 years ago
Yu Yang	488320a703	Conditional Block Forward (#5530) ... * Conditional Block Forward * Assign Operator. Out=X, when type in [LoDTensor/SelectedRows/LoDTensorArray] * Stash * Add Scope::Rename it is useful in gradient phase of an operator with block * ConditionalBlock Grad Done * Add comments * yapf format code	9 years ago
peterzhang2029	1b6a54e286	fix error for annotation	9 years ago
guosheng	2bed961211	Merge branch 'develop' of https://github.com/PaddlePaddle/paddle into fix-H0-GRUOp	9 years ago
guosheng	b103072dc8	Fix data order of H0 in GRU Operator	9 years ago
Yibing Liu	6772dfa0bd	Merge branch 'develop' of upstream into seq_reshape_op_dev	9 years ago
wanghaox	b24afd819a	update the sub_sequence_op to sequence_slice_op code.	9 years ago
xzl	e19b931af9	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into poolmaxpool_with_mask	9 years ago
xzl	0b9c4cd7e5	fix comments	9 years ago
wanghaox	f23d6cc4c8	update the sub_sequence_op tp sequence_slice_op code.	9 years ago
QI JUN	f07a226a4f	add split and merge lod tensor operator (#5537) ... * add split lod tensor operator * add more test cast * clean code * add merge lod tensor operator * fix bug * clean code * add grad operator * make mask support GPU * add comments	9 years ago
Yu Yang	7c1755d93f	Assign Operator. (#5531) ... * Assign Operator. Out=X, when type in [LoDTensor/SelectedRows/LoDTensorArray] * Follow comments	9 years ago
helinwang	291f6b4ee0	Merge pull request #5613 from helinwang/book ... Move the tests of book chapters from test/ into tests/book	9 years ago
Cao Ying	e9695f4975	Merge pull request #5014 from peterzhang2029/bi_tensor_prod_op ... Add Bilinear Tensor Product operator.	9 years ago
Helin Wang	1dcec992ea	Move the tests of book chapters from test/ into tests/book	9 years ago
wanghaox	ab9c71d963	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	9 years ago
chengduoZH	6fb4bb8efe	add conv3d_trans_cudnn_op unit test	9 years ago
wangmeng28	f7941dbb74	Merge remote-tracking branch 'upstream/develop' into factorization_machine_layer	9 years ago
chengduoZH	ec1e2fc938	add cudnn_pool3d unit test	9 years ago
ranqiu	7461b35977	Refine multi-head attention	9 years ago
Yibing Liu	9bc71087b6	bug fix in lod_reset_op: cast int to size_t in LoD	9 years ago
Yu Yang	93c6e52af8	Automatically generated doc string for generated layers (#5585)	9 years ago
xzl	471573efe4	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into poolmaxpool_with_mask	9 years ago
peterzhang2029	665eb015d7	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into bi_tensor_prod_op	9 years ago
QI JUN	29f494f365	Stack LSTM Net for Paddle Book6 (#5503) ... * add lstm layer * set hidden shape * rename input parameter * add dynamic lstm * refine dynamic lstm layer * change parameter using XavierInitializer by default * refine dynamic lstm layer	9 years ago
peterzhang2029	ab41648ca7	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into bi_tensor_prod_op	9 years ago
ranqiu92	9202671d31	Merge branch 'develop' into doc	9 years ago
QI JUN	9c25218361	create learning rate variable for every parameter (#5524) ... * create learning rate variable for every parameter * fix ci * set parameter lr relatively to global lr	9 years ago
xzl	b29cbd49df	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into poolmaxpool_with_mask	9 years ago
wanghaox	784fd82345	resolve conflicts	9 years ago
wanghaox	4a428c8fbb	this for maxout op new add	9 years ago
dzhwinter	23b9bc0a6f	"fix ci failed" (#5567) ... * "fix ci failed" * "comment out seq_concate op to unblock PRs"	9 years ago
xzl	4ebb05cad2	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into poolmaxpool_with_mask	9 years ago
qingqing01	561d6340a4	Merge pull request #4061 from pkuyym/fix-4029 ... Add expand operator	9 years ago
xzl	9e894f6b0a	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into poolmaxpool_with_mask	9 years ago
guosheng	79e0a26a64	Fix test_roi_pool_layer.py	9 years ago
guosheng	7829034da4	Refine ROIPoolLayer by following comments	9 years ago
chengduoZH	7d73b8fc8e	fix unit test (conv3d)	9 years ago
guosheng	1ffdecf1ac	Merge branch 'develop' of https://github.com/PaddlePaddle/paddle into add-ROIPooling-dev	9 years ago
ranqiu	ea8e050b7b	Update doc of layers.py	9 years ago
xzl	2ef1867502	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into poolmaxpool_with_mask	9 years ago
xzl	ba2e5de662	pull develop and fix conflict	9 years ago