[static op generation] pool2d, pool3d #54070

gouzil · 2023-05-23T14:00:32Z

PR types

Others

PR changes

Others

Description

相关链接

算子定义生成体系建设--静态图算子自动生成-第二期 #53267

paddle-bot · 2023-05-23T14:00:39Z

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

paddle-bot · 2023-05-23T14:00:42Z

❌ The PR is not created using PR's template. You can refer to this Demo.
Please use PR's template, it helps save our maintainers' time so that more developers get helped.

heavyrain-lzy · 2023-05-24T06:50:49Z

paddle/phi/api/yaml/legacy_ops.yaml

-  output : Tensor(out)
-  infer_meta :
-    func : Pool2DInferMeta
-    param : [x, kernel_size, strides, paddings, ceil_mode, exclusive, data_format, pooling_type, global_pooling, adaptive, padding_algorithm]


legacy中的配置保留

heavyrain-lzy · 2023-05-24T06:50:53Z

paddle/phi/api/yaml/legacy_backward.yaml

-  args : (Tensor x, Tensor grad_x_grad, IntArray kernel_size, int[] strides, int[] paddings, bool ceil_mode, bool exclusive, str data_format, str pooling_type, bool global_pooling, bool adaptive, str padding_algorithm)
-  output : Tensor(grad_out_grad)
-  infer_meta :
-    func : Pool2DInferMeta


legacy中的配置保留

heavyrain-lzy · 2023-05-25T06:44:35Z

paddle/phi/api/yaml/legacy_backward.yaml

@@ -639,17 +639,6 @@
    param : [x, out, out_grad, kernel_size, strides, paddings, ceil_mode, exclusive, data_format, pooling_type, global_pooling, adaptive, padding_algorithm]
  backward : pool2d_double_grad

- backward_op : pool3d_grad
-  forward : pool3d(Tensor x, int[] kernel_size, int[] strides, int[] paddings, bool ceil_mode, bool exclusive, str data_format, str pooling_type, bool global_pooling, bool adaptive, str padding_algorithm) -> Tensor(out)
-  args : (Tensor x, Tensor out, Tensor out_grad, int[] kernel_size, int[] strides, int[] paddings, bool ceil_mode, bool exclusive, str data_format, str pooling_type, bool global_pooling, bool adaptive, str padding_algorithm)


原始legacy_backward.yaml中的配置不要改动。

heavyrain-lzy · 2023-05-25T06:44:48Z

paddle/phi/api/yaml/legacy_ops.yaml

-  output : Tensor(out)
-  infer_meta :
-    func : PoolInferMeta
-    param : [x, kernel_size, strides, paddings, ceil_mode, exclusive, data_format, pooling_type, global_pooling, adaptive, padding_algorithm]


原始legacy_ops.yaml中的配置不要改动。

heavyrain-lzy · 2023-05-25T06:46:46Z

paddle/fluid/operators/unity_build_rule.cmake

test/cpp/fluid/mkldnn/CMakeLists.txt中的pool_op修改为static_generated_op

gouzil · 2023-05-25T07:00:50Z

这个是需要设置默认值吗还是啥, 在Make里面其实应该是ksize

