Improve new executor static build #51149

From00 · 2023-03-03T06:37:33Z

PR types

Others

PR changes

Others

Describe

Pcard-67003

在PR #50670 新执行器全静态选kernel方案跑通Resnet50和Transformer模型的基础上，本PR对方案做进一步完善，通过在开启全静态选kernel的情况下修复大量的CI单测问题，达到跑通所有CI测试的程度。

部分暂未做修复的特殊场景当前通过退化回“半静态”选kernel处理，包括：

一些未迁移到phi的算子（当前可迁移的算子issue [PHI] Functionalization for Fluid kernel #52395 支持中，另有部分短期无法迁移的算子，包括控制流、cinn_launch、run_program等）
未正确注册输出参数信息的算子（issue Good first issue for phi kernel output definition #51292 支持中）
mkldnn（依赖于layout解耦onednn）
cuda graph（之前第一轮无法做capture，全静态选kernel后可以做capture，但需做代码适配）
用户自定义算子（需另出方案支持）

后续全静态选kernel将在进行更多模型测试之后默认开启。

paddle-bot · 2023-03-03T06:37: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.

… improve-new-executor-static-build

zyfncg · 2023-04-03T03:26:49Z

paddle/phi/core/tensor_utils.cc

+template void Copy(const DeviceContext& dev_ctx,
+                   const TensorArray& src,
+                   Place dst_place,
+                   bool blocking,
+                   TensorArray* dst);


需要实例化基类DeviceContext的接口吗？

实际调用是通过基类DeviceContext调用。
有部分Context实例化当前还没有场景使用到，这里接口的实例化对齐了TenosrBase的其它子类，对所有可能涉及的Context类型都统一做了实例化，后续有新需求时不用额外补充，避免零散化。

zyfncg · 2023-04-03T03:32:55Z

paddle/phi/kernels/cpu/eig_kernel.cc

-  kernel->OutputAt(1).SetDataType(phi::DataType::UNDEFINED);
+  const phi::DataType& dtype = kernel_key.dtype();
+  const phi::DataType& out_dtype =
+      IsComplexType(dtype) ? dtype : ToComplexType(dtype);


这里为什么没有使用phi::dtype::ToComplex？

zhiqiu

LGTM

zhwesky2010

lgtm for change tools/windows/run_unittests.sh

XieYunshen

LGTM
单测执行时间设置

XiaoguangHu01

LGTM

engineer1109 · 2023-04-06T07:49:52Z

paddle/phi/core/selected_rows.h
出错
void set_type(const DataType dtype) { impl_->set_type(dtype); }

[build] In file included from ../third_party/paddle/include/paddle/phi/core/selected_rows.h:24,
[build]                  from ../third_party/paddle/include/paddle/phi/core/tensor_utils.h:19,
[build]                  from ../third_party/paddle/include/paddle/phi/core/kernel_context.h:24,
[build]                  from ../third_party/paddle/include/paddle/phi/include/core.h:20,
[build]                  from ../third_party/paddle/include/paddle/phi/extension.h:9,
[build]                  from ../source/paddle_opencl_plugin/xdx_divide_kernel.cc:3:
[build] ../third_party/paddle/include/paddle/phi/core/selected_rows_impl.h: In member function ‘void phi::SelectedRowsImpl::set_type(phi::DataType)’:
[build] ../third_party/paddle/include/paddle/phi/core/selected_rows_impl.h:162:49: error: ‘class phi::DenseTensor’ has no member named ‘set_type’
[build]   162 |   void set_type(const DataType dtype) { value_->set_type(dtype); }

Custom Device插件模式下引用出错tensor_utils.h出错
set_type是PADDLE_WITH_CUSTOM_KERNEL下不可见的函数

void set_layout(const DataLayout layout) { value_->set_layout(layout); }

也一样

From00 · 2023-04-06T09:56:00Z

paddle/phi/core/selected_rows.h 出错 void set_type(const DataType dtype) { impl_->set_type(dtype); }

[build] In file included from ../third_party/paddle/include/paddle/phi/core/selected_rows.h:24,
[build]                  from ../third_party/paddle/include/paddle/phi/core/tensor_utils.h:19,
[build]                  from ../third_party/paddle/include/paddle/phi/core/kernel_context.h:24,
[build]                  from ../third_party/paddle/include/paddle/phi/include/core.h:20,
[build]                  from ../third_party/paddle/include/paddle/phi/extension.h:9,
[build]                  from ../source/paddle_opencl_plugin/xdx_divide_kernel.cc:3:
[build] ../third_party/paddle/include/paddle/phi/core/selected_rows_impl.h: In member function ‘void phi::SelectedRowsImpl::set_type(phi::DataType)’:
[build] ../third_party/paddle/include/paddle/phi/core/selected_rows_impl.h:162:49: error: ‘class phi::DenseTensor’ has no member named ‘set_type’
[build]   162 |   void set_type(const DataType dtype) { value_->set_type(dtype); }

