My unpool max 2d#5826

Merged

sweetsky0901 merged 38 commits intoPaddlePaddle:developfrom

sweetsky0901:my_unpool_max_2d

Nov 29, 2017

Commits on Nov 11, 2017

for resolve conflicts
wanghaox
committed
Merge branch 'sweetsky0901-my_maxout_op' into develop
wanghaox
committed
paddle/operators/math/CMakeLists.txt maybe del sequence_pooling and add it
wanghaox
committed
Merge branch 'sweetsky0901-my_maxout_op2' into develop
wanghaox
committed

Commits on Nov 21, 2017

add unpool
sweetsky0901
committed
merge cmakelist
sweetsky0901
committed
add unpool2d make ok
sweetsky0901
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d
sweetsky0901
committed
add test
sweetsky0901
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d
sweetsky0901
committed

Commits on Nov 22, 2017

test unpool ok cpu
sweetsky0901
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d
sweetsky0901
committed
gpu test ok unpool2dmax
sweetsky0901
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d
sweetsky0901
committed
del printf
sweetsky0901
committed
format code
sweetsky0901
committed
format test code
sweetsky0901
committed

Commits on Nov 23, 2017

modify for code review by wangyi
sweetsky0901
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d
sweetsky0901
committed

Commits on Nov 26, 2017

modify for code review by qingqing
sweetsky0901
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d
sweetsky0901
committed

Commits on Nov 27, 2017

add unpool_op.h modify
sweetsky0901
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d
sweetsky0901
committed
modify for type check rewrite
sweetsky0901
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d
sweetsky0901
committed
modify for code review zcd
sweetsky0901
committed

Commits on Nov 28, 2017

modify for code review by qingqing 2nd
sweetsky0901
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d
sweetsky0901
committed
modify for del T2 and doc update
sweetsky0901
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d
sweetsky0901
committed
format code
sweetsky0901
committed

Commits on Nov 29, 2017

format code
sweetsky0901
committed
format code
sweetsky0901
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d
sweetsky0901
committed
format code
sweetsky0901
committed
format code
sweetsky0901
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_unpool_max_2d
sweetsky0901
committed
format ..
sweetsky0901
committed