Skip to content

Add ImageExpandFunction. #2449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 23 commits into from
Jul 25, 2017
Merged

Add ImageExpandFunction. #2449

merged 23 commits into from
Jul 25, 2017

Conversation

@hedaoyuan
Copy link
Contributor

@hedaoyuan hedaoyuan commented Jun 12, 2017 •
edited
Loading

Fix #2424. Need pr #2282 .

number old code new code about
1 BlockExpandLayer ImageExpand, ImageExpandGrad, BlockExpandLayer Use the ImageExpand and ImageExpandGrad function to refactor the code of BlockExpandLayer.
2 Im2ColFunctor, Col2ImFunctor in pr #2282 Im2ColFunctor, Col2ImFunctor Use the TensorShape to refactor the arguments of the Im2ColFunctor and Col2ImFunctor interfaces. And add ColFormat kOCF.
3 Unit test of Im2ColFunctor, Col2ImFunctor The transposition of the result of ColFormat==kCFO is equal to the result of ColFormat==kOCF.
4 Remove Matrix::convExpand and Matrix::convShrink after pr #2282
@hedaoyuan hedaoyuan requested a review from qingqing01 June 12, 2017 13:24
hedaoyuan added 21 commits June 13, 2017 10:51
@hedaoyuan
BlockExpandLayer based on the ImageExpand Function.
61aa109
@hedaoyuan
Add ImageExpandGrad Function.
2acb84f
@hedaoyuan
Use the TensorShape to reconstruct the arguments of the Im2ColFunctor…
0672d33 
… and Col2ImFunctor interfaces.
@hedaoyuan
Remove GemmConvOp.h file.
9c009b4
@hedaoyuan
Fix some of the wrong comments in im2col.h file.
34362d9
@hedaoyuan
Add the GPU version implementation of ImageExpand function.
152bd2f
@hedaoyuan
Add the GPU version implementation of ImageExpandGrad function.
f8ef8c1
@hedaoyuan
Remove some of the code that has been commented out.
bf6dfc1
@hedaoyuan
Merge branch 'develop' of https://github.com/baidu/Paddle into ImageE…
69271c9 
…xpandFunction
@hedaoyuan
Move the code in the GemmConvOpGpu.cu file into Im2ColOpGpu.cu.
d558b8b
@hedaoyuan
Merge branch 'develop' of https://github.com/baidu/Paddle into ImageE…
1a53cba 
…xpandFunction
@hedaoyuan
Move the Im2Col code of the CPU version into the Im2ColOp.cpp file.
eb0c7e5
@hedaoyuan
Reconstruction of GemmConv Based on new im2col.
07cde43
@hedaoyuan
Fix ImageExpandFunction.
9e6ed83
@hedaoyuan
Remove useless code.
5bfcb7f
@hedaoyuan
Remove useless code(Matrix::convExpand and Matrix::convShrink).
09d712d
@hedaoyuan
Add unit test of ImageExpandOp.
86a679b
@hedaoyuan
Add unit test for im2col.
c761010
@hedaoyuan
Add unit test for Col2ImFunctor.
a83d521
@hedaoyuan
Change the ImageFunction name to BlockFunction(Consistent with the na…
a7ff114 
…me of Layer).
@hedaoyuan
Fix the function file name.
7a550f9
qingqing01
qingqing01 reviewed Jun 30, 2017
View reviewed changes
paddle/function/Im2Col.h
namespace paddle {

/* The storage format of the coldata in the Im2ColFunctor and Col2ImFunctor. */
enum ColFormat { kCFO = 0, kOCF = 1 };
Copy link
Contributor

@qingqing01 qingqing01 Jun 30, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这两种格式在Layer里都用嘛？ 我印象中只用了一种吧。 有两种的话，会导致weight是转置关系吗？

C: input channel
F: filter
O: output channel
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kCFO是用在GemmConvFunction卷积计算中的；kOCF是用在这个PR的BlockExpandFunction中的，原先BlockExpandLayer中是用的kCFO这种方式，不过计算完了，还需要再做一次转置才行。
@qingqing01
Copy link
Contributor

Almost LGTM.
@hedaoyuan hedaoyuan merged commit 1ab2e44 into PaddlePaddle:develop Jul 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants

@hedaoyuan @qingqing01