Add pool2d cudnn op #4636

chengduoZH · 2017-10-09T09:28:28Z

fix #4637
Add pool cudnn op.

Finish the cudnn pool2d maxpool and avgpool, only support NCHW(data layout) .
Finish the cudnn pool2d unit test.
Fix pool_op attribution's name.
TODO in next PR:
- Add cudnn pool3d maxpool and avgpool.
- Add cudnn pool3d unit test.
- Support NHWC(data layout) .

typhoonzero · 2017-10-27T04:06:53Z

paddle/operators/pool_op.cc

@@ -80,34 +80,31 @@ Pool2dOpMaker::Pool2dOpMaker(framework::OpProto *proto,
            "the number of channels, H and W is the height and "
            "width of feature.");

-  AddAttr<std::string>("pooling_type",
-                       "Pooling_type of pooling operator."
+  AddAttr<std::string>("poolingType",


Google C++ style did not specify the constant string naming rules, but since this attribute is going to be used when user define operators using python, following python style seems resonable?

typhoonzero · 2017-10-27T04:08:09Z

paddle/operators/pool_op.cc

-  AddAttr<std::string>("pooling_type",
-                       "Pooling_type of pooling operator."
+  AddAttr<std::string>("poolingType",
+                       "(string), poolingType of pooling operator."


(string), pooling type, can be "max" for max-pooling and "avg" for average-pooling.

typhoonzero · 2017-10-27T04:11:15Z

paddle/operators/pool_op.cc

-      "The pooling window size(height, width) of pooling operator."
-      "If global_pooling = true, ksize is ignored and need not be "
+      "(vector ), the pooling window size(height, width) of pooling operator."
+      "If globalPooling = true, ksize is ignored and need not be "


Remove "and need not be specified".

Ignored means whether a user is providing this value, it's not used.

"need not be specified" means the user should never provide this value, or else it will cause error.

typhoonzero · 2017-10-27T04:17:57Z

paddle/operators/pool_op.cc

  AddAttr<std::vector<int>>(
      "ksize",
-      "The pooling window size(depth, height, width) of pooling operator."
-      "If global_pooling = true, ksize is ignored and need not be "
+      "(vector ), the pooling window size(depth, height, width) of pooling "


Pooling 3d and 2d seem to have very similar description documents, They can be merged into one OpMaker using the same description, like:

(vector), the pooling window size of pooling operator, for 3d pooling the layout should be (depth, height, width), for 2d it should be (height, width). ...

typhoonzero · 2017-10-27T04:23:01Z

paddle/operators/pool_cudnn_op.cu

+using PoolingMode = platform::PoolingMode;
+
+// NOTE: copy from conv_cudnn
+std::vector<int> Dims2VectorPool(const framework::DDim &dims) {


You can put this function to ddim.cc.

typhoonzero · 2017-10-27T04:24:29Z

paddle/operators/pool_cudnn_op.h

+
+namespace paddle {
+namespace operators {}  // namespace operators
+}  // namespace paddle


Can remove this file and move #include to pool_cudnn_op.cu.

Currently, this header file is necessary to register as two op (pool2d_cudnn, pool2d_cudnn).
We can talk abort this in next PR.

typhoonzero · 2017-10-27T04:28:29Z

The change of attr name causes CI error:

235/239 Test #236: test_recognize_digits_conv ..................***Failed 0.70 sec
[11:33:26]	Traceback (most recent call last):
[11:33:26]	File "test_recognize_digits_conv.py", line 35, in <module>
[11:33:26]	init_program=init_program)
[11:33:26]	File "/paddle/build/python/build/lib-python/paddle/v2/framework/nets.py", line 26, in simple_img_conv_pool
[11:33:26]	init_program=init_program)
[11:33:26]	File "/paddle/build/python/build/lib-python/paddle/v2/framework/layers.py", line 273, in pool2d
[11:33:26]	"paddings": pool_padding
[11:33:26]	File "/paddle/build/python/build/lib-python/paddle/v2/framework/layer_helper.py", line 44, in append_op
[11:33:26]	return self.program.current_block().append_op(*args, **kwargs)
[11:33:26]	File "/paddle/build/python/build/lib-python/paddle/v2/framework/framework.py", line 359, in append_op
[11:33:26]	op = Operator(self, op_desc, *args, **kwargs)
[11:33:26]	File "/paddle/build/python/build/lib-python/paddle/v2/framework/framework.py", line 263, in __init__
[11:33:26]	self.desc.check_attrs()
[11:33:26]	paddle.v2.framework.core.EnforceNotMet: Attribute 'poolingType' is required! at [/paddle/paddle/framework/attribute.h:215]
[11:33:26]	PaddlePaddle Call Stacks:
[11:33:26]	0 0x7f0aaaaf321cp paddle::platform::EnforceNotMet::EnforceNotMet(std::__exception_ptr::exception_ptr, char const*, int) + 572

typhoonzero

LGTM++

chengduoZH force-pushed the Add_pool_cudnn_op branch 2 times, most recently from 75a2f0f to 104ca74 Compare October 9, 2017 11:42

chengduoZH changed the title ~~Add pool cudnn op~~ [WIP]Add pool cudnn op Oct 9, 2017

chengduoZH force-pushed the Add_pool_cudnn_op branch 2 times, most recently from 846e479 to 8c51a0d Compare October 9, 2017 11:54

chengduoZH added the OpPorting label Oct 9, 2017

chengduoZH force-pushed the Add_pool_cudnn_op branch 7 times, most recently from 92b75fd to 91caf62 Compare October 10, 2017 03:22

chengduoZH requested review from NHZlX, qingqing01 and hedaoyuan October 10, 2017 03:28

chengduoZH changed the title ~~[WIP]Add pool cudnn op~~ Add pool cudnn op Oct 10, 2017

chengduoZH force-pushed the Add_pool_cudnn_op branch 4 times, most recently from 80f8bf7 to 4b82b2f Compare October 11, 2017 11:28

chengduoZH force-pushed the Add_pool_cudnn_op branch 5 times, most recently from e5d7580 to 926b90f Compare October 25, 2017 15:58

Add pool2d cudnn

1bb0e29

chengduoZH force-pushed the Add_pool_cudnn_op branch 3 times, most recently from 0b12868 to 74abe6b Compare October 26, 2017 14:21

chengduoZH force-pushed the Add_pool_cudnn_op branch from 74abe6b to a4274d3 Compare October 26, 2017 15:29

remove conflict

25df892

chengduoZH force-pushed the Add_pool_cudnn_op branch 2 times, most recently from 28b534c to 8149e6d Compare October 27, 2017 01:55

fix doc

0ab012c

chengduoZH force-pushed the Add_pool_cudnn_op branch 2 times, most recently from 4e7c1de to 2d7d43f Compare October 27, 2017 02:18

fix unit test

e5c167d

chengduoZH force-pushed the Add_pool_cudnn_op branch 4 times, most recently from 1c7f783 to 7f34029 Compare October 27, 2017 02:52

chengduoZH requested a review from typhoonzero October 27, 2017 02:53

chengduoZH changed the title ~~Add pool cudnn op~~ Add pool2d cudnn op Oct 27, 2017

typhoonzero reviewed Oct 27, 2017

View reviewed changes

fix clear zero method and remove useless code

df48b43

chengduoZH force-pushed the Add_pool_cudnn_op branch from 7f34029 to df48b43 Compare October 27, 2017 04:54

follow comments

cadee84

chengduoZH force-pushed the Add_pool_cudnn_op branch from 9582e85 to cadee84 Compare October 27, 2017 08:10

typhoonzero approved these changes Oct 27, 2017

View reviewed changes

chengduoZH merged commit 5a95792 into PaddlePaddle:develop Oct 27, 2017

chengduoZH added this to Done in Port Operators Oct 27, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add pool2d cudnn op #4636

Add pool2d cudnn op #4636

chengduoZH commented Oct 9, 2017 •

edited

Loading

typhoonzero Oct 27, 2017

typhoonzero Oct 27, 2017

chengduoZH Oct 27, 2017

typhoonzero Oct 27, 2017

chengduoZH Oct 27, 2017

typhoonzero Oct 27, 2017

typhoonzero Oct 27, 2017

chengduoZH Oct 27, 2017

typhoonzero Oct 27, 2017

chengduoZH Oct 27, 2017

typhoonzero commented Oct 27, 2017

typhoonzero left a comment

Add pool2d cudnn op #4636

Add pool2d cudnn op #4636

Conversation

chengduoZH commented Oct 9, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

typhoonzero commented Oct 27, 2017

typhoonzero left a comment

Choose a reason for hiding this comment

chengduoZH commented Oct 9, 2017 •

edited

Loading