Custom Device插件模式下引用出错tensor_utils.h出错 set_type是PADDLE_WITH_CUSTOM_KERNEL下不可见的函数

void set_layout(const DataLayout layout) { value_->set_layout(layout); }

也一样

@engineer1109 已提PR修复：#52591

Improve new executor static build

d9c535f

From00 added 28 commits March 5, 2023 15:24

Skip GC for static build

bf50fb7

Skip infershape for static build

091e96e

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

4d418b8

… improve-new-executor-static-build

Handle read_op

e2c53b6

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

432e143

… improve-new-executor-static-build

Add fused_attention to OpsWithFluidKernelNeedMoveToPhi

9bd46a1

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

6db222a

… improve-new-executor-static-build

Fix argsort typos

7c710bf

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

c6a115c

… improve-new-executor-static-build

Add sequence_pool to OpsWithFluidKernelNeedMoveToPhi

c0642ce

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

7669682

… improve-new-executor-static-build

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

696122d

… improve-new-executor-static-build

Fix skip share lod errors

3723697

Fix errors for adam

205906d

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

6840f5b

… improve-new-executor-static-build

Fix errors for eigvals, memcpy and fake_quantize

405ac93

Add static_build.cc

5004e56

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

74729bc

… improve-new-executor-static-build

Add black list

fc92a6a

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

e9ee0bc

… improve-new-executor-static-build

Fix CI errors

cafc9c6

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

46a4dc9

… improve-new-executor-static-build

Fix CI errors

c2ef1d3

Fix CI errors

002b338

Fix CI errors

f0891eb

Fix TensorArray

9132af3

Fix TensorArray

4fa2713

Add update_loss_scaling to OpsNeedSetOutputDtypeWhenRegisterPhiKernel

5e1fae3

From00 added 13 commits April 1, 2023 22:42

Fix typos

aa76cbb

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

1eb7fd8

… improve-new-executor-static-build

Add mkldnn UT

a56856d

Remove mkldnn test

b4a6077

Fix typos

62f0e7b

Fix dist test

63babbd

Fix typos

ed4b989

Fix CI errors

986ad7a

Fix CI errors

99a4add

Add UTs

4934047

Fix typos

4c76d00

Fix typos

10c47fb

Add sparse tests

d5a67ea

zyfncg reviewed Apr 3, 2023

View reviewed changes

ToComplexType -> ToComplex

b5fa80d

zhiqiu previously approved these changes Apr 3, 2023

View reviewed changes

Add test_matmul_op_static_build to disable_win_inference_test

606f016

From00 dismissed zhiqiu’s stale review via 606f016 April 3, 2023 09:37

zyfncg approved these changes Apr 4, 2023

View reviewed changes

zhwesky2010 reviewed Apr 4, 2023

View reviewed changes

zhwesky2010 approved these changes Apr 4, 2023

View reviewed changes

XieYunshen approved these changes Apr 4, 2023

View reviewed changes

XiaoguangHu01 approved these changes Apr 4, 2023

View reviewed changes

From00 merged commit 5bac67d into PaddlePaddle:develop Apr 4, 2023

From00 deleted the improve-new-executor-static-build branch April 5, 2023 09:03

engineer1109 mentioned this pull request Apr 6, 2023

[Custom Device]第三方插件DenseTensor头文件访问受限 #52583

Closed

From00 mentioned this pull request Apr 6, 2023

Isolate DenseTensor::set_type and DenseTensor::set_layout from header file #52591

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve new executor static build #51149

Improve new executor static build #51149

From00 commented Mar 3, 2023 •

edited

Loading

paddle-bot bot commented Mar 3, 2023

zyfncg Apr 3, 2023

From00 Apr 3, 2023

zyfncg Apr 3, 2023 •

edited

Loading

From00 Apr 3, 2023

zhiqiu left a comment

zhwesky2010 left a comment

XieYunshen left a comment

XiaoguangHu01 left a comment

engineer1109 commented Apr 6, 2023 •

edited

Loading

From00 commented Apr 6, 2023

Improve new executor static build #51149

Improve new executor static build #51149

Conversation

From00 commented Mar 3, 2023 • edited Loading

PR types

PR changes

Describe

paddle-bot bot commented Mar 3, 2023

zyfncg Apr 3, 2023

Choose a reason for hiding this comment

From00 Apr 3, 2023

Choose a reason for hiding this comment

zyfncg Apr 3, 2023 • edited Loading

Choose a reason for hiding this comment

From00 Apr 3, 2023

Choose a reason for hiding this comment

zhiqiu left a comment

Choose a reason for hiding this comment

zhwesky2010 left a comment

Choose a reason for hiding this comment

XieYunshen left a comment

Choose a reason for hiding this comment

XiaoguangHu01 left a comment

Choose a reason for hiding this comment

engineer1109 commented Apr 6, 2023 • edited Loading

From00 commented Apr 6, 2023

From00 commented Mar 3, 2023 •

edited

Loading

zyfncg Apr 3, 2023 •

edited

Loading

engineer1109 commented Apr 6, 2023 •

edited

Loading