Migrate unstack stack range unique op into Phi #40851

csy0225 · 2022-03-23T07:24:38Z

PR types

Function optimization

PR changes

OPs

Describe

[Phi] Migrate unstack stack range unique op into Phi

zyfncg · 2022-03-25T02:52:01Z

paddle/phi/core/utils/data_type.h

+#define _PhiForEachDataTypeTiny_(callback)                    \
+  _PhiForEachDataTypeHelper_(callback, int, DataType::INT32); \
+  _PhiForEachDataTypeHelper_(callback, int64_t, DataType::INT64);


如果只是遍历int类型的话，tiny的命名有些不太准确，建议使用如PhiForEachIntegerDataType之类的命名

这个和之前 paddle/fluid/framework/data_type.h 里面定义的tiny是保持一致的

zyfncg · 2022-03-25T02:57:28Z

paddle/phi/core/utils/data_type.h

+  } while (0)
+
+  _PhiForEachDataTypeTiny_(PhiVisitDataTypeCallbackTiny);
+#undef PhiVisitDataTypeCallbackTiny


对于没有检测到的输入类型，最好还是抛出异常提示

zyfncg · 2022-03-25T02:58:49Z

paddle/phi/infermeta/ternary.cc

+                        "The first dim of the shape of Input(Step) should "
+                        "be 1, but got %d",
+                        step_dims[0]));
+  out->set_dims({-1});


dtype在这里可以设置吗？

zyfncg · 2022-03-25T03:01:09Z

paddle/phi/infermeta/unary.cc

+    out->set_dims(out_dims);
+    if (return_inverse) {
+      index->set_dims(phi::make_ddim({x.dims()[axis_value]}));
+    }
+  }
+  if (return_index) {
+    indices->set_dims(phi::make_ddim({-1}));
+  }
+  if (return_counts) {
+    counts->set_dims(phi::make_ddim({-1}));
+  }


这些dtype可以设置下

这些dtype会等到kernel执行的时候，执行VisitDataType函数进行确定，否则需要把那一套逻辑搬进来。

zyfncg · 2022-03-25T03:11:08Z

paddle/phi/kernels/gpu/range_kernel.cu

+#include "paddle/phi/core/kernel_registry.h"
+#include "paddle/phi/kernels/copy_kernel.h"
+#include "paddle/phi/kernels/funcs/range_function.h"
+#include "paddle/phi/kernels/range_kernel.h"


range_kernel.h放在开头

zyfncg · 2022-03-25T03:18:16Z

paddle/phi/kernels/gpu/unstack_grad_kernel.cu

+#include "paddle/phi/backends/gpu/gpu_context.h"
+#include "paddle/phi/core/kernel_registry.h"
+#include "paddle/phi/kernels/impl/unstack_grad_kernel_impl.h"
+#include "paddle/phi/kernels/unstack_grad_kernel.h"


unstack_grad_kernel.h放在开头

zyfncg · 2022-03-25T03:18:51Z

paddle/phi/kernels/gpu/unstack_kernel.cu

+#include "paddle/phi/backends/gpu/gpu_context.h"
+#include "paddle/phi/core/kernel_registry.h"
+#include "paddle/phi/kernels/impl/unstack_kernel_impl.h"
+#include "paddle/phi/kernels/unstack_kernel.h"


unstack_kernel.h放在开头

zyfncg · 2022-03-25T03:25:27Z

paddle/phi/ops/compat/stack_sig.cc

+KernelSignature StackOpArgumentMapping(const ArgumentMappingContext& ctx) {
+  return KernelSignature("stack", {"X"}, {"axis"}, {"Y"});
+}


这个前向的ArgumentMapping比较常规，感觉使用默认的也能work，可以去掉试试

zyfncg · 2022-03-25T03:26:16Z

paddle/phi/ops/compat/unstack_sig.cc

+KernelSignature UnStackOpArgumentMapping(const ArgumentMappingContext& ctx) {
+  return KernelSignature("unstack", {"X"}, {"axis", "num"}, {"Y"});
+}


zyfncg · 2022-03-25T03:29:52Z

paddle/phi/ops/compat/unique_sig.cc

