2009 Commits (f58fe6d3edb78c96547d91bf9da1492d0709b63d)

Author	SHA1	Message	Date
chengduoZH	97c3de0cfb	follow comments	7 years ago
guosheng	842b485f6a	Enhance ReduceOp to support reducing over all elements	7 years ago
chengduoZH	aa2f2fb47e	remove conflict	7 years ago
typhoonzero	2b47fb3d25	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into simple_dist_train_api	7 years ago
typhoonzero	9508c72685	wip: should fix variable recreate	7 years ago
Yu Yang	0a8addf802	Make cast op support bool (#6562) ... Also add `elemwise_sub/mul/abs/clip` layers	7 years ago
Yu Yang	1ba8f7fe71	The comments in reshape_op is wrong (#6565)	7 years ago
sweetsky0901	ea093283e6	for code review by zhaolong	7 years ago
sweetsky0901	89de58d990	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_spp_op	7 years ago
guosheng	29cd089ab2	Merge branch 'develop' of https://github.com/PaddlePaddle/paddle into add-multiBatch-chunkEval	7 years ago
typhoonzero	b4cd7f3d75	wip need ut	7 years ago
wanghaoshuang	2cd510641a	Fix crop op doc	7 years ago
guosheng	63ce906b08	Refine ChunkEvalutor by following comments	7 years ago
chengduoZH	50003984d4	remove conflict	7 years ago
Tao Luo	c8d4efb20e	Merge pull request #6498 from luotao1/row_conv ... fix warning in row_conv_op.cu	7 years ago
guosheng	1eaeacb2c8	Merge branch 'develop' of https://github.com/PaddlePaddle/paddle into add-multiBatch-chunkEval	7 years ago
guosheng	9a89b041ba	Add ChunkEvaluator for multi-batches	7 years ago
Yu Yang	d918ccded3	Add fill_op (#6477) ... * Add fill_op * Fix bug	7 years ago
QI JUN	61ec0b9516	Refine device context (#6433) ... There are mainly following fixes: - take `DeviceContext` as the template parameter of math functors and OpKernel instead of `Place` - remove `eigen_device` interface in base class `DeviceContext` - remove `GetEigenDevice` interface in `ExecutionContext` and base class `DeviceContext` - remove unused `platform::EigenDeviceConverter` - rename `REGISTER_OP_GPU_KERNEL` to `REGISTER_OP_CUDA_KERNEL` - rename `USE_GPU_ONLY_OP` to `USE_CUDA_ONLY_OP`	7 years ago
Luo Tao	f3acdd3af9	fix warning in row_conv_op.cu	7 years ago
kavyasrinet	35420cdf63	Updating the Latex equation for Adagrad (#6009) ... * Updating the Latex equation for Adagrad * Fixing Latex euqations for adadelta, adam and adamax	7 years ago
Siddharth Goyal	4ff6bc175a	Add row conv operator (#6013) ... * Fix documentation * Address review comments	7 years ago
typhoonzero	489b9695e4	wip for testing	7 years ago
武毅	f650429ba3	Merge pull request #6419 from typhoonzero/recv_op_use_ser_prog ... recv_op use serialized program	7 years ago
tensor-tang	38de512d29	Merge pull request #6459 from tensor-tang/develop ... unify MKL macro definition	7 years ago
tensor-tang	69b44f2f19	unify MKL macro definition	7 years ago
Yiqun Liu	9592468609	Fix gcc4.9 (#6442) ... * Fix compiling error of gcc4.9. * Refine the check of cxx compiler flags in api/CMakeLists.txt.	7 years ago
chengduoZH	a6ef875885	refine conv	7 years ago
typhoonzero	308491a94a	update for simple dist train	7 years ago
typhoonzero	986ca03ce2	update	7 years ago
typhoonzero	1c1fae6077	update recv op	7 years ago
chengduoZH	aa770198c7	add dilation in c++ code	7 years ago
typhoonzero	71655334c6	update	7 years ago
typhoonzero	4f1381eac3	recv_op use serialized program	7 years ago
Qiao Longfei	36fcc95cab	Nmt decoder train (#6367) ... * init decoder_trainer * can run * fix lod * add sharelod to cross_entropy_grad_op * add avg_cost to fetch list * modify learning rate * can run * optimie code * add early exit * fix print * revert test_understand_sentiment_conv.py * add act to fc	7 years ago
Abhinav Arora	113c026d12	Swish activation operator (#6358)	7 years ago
Abhinav Arora	e557611f39	Fix equations in sequence_pool op (#6355)	7 years ago
Abhinav Arora	0d4f050955	Fix equation in logical or op (#6315)	7 years ago
gongweibao	c7e739f542	Add LRN efficient GPU implement. (#5894) ... Add LRN efficient GPU implement	7 years ago
whs	c22cf594f6	Merge pull request #6333 from wanghaoshuang/fix_type ... Fix nce op warning about comparison of integers of different signs	7 years ago
qingqing01	5a1a04f648	Merge pull request #6326 from jacquesqiao/fix-int-overflow ... fix int overflow	7 years ago
chengduo	b30e8bc00c	Merge pull request #6324 from chengduoZH/profiling/refine_elementwise_add ... Refine code（operator++）	7 years ago
wanghaoshuang	83537c7ada	Fix warning about comparison of integers of different signs	7 years ago
chengduoZH	8711a9a22a	refine code	7 years ago
qiaolongfei	d303f7ae4f	fix int overflow	7 years ago
kexinzhao	94a36b8cc7	fix clip op doc operation (#6314)	7 years ago
kexinzhao	dbf205002d	fix read and write tensor array op (#6312)	7 years ago
kexinzhao	a5167ce0b4	fix lod_array_lengh op equation (#6307)	7 years ago
kexinzhao	002a7b4d01	fix scatter op equation (#6304)	7 years ago
kexinzhao	16822fb702	fix latex equation for clip by norm op (#6302)	7 years ago
kexinzhao	2c1270e40c	fix maxout op latex equation (#6303)	7 years ago
Abhinav Arora	1d04b19ce8	Fix the rendering of latex equation for adamax op (#6294) ... * Using latex fraction syntax in sigmoid and logsigmoid op * Fixing the rendering of the latex equations in adamax operator	7 years ago
Qiao Longfei	161128bada	add chunk eval layer (#6296) ... * add crf_decoding layer * fix some typo * init trunk_evaluator * add trunk_evaluator layer * update chunk_eval_op and test, change int32 to int64 * fix a numeric problem * change layers.trunk_evaluator to layers.trunk_eval * fix typo * add precision_val	7 years ago
Qiao Longfei	45c8a88a3e	add crf_decoding layer (#6274) ... * add crf_decoding layer * fix some typo * fix test_crf_decoding_op	7 years ago
qingqing01	e760641a3a	Merge pull request #6233 from qingqing01/momentum_op ... Refine and speedup momentum operator.	7 years ago
chengduo	36444461dc	Merge pull request #6229 from chengduoZH/profiling/updata_elementwise_op ... [Profiling] Update elementwise op	7 years ago
chengduoZH	23e38216a7	add dilation	7 years ago
dangqingqing	d432b10d8a	Update cuda kernel and doc.	7 years ago
chengduoZH	37671ac053	follow comments	7 years ago
chengduoZH	9e244a8cbe	follow comments	7 years ago
dangqingqing	e03b574e0e	Refine the Eigen usage for CPU implementation.	7 years ago
chengduoZH	54f09620cf	code refine	7 years ago
chengduoZH	488908e95b	refine cuda	7 years ago
dangqingqing	5bd1e73f5e	Refine and speedup momentum operator.	7 years ago
Yu Yang	d5e3279451	While op forward for sentimental analysis (#6140) ... * Add DataFeeder A v2 API like data feeder for book demos. We can feed data directly from reader. * Fix CI * Add an unittest for while/rnn op forward * Add unittest for raw while op backward * Fix CI	7 years ago
typhoonzero	57f666fb56	update	7 years ago
chengduoZH	fbbfe8b859	code refine	7 years ago
qingqing01	4786ad1457	Make the new framework independent the old framework. (#6201)	7 years ago
sweetsky0901	141a323c34	fix a bug	7 years ago
sweetsky0901	0c4446868b	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_spp_op	7 years ago
qingqing01	74725d0505	Merge pull request #6198 from qingqing01/lstm_style ... Make lstm_op follow google code style.	7 years ago
sweetsky0901	8368e55be9	modify some doc	7 years ago
qingqing01	20b885f7b8	Merge pull request #6148 from qingqing01/lstm_doc ... Fix the doc of LSTM operator.	7 years ago
sweetsky0901	531e7b6fa6	gpu test ok	7 years ago
qingqing01	e5b51c4d10	Make lstm_op follow google code style.	7 years ago
sweetsky0901	c75b4538ca	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_spp_op	7 years ago
sweetsky0901	5c057f9552	add spp op only can test ok	7 years ago
Siddharth Goyal	ea1a643425	Add hinge loss op (#5837) ... * Add hinge loss op * Update hinge-loss equation for proper latex	7 years ago
typhoonzero	c66c65cbdf	add grpc benchmark	7 years ago
武毅	067381e2e2	Merge pull request #6146 from typhoonzero/add_switch_distributed ... Add switch for distributed support	7 years ago
Yancey	1b612d3a76	Fix grpc compile warning (#6050) ... * fix grpc compile warn * update * -Wnon-virtual-dtor -> -Wno-non-virtual-dtor	7 years ago
whs	10b2534ebc	Merge pull request #5480 from wanghaoshuang/nce_op ... Add nce op	7 years ago
Yu Yang	1fe5acb25a	Expose sigmoid_cross_entropy_with_logits (#6147) ... Also, change the `labels` to `label` for api consistency	7 years ago
dangqingqing	d4fcd2a59f	Fix the doc of LSTM operator.	7 years ago
typhoonzero	1a852861b2	add switch for distributed support	7 years ago
Yu Yang	8ac02279f2	Fix the proformance problem of enforce (#6085) ... * Fix Proformance problem of enforce * Fix missing `;` in code * Fix CI	7 years ago
fengjiayi	4e564e4852	make WriteToArrayOp supporting empty tensor input (#6030)	7 years ago
fengjiayi	a38c151243	Add GetInputsElementDim (#6091)	7 years ago
Yibing Liu	61d98f27ce	Merge pull request #6058 from kuke/refine_rank_loss_op ... Revise comments in rank_loss_op	7 years ago
武毅	e1b8c27acb	Add back print_operators_doc (#5970) ... * add back print_operators_doc * fix style check * fix style check	7 years ago
Yibing Liu	0d8483b45d	Merge pull request #6060 from kuke/refine_reshape_op ... Amend license and comments in reshape_op	7 years ago
Yibing Liu	9907350d8a	Merge branch 'develop' of upstream into refine_rank_loss_op	7 years ago
Yibing Liu	da62d6cc24	fix the doc display problem in rank_loss_op	7 years ago
Yang yaming	990818f7c7	Merge pull request #6031 from pkuyym/fix-6016 ... Refine doc for smooth l1 loss op.	7 years ago
sweetsky0901	966a6ce6db	Merge pull request #5826 from sweetsky0901/my_unpool_max_2d ... My unpool max 2d	7 years ago
Yibing Liu	4d1ee0ff12	Amend license and comments in reshape_op	7 years ago
Yibing Liu	ff8a677848	Revise comments in rank_loss_op	7 years ago
chengduo	5a3d1362f7	Merge pull request #5951 from chengduoZH/fix_conv_doc ... fix conv and conv_trans op doc	7 years ago
Guo Sheng	0066bbbaa3	Merge pull request #6021 from guoshengCS/fix-GRUOp-codestyle ... Fix gru_op related code style	7 years ago
yangyaming	a5236265b7	Refine doc for smooth l1 loss op.	7 years ago
sweetsky0901	4ffb73fd3b	format ..	7 years ago
chengduoZH	c339e1b786	remove conflict	7 years ago
sweetsky0901	5b449b6021	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d	7 years ago
sweetsky0901	3206094b5e	format code	7 years ago
武毅	4ecbab42d8	Fix compile on cudnn7 (#5982) ... * fix compile on cudnn7 * update * update * make silent	7 years ago
guosheng	1ab03d49d5	Fix gru_op related code style in gpu_kernel	7 years ago
guosheng	3e552cdcac	Fix gru_op related code style	7 years ago
wanghaoshuang	29262ab24d	Fix unitest.	7 years ago
sweetsky0901	d2ee3c98df	format code	7 years ago
sweetsky0901	2d42fa74ec	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d	7 years ago
sweetsky0901	c52ed8de37	format code	7 years ago
kavyasrinet	dcf3ffd980	Adding log loss operator (#5854) ... * Adding log loss operator * Removing comments	7 years ago
sweetsky0901	bd561384bc	format code	7 years ago
sweetsky0901	d9673cad15	format code	7 years ago
sweetsky0901	821899ccd4	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d	7 years ago
sweetsky0901	6fc9a9fd69	modify for del T2 and doc update	7 years ago
Qiao Longfei	c975fe1bde	batch norm support matrix input (#5980) ... * batch norm support matrix input * update gpu code * format code	7 years ago
fengjiayi	23b3fef062	Make 'scale_op' supporting int and int64 (#5986) ... * Make 'scale_op' supporting int and int64 * refine .cu file	7 years ago
wanghaoshuang	76a65a83a0	Fix comments style	7 years ago
Yu Yang	985e4ab62d	Add Python wrap of conv2d_transpose and its unittest (#5946) ... * Add Python wrap of conv2d_transpose and its unittest * Follow comments * Fix format	7 years ago
wanghaoshuang	ab9d59c539	Fix double type error while using eigen api	7 years ago
wanghaoshuang	d0246e24e0	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into nce_op	7 years ago
wanghaoshuang	ea7359c60b	Refine code and comments ... 1. Remove checking for num_neg_samples. 2. Fix dims of Output(Cost) and Input(Bias). 3. Renamed num_sampled_classes to num_neg_samples. 4. Add TODO for add more distribution sampler. 5. Init grad_data of bias by zero. 6. Refine comments. 7. Register a kernel for type double.	7 years ago
武毅	0a8a86e0c9	Send recv op (#5520) ... * WIP send recv op * WIP send recv * put grpc impl in details * put grpc impl in details * update wip * update proto * update proto * update proto * clean cmake * wip on op implementations * wip on op implementations * compile ok adding ut * wip unitest * add extern cares for linking * wip add ut * working version send recv * revert optimizer.py * update test cmake * add libtool to dockerfile * update cmake dependency * update cmake depends * update cmake grpc depends * fix cmake dependency * fix compile error * fix compile * follow comments * update * update copyfrom	7 years ago
sweetsky0901	ee0a794c27	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d	7 years ago
sweetsky0901	57e68e5740	modify for code review by qingqing 2nd	7 years ago
Guo Sheng	0ce9bf77be	Merge pull request #5931 from guoshengCS/fix-ROIPoolOP-warn ... Refine roi_pool_op to avoid warning	7 years ago
chengduoZH	9abc0e04c1	fix conv and conv_trans op doc	7 years ago
Abhinav Arora	ef3420e2b9	Fix the latex comment syntax in sgd_op.cc (#5940) ... * Fix the latex comment syntax in sgd_op.cc * Change \textunderscore to \_	7 years ago
guosheng	19a37ecde3	Merge branch 'develop' of https://github.com/PaddlePaddle/paddle into fix-ROIPoolOP-warn	7 years ago
fengjiayi	90fc4a6cd5	Complete shrink_rnn_memory_op comments (#5935) ... * Complete shrink_rnn_memory_op comments * Update	7 years ago
QI JUN	b28b2f172b	refine test_recognize_digits_mlp and format codes (#5937)	7 years ago
sweetsky0901	f9c2a5c38e	modify for code review zcd	7 years ago
sweetsky0901	022b48e16f	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d	7 years ago
sweetsky0901	20654cf78a	modify for type check rewrite	7 years ago
guosheng	c8bb663141	Refine roi_pool_op to avoid warning	7 years ago
fengjiayi	33fa2dfbde	Compelete max_sequence_len_op (#5913)	7 years ago
武毅	a06bec1287	Conv cudnn 3d (#5783) ... * conv cudnn 3d * update test case * update * update * follow comments and remove groups from helper * update * refine * update * follow comments2 * update * fix compile	7 years ago
sweetsky0901	27cf7f3376	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d	7 years ago
sweetsky0901	cfd7721b51	add unpool_op.h modify	7 years ago
Yu Yang	a619695b06	Feature/enhance evaluator (#5824) ... * Stash * Stash * Polish Evaluator * Merge code * Revert	7 years ago
sweetsky0901	a38bbc8610	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d	7 years ago
sweetsky0901	c218961a6b	modify for code review by qingqing	7 years ago
dzhwinter	513b1e010f	"add floor, ceil, round op" (#5898) ... * "add floor, ceil, round op" * "reuse zero gradient" * "fix divide zero" * "fix numpy floor error"	7 years ago
dzhwinter	45062fe5d7	Feature/copytensor (#5455) ... * "make global tensor function independently" * "replace functor" * "fix inline template error" * "fix tensor array with CopyFrom" * "fix other case use CopyFrom" * "move the op interface hardly" * "fix operators" * "fix typo" * "delete dynamic recurrent rnn and fix gru_unit in debugmode" * "fix unique_ptr copy" * "fix cuda copy" * "fix namespace error" * "removed nccl python test" * "fix include error" * "fix typo" * fix copy util test	7 years ago
wanghaox	0690cca758	Merge pull request #5831 from wanghaox/roi_pool ... Roi pool operator	7 years ago
wanghaox	cf5b598642	fix some issues	7 years ago
wanghaox	ef905598a2	fix some code issues	7 years ago
Qiao Longfei	65c859db7a	beam_search_decode support multi data type (#5847) ... * beam_search_decode support multi data type * add VisitDataType for beam search decode * use Specialization to handle bool * move Specialization of BeamSearchDecodeFunctor out of class	7 years ago
QI JUN	3a76062c84	support testing when training and handle dropout and batch_norm operator in testing mode (#5734) ... * is_training to is_test in dropout op * handle dropout and batch_norm operator when prune pdesc in testing mode * handle dropout and batch_norm operator when prune pdesc in testing mode * add get_inference_program method * fix dropout op * fix ci * test data after each batch training * refine code * refine test_book3 * fix ci * follow comments	7 years ago
fengjiayi	50d670ee06	Unify dtype and datatype (#5869) ... * Change all `data_type` in Python to `dtype` * Change `date_type` in C++ to `dtype` * Refine	7 years ago
peterzhang2029	1ab1b092cd	Merge pull request #5875 from peterzhang2029/refine_op_doc ... Fix latex syntax in bilinear tensor product operator comment.	7 years ago
peterzhang2029	4bdd97625b	refine the latex mark	7 years ago
Cao Ying	2c471db2c1	Merge pull request #5884 from lcy-seso/fix_latex ... fix LaTeX syntax in three operators' comments.	7 years ago
qingqing01	52007ea662	Merge pull request #5872 from qingqing01/op_debug ... Fix lstm_op and gru_op in debug mode.	7 years ago
caoying03	8ba62a5f94	fix LaTeX syntax in liear_chain_crf op.	7 years ago
Yang yaming	98700ceef5	Merge pull request #5867 from pkuyym/fix-5865 ... Fix LaTeX equation for huber_loss_op.cc.	7 years ago
Yu Yang	c077a6d57c	Feature/support int64 for sum (#5832) ... * Support int64 for sum op * Refine code	7 years ago
peterzhang2029	aacd94127b	refine bilinear tensor product doc	7 years ago
chengduo	e800c0d3f1	Merge pull request #5791 from chengduoZH/fix_conv_op ... remove vector::erase	7 years ago
dangqingqing	7fb1f7a25f	Fix lstm_op and gru_op in debug mode.	7 years ago
yangyaming	3305c8766e	Add more comment.	7 years ago
sweetsky0901	ee4a5d2117	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d	7 years ago
yangyaming	fb56a18109	Fix LaTeX equation for huber_loss_op.cc.	7 years ago
sweetsky0901	66b84366f1	modify for code review by wangyi	7 years ago
kavyasrinet	d883547bf0	Adding the FTRL optimizer. (#5785) ... * Adding the FTRL optimizer * Fixed the python test case	7 years ago
wanghaox	36dd770a08	add roi operator unittest	7 years ago
wanghaox	7960928883	add roi pool operator	7 years ago
sweetsky0901	0112c5d640	format code	7 years ago
sweetsky0901	47bd0bb678	del printf	7 years ago
sweetsky0901	8ba8237a87	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d	7 years ago
sweetsky0901	e2a5905eae	gpu test ok unpool2dmax	7 years ago
Qiao Longfei	53bd51e3f4	07/Label semantic roles (#5798) ... * init label_semantic_roles.py * add linear_chain_crf and test * complete test_linear_chain_crf * correct last layer of db_lstm * update optimizer and initializer * update param_initializer of embedding_layer * support load pre trained embedding * rm unused parameter * optimize code * clean code * fix test * add todo	7 years ago
Guo Sheng	778b981e24	Merge pull request #5804 from guoshengCS/fix-GRUUnitOp-dev ... Fix calculations in gru_unit_op to consistent with gru_op	7 years ago
sweetsky0901	abb3357d1c	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d	7 years ago
sweetsky0901	90f664d0b0	test unpool ok cpu	7 years ago
chengduoZH	a93227a148	refine code	7 years ago
guosheng	b6b7ab63c6	Fix calculations in gru_unit_op to be consistent with gru_op	7 years ago
tensor-tang	55ecd6d29e	Merge pull request #5797 from luotao1/fix_warning ... fix some warning with MKLDNN related codes and etc	7 years ago
sweetsky0901	822f28343b	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d	7 years ago
sweetsky0901	200f07c219	add test	7 years ago
Yu Yang	a5e73f9eaf	Support many data types of several operators (#5731) ... * Support many data types of several operators * SeqConv only support float/double * Revert adagrad	7 years ago
sweetsky0901	45a8c9ddaf	add unpool2d make ok	7 years ago
guosheng	f191c82010	Merge branch 'develop' of https://github.com/PaddlePaddle/paddle into fix-GRUUnitOp-dev	7 years ago
sweetsky0901	f638f91020	merge cmakelist	7 years ago
sweetsky0901	bc45335e55	add unpool	7 years ago
Luo Tao	67fa0de2a7	fix some warning with MKLDNN related codes and etc	7 years ago
chengduoZH	e5bf9c5670	remove vector::eraze	7 years ago
sweetsky0901	04fd98930b	for code review 6	7 years ago
sweetsky0901	3fbff1ee78	for code review 5	7 years ago
sweetsky0901	350cc61f3f	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	7 years ago
sweetsky0901	4e5c989669	rename back	7 years ago
wanghaox	6ac42378ac	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	7 years ago
wanghaox	76fc1a82e1	for code review 4	7 years ago
chengduoZH	bc3ec53671	remove conflict	7 years ago
chengduo	134eaf21b3	Merge pull request #5602 from chengduoZH/add_cudnn_pool3d ... Add cudnn pool3d	7 years ago
wanghaox	52f2366d2b	Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op	7 years ago
wanghaox	c645d065fe	add a space + *	7 years ago
guosheng	3e7fff4188	Fix calculations in gru_unit_op	7 years ago
wanghaox	794117bb93	fix some comments	7 years ago