45: ======================================================================
45: ERROR: test_static (test_adaptive_avg_pool2d.TestOutputSizeTensor)
45: ----------------------------------------------------------------------
45: Traceback (most recent call last):
45:   File "/home/aistudio/git/paddle/build/python/paddle/fluid/tests/unittests/test_adaptive_avg_pool2d.py", line 327, in test_static
45:     out1, out2 = self.call_func(feat)
45:   File "/home/aistudio/git/paddle/build/python/paddle/fluid/tests/unittests/test_adaptive_avg_pool2d.py", line 354, in call_func
45:     out1 = paddle.nn.functional.adaptive_avg_pool2d(x=x, output_size=[3, 3])
45:   File "/home/aistudio/git/paddle/build/python/paddle/nn/functional/pooling.py", line 1653, in adaptive_avg_pool2d
45:     helper.append_op(
45:   File "/home/aistudio/git/paddle/build/python/paddle/fluid/layer_helper.py", line 45, in append_op
45:     return self.main_program.current_block().append_op(*args, **kwargs)
45:   File "/home/aistudio/git/paddle/build/python/paddle/fluid/framework.py", line 4013, in append_op
45:     op = Operator(
45:   File "/home/aistudio/git/paddle/build/python/paddle/fluid/framework.py", line 2988, in __init__
45:     self.desc.check_attrs()
45: ValueError: (InvalidArgument) Attribute (kernel_size) is not set correctly.
45:   [Hint: Expected default_value_setter_.empty() == false, but received default_value_setter_.empty():1 != false:0.] (at /home/aistudio/git/paddle/paddle/fluid/framework/attribute_checker.h:273)
45: 
45: 
45: ----------------------------------------------------------------------
45: Ran 7 tests in 0.031s
45: 
45: FAILED (errors=5)
45: 
45: size : [2, 5]
1/1 Test #45: test_adaptive_avg_pool2d .........***Failed    2.89 sec

heavyrain-lzy · 2023-05-25T08:25:08Z

test/cpp/fluid/mkldnn/CMakeLists.txt

@@ -39,7 +39,7 @@ cc_test_old(
  test_mkldnn_op_nhwc.cc
  DEPS
  op_registry
-  pool_op


上一个写错了，应该是generated_static_op

heavyrain-lzy · 2023-05-25T08:27:06Z

paddle/phi/api/yaml/op_compat.yaml

+    kernel_size :
+      data_type : int
+      tensor_name : Ksize
+      support_tensor : true


int_array: kernel_size : data_type : int tensor_name : Ksize support_tensor : true

--->

int_array: kernel_size : data_type : int support_tensor : true

heavyrain-lzy · 2023-05-25T08:28:15Z

paddle/phi/api/yaml/op_compat.yaml

+    {x : X}
+  outputs :
+    {out : Out}
+  int_array:


增加:

attrs : {kernel_size : ksize}

…pool2d

heavyrain-lzy · 2023-05-29T03:01:12Z

paddle/phi/api/yaml/op_compat.yaml

@@ -1775,12 +1775,35 @@

 - op : pool2d
  backward : pool2d_grad


backward : pool2d_grad, pool2d_double_grad

heavyrain-lzy · 2023-05-29T03:01:31Z

paddle/phi/api/yaml/op_compat.yaml

+  get_expected_kernel_type :
+    pool2d : GetPoolExpectedKernelType
+    pool2d_grad : GetPoolGradExpectedKernelType
+    pool2d_double_grad : GetPoolExpectedKernelType
  extra :


sig文件不要删除，这里配置

keep_signature : [pool2d, pool2d_grad, pool2d_double_grad]

heavyrain-lzy · 2023-05-29T03:02:02Z

paddle/phi/api/yaml/op_compat.yaml

+  get_expected_kernel_type :
+    pool2d : GetPoolExpectedKernelType
+    pool2d_grad : GetPoolGradExpectedKernelType
+    pool2d_double_grad : GetPoolExpectedKernelType
  extra :
    attrs : [bool use_mkldnn = false, bool use_quantizer = false,
              str mkldnn_data_type = "float32", bool is_test = false]

 - op : pool3d
  backward : pool3d_grad


backward : pool3d_grad--> backward : pool3d_grad, pool3d_double_grad

pool3d没有double_grad只有pool2d有

pool3d没有double_grad只有pool2d有

好的，按实际需求配置。

heavyrain-lzy · 2023-05-29T03:02:35Z

paddle/phi/api/yaml/op_compat.yaml

+    {kernel_size : ksize}
+  get_expected_kernel_type :
+    pool3d : GetPoolExpectedKernelType
+    pool3d_grad : GetPoolGradExpectedKernelType
  extra :


sig文件不要删除，这里配置

keep_signature : [pool3d, pool3d_grad, pool3d_double_grad]

不删除的话编译会multiple definitionPR-CI-Inference

不删除的话编译会multiple definitionPR-CI-Inference

pool2d增加对应的设置：

keep_signature : [pool2d, pool2d_grad, pool2d_double_grad]

…pool2d # Conflicts: # paddle/phi/api/yaml/static_backward.yaml

…il/Paddle into autogen_code_pool2d # Conflicts: # paddle/phi/api/yaml/static_backward.yaml

gouzil · 2023-05-31T07:26:03Z

672: --------------------------------------
672: C++ Traceback (most recent call last):
672: --------------------------------------
672: 0   paddle::framework::OpDesc::InferShape(paddle::framework::BlockDesc const&)
672: 1   std::_Function_handler<void (paddle::framework::InferShapeContext*), paddle::framework::details::OpInfoFiller<paddle::operators::Pool2dDoubleGradInferShapeFunctor, (paddle::framework::details::OpInfoFillType)4>::operator()(char const*, paddle::framework::OpInfo*) const::{lambda(paddle::framework::InferShapeContext*)#1}>::_M_invoke(std::_Any_data const&, paddle::framework::InferShapeContext*&&)
672: 2   paddle::operators::Pool2dDoubleGradInferShapeFunctor::operator()(paddle::framework::InferShapeContext*) const
672: 3   phi::Pool2DInferMeta(phi::MetaTensor const&, paddle::experimental::IntArrayBase<phi::DenseTensor> const&, std::vector<int, std::allocator<int> > const&, std::vector<int, std::allocator<int> > const&, bool, bool, std::string const&, std::string const&, bool, bool, std::string const&, phi::MetaTensor*, phi::MetaConfig)
672: 4   phi::PoolInferMeta(phi::MetaTensor const&, std::vector<int, std::allocator<int> > const&, std::vector<int, std::allocator<int> > const&, std::vector<int, std::allocator<int> > const&, bool, bool, std::string const&, std::string const&, bool, bool, std::string const&, phi::MetaTensor*, phi::MetaConfig)
672: 
672: ----------------------
672: Error Message Summary:
672: ----------------------
672: FatalError: `Segmentation fault` is detected by the operating system.
672:   [TimeInfo: *** Aborted at 1685514034 (unix time) try "date -d @1685514034" if you are using GNU date ***]
672:   [SignalInfo: *** SIGSEGV (@0x0) received by PID 28270 (TID 0x7f63da252740) from PID 0 ***]
672: 
672: Segmentation fault
1/1 Test #672: test_nn_grad .....................***Failed    2.90 sec

我 debug 了一下目前定位是paddle/phi/infermeta/unary.cc

void PoolInferMeta(const MetaTensor& x,
......

  out->set_dims(make_ddim(output_shape));   <----- 这里触发的
  out->share_lod(x);
  out->set_dtype(x.dtype());

heavyrain-lzy · 2023-05-31T11:23:56Z

paddle/phi/api/yaml/static_backward.yaml

@@ -55,6 +55,41 @@
    param : [x, out_grad]
  inplace : (out_grad -> x_grad)

+- backward_op : pool2d_double_grad
+  forward : pool2d_grad(Tensor x, Tensor out, Tensor grad_out, IntArray kernel_size, int[] strides, int[] paddings, bool ceil_mode, bool exclusive, str data_format, str pooling_type, bool global_pooling, bool adaptive, str padding_algorithm) -> Tensor(grad_x)
+  args : (Tensor x, Tensor grad_x_grad, IntArray kernel_size, int[] strides, int[] paddings, bool ceil_mode, bool exclusive, str data_format, str pooling_type, bool global_pooling, bool adaptive, str padding_algorithm)


应该是参数问题，这里去掉args中的Tensor x

heavyrain-lzy · 2023-05-31T11:24:14Z

paddle/phi/api/yaml/static_backward.yaml

+  kernel :
+    func : pool2d_double_grad
+    param : [grad_x_grad, kernel_size, strides, paddings, ceil_mode, exclusive, data_format, pooling_type, global_pooling, adaptive, padding_algorithm]
+  no_need_buffer : x


去掉no_need_buffer

heavyrain-lzy · 2023-05-31T11:37:40Z

paddle/phi/api/yaml/op_compat.yaml

+  get_expected_kernel_type :
+    pool3d : GetPoolExpectedKernelType
+    pool3d_grad : GetPoolGradExpectedKernelType
+  manual_signature : [pool3d, pool3d_grad]


删除manual_signature

heavyrain-lzy · 2023-05-31T11:37:50Z

paddle/phi/api/yaml/op_compat.yaml

+    pool2d : GetPoolExpectedKernelType
+    pool2d_grad : GetPoolGradExpectedKernelType
+    pool2d_double_grad : GetPoolExpectedKernelType
+  manual_signature : [pool2d, pool2d_grad, pool2d_double_grad]


删除manual_signature

heavyrain-lzy · 2023-05-31T11:45:58Z

paddle/fluid/operators/generator/get_expected_kernel_func.cc

@@ -117,6 +131,31 @@ phi::KernelKey GetAssignExpectedKernelType(
      ctx.device_context().GetPlace());
 }

+phi::KernelKey GetPoolExpectedKernelType(


增加

phi::KernelKey GetPoolDoubleGradExpectedKernelType( const framework::ExecutionContext& ctx, const framework::OperatorWithKernel* op_ptr) { auto data_type = op_ptr->OperatorWithKernel::IndicateVarDataType(ctx, "grad_x@GRAD"); // NOTE(jiahongyu): Below codes originally enclosed by PADDLE_WITH_MKLDNN op_ptr->SetDnnFallback(!CanMKLDNNSupportPool(ctx)); // NOTE(jiahongyu) END: Above codes originally enclosed by PADDLE_WITH_MKLDNN return phi::KernelKey(data_type, ctx.GetPlace()); }

heavyrain-lzy · 2023-05-31T11:46:38Z

paddle/fluid/operators/generator/get_expected_kernel_func.cc

+}
+
+phi::KernelKey GetPoolGradExpectedKernelType(
+    const framework::ExecutionContext& ctx,


删除这个，逻辑跟GetPoolExpectedKernelType重复

heavyrain-lzy · 2023-05-31T11:47:52Z

paddle/phi/api/yaml/op_compat.yaml

+  get_expected_kernel_type :
+    pool2d : GetPoolExpectedKernelType
+    pool2d_grad : GetPoolGradExpectedKernelType
+    pool2d_double_grad : GetPoolExpectedKernelType


对应修改：

pool2d : GetPoolExpectedKernelType pool2d_grad : GetPoolExpectedKernelType pool2d_double_grad : GetPoolDoubleGradExpectedKernelType

…pool2d # Conflicts: # paddle/fluid/operators/generator/get_expected_kernel_func.cc

heavyrain-lzy · 2023-06-02T02:46:56Z

paddle/phi/api/yaml/op_compat.yaml

+  get_expected_kernel_type :
+    pool2d : GetPoolExpectedKernelType
+    pool2d_grad : GetPoolExpectedKernelType
+    pool2d_double_grad : GetPoolDoubleGradExpectedKernelType
  extra :
    attrs : [bool use_mkldnn = false, bool use_quantizer = false,


增加一个[bool use_cudnn = false]

heavyrain-lzy · 2023-06-02T02:47:40Z

paddle/phi/api/yaml/op_compat.yaml

+    {kernel_size : ksize}
+  get_expected_kernel_type :
+    pool3d : GetPoolExpectedKernelType
+    pool3d_grad : GetPoolExpectedKernelType
  extra :
    attrs : [bool use_mkldnn = false]


增加一个[bool use_cudnn = false]

…pool2d # Conflicts: # test/cpp/fluid/mkldnn/CMakeLists.txt

…pool2d # Conflicts: # paddle/phi/api/yaml/op_compat.yaml # paddle/phi/api/yaml/static_backward.yaml

heavyrain-lzy

rerun一下相关的CI

heavyrain-lzy

LGTM

[phi] autogen code pool2d

a9ba11a

paddle-bot bot added contributor External developers status: proposed labels May 23, 2023

gouzil changed the title ~~[static op generation] pool2d~~ [static op generation] pool2d, pool3d May 23, 2023

gouzil added 5 commits May 23, 2023 23:57

[phi] move poolop GetExpectedKernelType and GetKernelTypeForVar

01f4c46

[phi] fix move GetExpectedKernelType

7f7fabc

[phi] autogen code pool3d

fc3dbc7

[fluid] fix get_expected_kernel_func

dbda093

[fluid] fix get_expected_kernel_func

1399e2a

luotao1 assigned luotao1 and heavyrain-lzy May 24, 2023

gouzil added 3 commits May 24, 2023 11:12

[phi][yml] fix args

ddf15ba

[fluid] rm pool_op cmake

e81a123

[phi] fix GetKernelTypeForVar

94eabd3

heavyrain-lzy reviewed May 25, 2023

View reviewed changes

gouzil added 2 commits May 25, 2023 13:53

[phi] fix args; reduction legacy

a0399b1

[phi] fix pool2d_double_grad args

2099624

heavyrain-lzy reviewed May 25, 2023

View reviewed changes

gouzil added 2 commits May 25, 2023 14:55

[phi] fix pool3d args; reduction pool3d legacy; fix test

010194d

clean

6f615f0

heavyrain-lzy reviewed May 25, 2023

View reviewed changes

gouzil added 4 commits May 25, 2023 16:53

[phi] fix yaml add attrs ; [test] fix cmake

83ffe1d

[phi] fix pool3d args

19444d3

[phi] fix pool2d_double_grad args

b8ab81c

Merge branch 'develop' of github.com:gouzil/Paddle into autogen_code_…

0a743bf

…pool2d

heavyrain-lzy reviewed May 29, 2023

View reviewed changes

[phi] op_compat add keep_signature; RollBACK pool_sig

ec9cfe5

gouzil added 6 commits May 29, 2023 12:42

[phi] RollBACK output

d263253

[phi] try fix multiple definition

23a8700

[phi] fix keep_signature; RollBACK op_compat

791de7e

[phi] fix manual_signature

39f9ec1

Merge branch 'develop' of github.com:gouzil/Paddle into autogen_code_…

8c4810f

…pool2d # Conflicts: # paddle/phi/api/yaml/static_backward.yaml

Merge branches 'autogen_code_pool2d' and 'develop' of github.com:gouz…

b1d9b1b

…il/Paddle into autogen_code_pool2d # Conflicts: # paddle/phi/api/yaml/static_backward.yaml

heavyrain-lzy reviewed May 31, 2023

View reviewed changes

gouzil added 3 commits May 31, 2023 22:20

[phi]clean get_expected_kernel_func;[phi] rm compat;

b51b2ac

Merge branch 'develop' of github.com:gouzil/Paddle into autogen_code_…

e0baf77

…pool2d # Conflicts: # paddle/fluid/operators/generator/get_expected_kernel_func.cc

[phi] Fix Misdeletion

d4ce114

heavyrain-lzy reviewed Jun 2, 2023

View reviewed changes

gouzil added 3 commits June 2, 2023 11:54

Merge branch 'develop' of github.com:gouzil/Paddle into autogen_code_…

36f722f

…pool2d # Conflicts: # test/cpp/fluid/mkldnn/CMakeLists.txt

add use_cudnn

8b81c16

Merge branch 'develop' of github.com:gouzil/Paddle into autogen_code_…

fd262b2

…pool2d # Conflicts: # paddle/phi/api/yaml/op_compat.yaml # paddle/phi/api/yaml/static_backward.yaml

heavyrain-lzy reviewed Jun 5, 2023

View reviewed changes

heavyrain-lzy approved these changes Jun 5, 2023

View reviewed changes

luotao1 merged commit 3088164 into PaddlePaddle:develop Jun 5, 2023

luotao1 mentioned this pull request Jun 5, 2023

算子定义生成体系建设--静态图算子自动生成-第二期 #53267

Closed

heavyrain-lzy mentioned this pull request Jun 27, 2023

Fix bug poolop #54766

Merged

gouzil deleted the autogen_code_pool2d branch August 1, 2023 16:20

[static op generation] pool2d, pool3d #54070

[static op generation] pool2d, pool3d #54070

Conversation

gouzil commented May 23, 2023

PR types

PR changes

Description

paddle-bot bot commented May 23, 2023

paddle-bot bot commented May 23, 2023

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

gouzil commented May 25, 2023 • 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

gouzil commented May 31, 2023

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

heavyrain-lzy left a comment

Choose a reason for hiding this comment

heavyrain-lzy left a comment

Choose a reason for hiding this comment

gouzil commented May 25, 2023 •

edited

Loading