Add pool op #4146

chengduoZH · 2017-09-18T02:15:11Z

Add pool op.

Add pooling2d max and average (gpu and cpu implementations)
Add pooling3d max and average (gpu and cpu implementations)
Add unit test pooling2d and pooling3d

fixed #4231
fixed #3692
fixed #4165
fixed #4164

qingqing01 · 2017-09-26T02:48:45Z

paddle/operators/math/pool_test_maxPool2d.cc

@@ -0,0 +1,154 @@
+/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.


change file name: pool_test_maxPool2d.cc

Filenames should be all lowercase and can include underscores (_) or dashes (-).

https://google.github.io/styleguide/cppguide.html#File_Names

qingqing01 · 2017-09-26T02:49:30Z

paddle/operators/math/pool_test_maxPool2d.cc

+  finish = clock();
+  totaltime = (double)(finish - start) / CLOCKS_PER_SEC;
+  totaltime /= times;
+  std::cout << "\nMaxPool3dBackwardFunctor: " << totaltime << "s" << std::endl;


Remove these debug code when merging code.

qingqing01 · 2017-09-26T02:52:42Z

paddle/operators/math/pooling.cc

+namespace math {
+
+template <typename PoolProcess, typename T>
+class Pool2dForwardFunctor<platform::CPUPlace, PoolProcess, T> {


和Operator命名一致，用Pool2d 和 Pool2dGrad ? (是否要Functor后缀?)

rename Pool2dForwardFunctor -> Pool2dFunctor , Pool2dBackwardFunctor -> Pool2dGradFunctor

qingqing01 · 2017-09-26T02:57:17Z

paddle/operators/math/pooling.h

+class maxPool {
+ public:
+  DEVICE inline T initial() { return static_cast<T>(-FLT_MAX); }
+  DEVICE inline void process(T& y, const T& x) { y = y > x ? y : x; }


process -> compute?

qingqing01 · 2017-09-26T03:00:12Z

paddle/operators/math/pooling.h

+#define FLT_MAX __FLT_MAX__
+/////////////////////
+
+namespace pool {


如果要加namespace pool,需要新建paddle/operators/math/pool 路径。

qingqing01 · 2017-09-26T03:24:07Z

paddle/operators/pool_op.cc

+  void InferShape(const framework::InferShapeContext &ctx) const override {
+    auto in = ctx.Input<Tensor>("X");
+    auto d_in = ctx.Output<Tensor>(framework::GradVarName("X"));
+    if (d_in) d_in->Resize(in->dims());


backward只有一个输出的，可以不用判断，直接写成：

d_in->Resize(in->dims());

qingqing01 · 2017-09-26T03:27:06Z

paddle/operators/pool_op.cc

+                              "strides(height, width) of pooling operator."
+                              "default {1,1}")
+        .SetDefault({1, 1})
+        .AddCustomChecker(GreaterThanChecker_pool({0, 0}));


GreaterThanChecker_pool({1, 1}

"strides"是可以等于1的

qingqing01 · 2017-09-26T03:30:23Z

paddle/operators/pool_op.cc

+  }
+
+ private:
+  struct GreaterThanChecker_pool {


命名规则：https://google.github.io/styleguide/cppguide.html#Type_Names

另外可以直接给paddle/framework/attribute.h里加吧。

The custom checker has been removed, waiting for the vector data checker to be added and then PR fixes.

qingqing01 · 2017-09-26T03:30:50Z

paddle/operators/pool_op.cc

+             "The format of input tensor is NCDHW. Where N is batch size, C is "
+             "the "
+             "number of channels, D, H and W is the depth, height and width of "
+             "image.");


image -> feature.

qingqing01 · 2017-09-26T03:31:15Z

paddle/operators/pool_op.cc

+    AddAttr<std::vector<int>>(
+        "ksize", "pooling size(height, width) of pooling operator.")
+        .AddCustomChecker(GreaterThanChecker_pool({0, 0}));
+    AddAttr<int>(


use bool type.

… Add_pool_op

hedaoyuan · 2017-09-30T02:37:12Z

python/paddle/v2/framework/tests/test_pool3d_op.py

+        self.paddings = [0, 0, 0]
+
+
+class TestCase3(TestPool3d_Op):


hedaoyuan · 2017-09-30T02:39:24Z

python/paddle/v2/framework/tests/test_pool2d_op.py

+        self.paddings = [0, 0]
+
+
+class TestCase3(TestPool2d_Op):


TestCase3 repeated definition

chengduoZH requested review from qingqing01 and hedaoyuan September 18, 2017 03:49

qingqing01 added the OpPorting label Sep 18, 2017

chengduoZH force-pushed the Add_pool_op branch 20 times, most recently from ea4805c to af49f7b Compare September 18, 2017 08:50

qingqing01 requested a review from Xreki September 18, 2017 09:11

chengduoZH force-pushed the Add_pool_op branch 6 times, most recently from dae5052 to 118e091 Compare September 18, 2017 10:02

chengduoZH force-pushed the Add_pool_op branch from 5e25693 to f6e69d7 Compare September 26, 2017 02:06

qingqing01 reviewed Sep 26, 2017

View reviewed changes

chengduoZH force-pushed the Add_pool_op branch 5 times, most recently from 10681ca to 49a17aa Compare September 26, 2017 08:49

Fix (According to the review)

dfc8d3c

chengduoZH force-pushed the Add_pool_op branch from 20491de to dfc8d3c Compare September 26, 2017 09:00

chengduoZH added 2 commits September 26, 2017 20:01

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

30a586d

… Add_pool_op

fix globalPooling type (int => bool)

4b06d8d

chengduoZH force-pushed the Add_pool_op branch 3 times, most recently from b4d0e74 to 08fb06b Compare September 27, 2017 14:44

remove conflict and fix InferShape function

3c0f079

chengduoZH force-pushed the Add_pool_op branch from 08fb06b to 3c0f079 Compare September 27, 2017 14:45

remove custom attr checker and fix code format

e1e3859

chengduoZH force-pushed the Add_pool_op branch 2 times, most recently from 37c9fc2 to e1e3859 Compare September 29, 2017 07:11

remove conflict

df59889

chengduoZH force-pushed the Add_pool_op branch 2 times, most recently from eb6f3d5 to 26d3009 Compare September 29, 2017 13:54

fix unit test

2d8a5b9

chengduoZH force-pushed the Add_pool_op branch from 26d3009 to 2d8a5b9 Compare September 30, 2017 01:42

hedaoyuan previously approved these changes Sep 30, 2017

View reviewed changes

fix unit test class name

6abcb74

chengduoZH dismissed hedaoyuan’s stale review via 6abcb74 September 30, 2017 02:49

hedaoyuan approved these changes Sep 30, 2017

View reviewed changes

chengduoZH merged commit 4f5491b into PaddlePaddle:develop Sep 30, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add pool op #4146

Add pool op #4146

chengduoZH commented Sep 18, 2017 •

edited

Loading

qingqing01 Sep 26, 2017

qingqing01 Sep 26, 2017

chengduoZH Sep 29, 2017

qingqing01 Sep 26, 2017

chengduoZH Sep 29, 2017

qingqing01 Sep 26, 2017

chengduoZH Sep 26, 2017

qingqing01 Sep 26, 2017

chengduoZH Sep 26, 2017

qingqing01 Sep 26, 2017

chengduoZH Sep 26, 2017

qingqing01 Sep 26, 2017

chengduoZH Sep 26, 2017

qingqing01 Sep 26, 2017

chengduoZH Sep 26, 2017

qingqing01 Sep 26, 2017

chengduoZH Sep 26, 2017

qingqing01 Sep 26, 2017

chengduoZH Sep 26, 2017

hedaoyuan Sep 30, 2017

chengduoZH Sep 30, 2017

hedaoyuan Sep 30, 2017

chengduoZH Sep 30, 2017

		@@ -0,0 +1,154 @@
		/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.

Add pool op #4146

Add pool op #4146

Conversation

chengduoZH commented Sep 18, 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

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chengduoZH commented Sep 18, 2017 •

edited

Loading