+namespace phi {
+
+KernelSignature UniqueOpArgumentMapping(const ArgumentMappingContext& ctx) {
+  return KernelSignature("unique_raw",


如果unique的单测覆盖率没通过的话，可以使用下面的方式选择下kernel

bool is_sorted = paddle::any_cast<bool>(ctx.Attr("is_sorted")); if (is_sorted) { reutrn "unique" } else { return "unique_raw" }

YuanRisheng

这几个算子有添加benchmark脚本吗

YuanRisheng · 2022-03-25T03:15:11Z

paddle/fluid/operators/range_op_xpu.cc

@@ -15,6 +15,7 @@ limitations under the License. */
 #ifdef PADDLE_WITH_XPU
 #include "paddle/fluid/operators/range_op.h"
 #include "paddle/fluid/framework/op_registry.h"
+#include "paddle/phi/kernels/funcs/math_function.h"


这个头文件有用到吗

YuanRisheng · 2022-03-25T03:19:36Z

paddle/phi/infermeta/ternary.cc

+                        "The first dim of the shape of Input(Step) should "
+                        "be 1, but got %d",
+                        step_dims[0]));
+  out->set_dims({-1});


这个out是否需要设置一下dtype

YuanRisheng · 2022-03-25T03:36:38Z

paddle/phi/kernels/gpu/range_kernel.cu

+#include "paddle/phi/core/kernel_registry.h"
+#include "paddle/phi/kernels/copy_kernel.h"
+#include "paddle/phi/kernels/funcs/range_function.h"
+#include "paddle/phi/kernels/range_kernel.h"


这个头文件可以放到最上边

chenwhql · 2022-03-25T03:47:49Z

paddle/phi/infermeta/unary.cc

+                                     x.dims().size()));
+    auto out_dims = x.dims();
+    out_dims[axis_value] = -1;
+    out->set_dims(out_dims);


需要set_dtype一下吗

这些dtype会等到kernel执行的时候，执行VisitDataType函数进行确定，否则需要把那一套逻辑搬进来。

chenwhql · 2022-03-25T03:48:52Z

paddle/phi/kernels/funcs/range_function.h

+#pragma once
+#include "paddle/phi/core/enforce.h"
+
+namespace phi {


这里要加funcs的namespace

chenwhql · 2022-03-25T03:48:58Z

paddle/phi/kernels/funcs/stack_functor.h

+
+#include "paddle/phi/kernels/funcs/for_range.h"
+
+namespace phi {


chenwhql · 2022-03-25T03:49:34Z

paddle/phi/kernels/gpu/range_kernel.cu

+#include "paddle/phi/core/kernel_registry.h"
+#include "paddle/phi/kernels/copy_kernel.h"
+#include "paddle/phi/kernels/funcs/range_function.h"
+#include "paddle/phi/kernels/range_kernel.h"


kernel头文件在前，空行隔开

csy0225 · 2022-03-25T09:31:50Z

这几个算子有添加benchmark脚本吗

有添加

XiaoguangHu01

LGTM

csy0225 force-pushed the unstack_range_stack_unique branch 2 times, most recently from 2e8109f to d60bd3d Compare March 23, 2022 11:36

zyfncg reviewed Mar 25, 2022

View reviewed changes

YuanRisheng reviewed Mar 25, 2022

View reviewed changes

chenwhql reviewed Mar 25, 2022

View reviewed changes

csy0225 force-pushed the unstack_range_stack_unique branch from e046cf1 to 9f02a9c Compare March 25, 2022 09:59

csy0225 force-pushed the unstack_range_stack_unique branch from 9f02a9c to 6706557 Compare March 25, 2022 11:22

csy0225 force-pushed the unstack_range_stack_unique branch from 6706557 to 0cbf5ad Compare March 25, 2022 11:37

csy0225 force-pushed the unstack_range_stack_unique branch from 0cbf5ad to faf37cb Compare March 25, 2022 13:11

csy0225 force-pushed the unstack_range_stack_unique branch from faf37cb to e311a91 Compare March 26, 2022 02:15

csy0225 force-pushed the unstack_range_stack_unique branch from 4ddcf0a to 76a9da2 Compare March 28, 2022 03:56

csy0225 force-pushed the unstack_range_stack_unique branch from 76a9da2 to 9914950 Compare March 28, 2022 04:45

csy0225 force-pushed the unstack_range_stack_unique branch from 9914950 to 3d70ba2 Compare March 28, 2022 04:59

csy0225 force-pushed the unstack_range_stack_unique branch from ab64ec6 to 3510cb8 Compare March 29, 2022 15:28

YuanRisheng previously approved these changes Mar 30, 2022

View reviewed changes

csy0225 dismissed YuanRisheng’s stale review via 1582a16 March 30, 2022 06:55

fix conflict

7ccdb10

csy0225 force-pushed the unstack_range_stack_unique branch from 1582a16 to 7ccdb10 Compare March 30, 2022 13:26

YuanRisheng approved these changes Mar 31, 2022

View reviewed changes

chenwhql approved these changes Mar 31, 2022

View reviewed changes

XiaoguangHu01 approved these changes Mar 31, 2022

View reviewed changes

chenwhql merged commit 74894cd into PaddlePaddle:develop Mar 31, 2022


		#include "paddle/phi/kernels/funcs/for_range.h"

		namespace phi {

Migrate unstack stack range unique op into Phi #40851

Migrate unstack stack range unique op into Phi #40851

Conversation

csy0225 commented Mar 23, 2022 • edited by lelelelelez Loading

PR types

PR changes

Describe

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

YuanRisheng left a 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

csy0225 commented Mar 25, 2022

XiaoguangHu01 left a comment

Choose a reason for hiding this comment

csy0225 commented Mar 23, 2022 •

edited by lelelelelez

Loading