Support multi-output feature for elementwise #38410

JamesLim-sy · 2021-12-23T14:54:03Z

PR types

New features

PR changes

OPs

Describe

特性
- 修改Elementwise_no_broadcast 内的核心实现，保证了elmenetwise可与PR38329中broadcast一致，支持多输出功能
- 统一修改了LaunchBroadcastElementwiseCudaKernel, LaunchSameDimsElementwiseCudaKernel, 和二者的上层封装LaunchElementwiseCudaKernel 的模板参数列表
- 配合 PR38044 验证了对于多输出的正确性，性能提升效果
case pytorch(kernel) 优化前优化前相比pytorch 优化后优化后相比pytorch

[50, 128, 1000], [128, 1000] 0.46865 0.24259 优于 (48.24%) 0.2379 优于(49.24%)
使用方法
- 引入paddle::framework::Array 作为输入的数据类型，并设计如下所示的functor

    template <typename InT, typename OutT>
    struct Functor {
      HOSTDEVICE paddle::framework::Array<OutT, 2>  operator()(InT x, InT y, InT z) {
        paddle::framework::Array<OutT, 2> outs;
        outs[0] = x + y * z;
        outs[1] = x / z;
        return outs;
      }
    };

调用LaunchBroadcastElementwiseCudaKernel时，模板参数由于<InT, OutT, functor> 转变为<InT, OutT, functor， NumOuts>，其中NumOuts用于表达functor的输出元素数量（本例为2），默认值为1故兼容现有的单个functor计算的写法

遗留项目
- 目前引入了模板参数NumOuts 用于实现多输出情形，但面对多输出情形Function_traits中的ReturnType 模板参数本身也是paddle::framework::Array<OutT, NumOuts> 的类型，一直想利用using Traits = paddle::platform::FunctionTraits 尝试获取NumOuts，暂时未能有效实现

paddle-bot-old · 2021-12-23T14:54:08Z

Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

… support_multi-output_for_elementwise

Xreki · 2021-12-27T15:01:42Z

paddle/pten/kernels/hybird/cuda/elementwise/elementwise_no_broadcast.cu.h

    int num,
    int data_offset,
    Functor func) {
  InT args[Arity][VecSize];
-  OutT result[VecSize];
+  OutType<OutT, NumOuts> result[VecSize];


看看是否有更合适的名字吧，OutType不是很贴切，或者叫PackedOutT，要么体现下ConditionalOutT？

修改成了ConditionalT<OutT, NumOuts>

ZzSean · 2021-12-28T13:22:41Z

paddle/pten/kernels/hybird/cuda/elementwise/elementwise_no_broadcast.cu.h

@@ -174,19 +207,39 @@ void LaunchSameDimsElementwiseCudaKernel(
                        "is %d, the arity of functor is %d.",
                        ins.size(),
                        kArity));
+  PADDLE_ENFORCE_EQ(outs->size(),


这里不需要像broadcast一样判断下ET的值吗

由于function_traits中这段的存在：

Paddle/paddle/pten/kernels/hybird/cuda/elementwise/elementwise_no_broadcast.cu.h

Lines 166 to 168 in 706d2c0

using Traits = paddle::platform::FunctionTraits<Functor>;

const int kArity =

Traits::has_pointer_args ? static_cast<int>(ET) : Traits::arity;

所以ET的值就被 kArity 取代了，后面就用kArity 做判断了

Xreki

LGTM

Xreki · 2021-12-28T15:40:39Z

paddle/fluid/operators/elementwise/elementwise_op_broadcast.cu.h

@@ -162,7 +162,8 @@ struct DimensionsTransform {
  }
 };

-template <ElementwiseType ET, typename InT, typename OutT, typename Functor>
+template <ElementwiseType ET, typename InT, typename OutT, typename Functor,


这个文件里面的DimensionsTransform是不是可以删掉了？

可以删除掉，我提个PR把这里删除吧，本来以为pten那边会删除掉

Xreki · 2021-12-28T15:44:13Z

paddle/pten/kernels/hybird/cuda/elementwise/elementwise_broadcast.cu.h

-  PADDLE_ENFORCE_EQ(kArity,
-                    2,
+  PADDLE_ENFORCE_LE(kArity,
+                    ElementwiseType::kTernary,


其实这里就应该用3，因为ElementwiseType::kTernary是个枚举类型，可能设置成别的值。

好的，和上一个删除DimensionsTransform的PR一同把这里修改掉

其实这里就应该用3，因为ElementwiseType::kTernary是个枚举类型，可能设置成别的值。

已经在PR38550中修改

first commit

ec7d2a3

JamesLim-sy added 2 commits December 27, 2021 12:07

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

b073486

… support_multi-output_for_elementwise

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

61426f1

… support_multi-output_for_elementwise

Xreki reviewed Dec 27, 2021

View reviewed changes

JamesLim-sy added 2 commits December 28, 2021 02:56

pass ctest of elementwise_div_grad

85ec155

pass ctest of multi-output op elementwise_div_grad

b085c89

JamesLim-sy requested a review from Xreki December 28, 2021 12:48

ZzSean reviewed Dec 28, 2021

View reviewed changes

Xreki approved these changes Dec 28, 2021

View reviewed changes

JamesLim-sy merged commit 48f061f into PaddlePaddle:develop Dec 28, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support multi-output feature for elementwise #38410

Support multi-output feature for elementwise #38410

JamesLim-sy commented Dec 23, 2021 •

edited

Loading

paddle-bot-old bot commented Dec 23, 2021

Xreki Dec 27, 2021

JamesLim-sy Dec 28, 2021 •

edited

Loading

ZzSean Dec 28, 2021

JamesLim-sy Dec 28, 2021

Xreki left a comment

Xreki Dec 28, 2021

JamesLim-sy Dec 28, 2021

Xreki Dec 28, 2021

JamesLim-sy Dec 28, 2021

JamesLim-sy Dec 29, 2021

	using Traits = paddle::platform::FunctionTraits<Functor>;
	const int kArity =
	Traits::has_pointer_args ? static_cast<int>(ET) : Traits::arity;

Support multi-output feature for elementwise #38410

Support multi-output feature for elementwise #38410

Conversation

JamesLim-sy commented Dec 23, 2021 • edited Loading

PR types

PR changes

Describe

paddle-bot-old bot commented Dec 23, 2021

Choose a reason for hiding this comment

JamesLim-sy Dec 28, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Xreki 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

JamesLim-sy commented Dec 23, 2021 •

edited

Loading

JamesLim-sy Dec 28, 2021 •

edited

Loading