[XPU] fix index's datatype, using int64 instead of int, part 2 (g-z) #72519

cqulilujia · 2025-04-27T12:01:29Z

PR Category

Custom Device

PR Types

Bug fixes

Description

Fix index's datatype, using int64 instead of int, part 2 (g-z)

paddle-bot · 2025-04-27T12:01:34Z

你的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.

cqulilujia · 2025-05-12T06:07:00Z

cmake/external/xpu.cmake

@@ -29,6 +29,8 @@ set(XPU_XBLAS_LIB_NAME "libxpu_blas.so")
 set(XPU_XFA_LIB_NAME "libxpu_flash_attention.so")
 set(XPU_XPUDNN_LIB_NAME "libxpu_dnn.so")
 set(XPU_FFT_LIB_NAME "libcufft.so")
+# Avoid deprecated int32 apis:
+add_compile_definitions(XPUAPI_NOT_INCLUDE_DEPRECATED)


不再include int32老接口，参阅内部卡片xpu-paddlepaddle-864

cqulilujia · 2025-05-12T06:45:30Z

paddle/phi/backends/xpu/xpu3_op_list.cc

@@ -1075,6 +1075,7 @@ XPUOpMap& get_kl3_ops() {
                     phi::DataType::BFLOAT16})},
      {"pow2_decay_with_linear_warmup", XPUKernelSet({phi::DataType::FLOAT32})},
      {"prior_box", XPUKernelSet({phi::DataType::FLOAT32})},
+      {"prelu", XPUKernelSet({phi::DataType::FLOAT32, phi::DataType::FLOAT16})},


顺手绑了一个之前遗留的算子

dynamicheart · 2025-05-12T07:19:43Z

paddle/phi/kernels/impl/unfold_grad_kernel_impl.h

@@ -39,13 +39,13 @@ void UnfoldGradKernel(const Context& ctx,
  const auto& x_dims = x_grad->dims();
  const int batch_size = static_cast<int>(x_dims[0]);

-  int out_height = phi::funcs::CalcOutputSize(x_dims[2],
+  int out_height = phi::funcs::CalcOutputSize(static_cast<int>(x_dims[2]),


为什么这里要static_cast?

paddle/phi/kernels/funcs/unfold_functor.h中对函数CalcOutputSize新增了模板T，能够同时支持int和int64，修改之后再调用时必须将入参统一为int或int64。这里x_dims[2]是int64类型，而kernel_sizes[0]等是int类型

dynamicheart · 2025-05-12T07:20:16Z

paddle/phi/kernels/xpu/flash_attn_utils.h

 }  // namespace phi
-#endif
+#


这个是不是有点问题

收到，这里漏掉了。单独的#不会影响编译，后续PR一起带上修复

dynamicheart · 2025-05-12T07:29:39Z

paddle/phi/kernels/xpu/rnn_grad_kernel.cc

@@ -273,14 +281,17 @@ void RnnGradKernel(const Context& dev_ctx,
                                          hidden_size,
                                          seq_len,
                                          seq_len_tensor,
+                                          1,


这为什么突然+1

bilstm_grad的int接口是老接口，在deprecated.h中。int64接口为新接口，与老接口相比多了一个参数，这里添加1参考了api接口中int调用int64接口的逻辑。

dynamicheart · 2025-05-12T07:32:00Z

paddle/phi/kernels/xpu/top_k_kernel.cc

+    const int64_t col = in_dims[in_dims.size() - 1];
+
+    int r =
+        xpu::sorted_topk<XPUType>(dev_ctx.x_context(),


topk index int64_t版本走了不一样的分支，因此可能需要联系算子加固

算子已加固，参考内部卡片API-BR-394中链接的PR

cqulilujia · 2025-05-12T07:38:21Z

paddle/phi/kernels/impl/unfold_grad_kernel_impl.h

@@ -39,13 +39,13 @@ void UnfoldGradKernel(const Context& ctx,
  const auto& x_dims = x_grad->dims();
  const int batch_size = static_cast<int>(x_dims[0]);

-  int out_height = phi::funcs::CalcOutputSize(x_dims[2],
+  int out_height = phi::funcs::CalcOutputSize(static_cast<int>(x_dims[2]),


paddle/phi/kernels/funcs/unfold_functor.h中对函数CalcOutputSize新增了模板T，能够同时支持int和int64，修改之后再调用时必须将入参统一为int或int64。这里x_dims[2]是int64类型，而kernel_sizes[0]等是int类型

cqulilujia · 2025-05-12T07:43:50Z

paddle/phi/kernels/xpu/flash_attn_utils.h

 }  // namespace phi
-#endif
+#


收到，这里漏掉了。单独的#不会影响编译，后续PR一起带上修复

cqulilujia · 2025-05-12T07:46:42Z

paddle/phi/kernels/xpu/rnn_grad_kernel.cc

@@ -273,14 +281,17 @@ void RnnGradKernel(const Context& dev_ctx,
                                          hidden_size,
                                          seq_len,
                                          seq_len_tensor,
+                                          1,


bilstm_grad的int接口是老接口，在deprecated.h中。int64接口为新接口，与老接口相比多了一个参数，这里添加1参考了api接口中int调用int64接口的逻辑。

cqulilujia · 2025-05-12T07:47:22Z

paddle/phi/kernels/xpu/rnn_grad_kernel.cc

                                          nullptr,
                                          nullptr,
                                          nullptr,
                                          nullptr,
                                          nullptr,
                                          nullptr,
                                          i_f_g_o,
-                                          c);
+                                          c,


同理，两个xpu::Activation_t类型的参数也是新旧接口的差异

cqulilujia · 2025-05-12T07:50:47Z

paddle/phi/kernels/xpu/top_k_kernel.cc

+    const int64_t col = in_dims[in_dims.size() - 1];
+
+    int r =
+        xpu::sorted_topk<XPUType>(dev_ctx.x_context(),


算子已加固，参考内部卡片API-BR-394中链接的PR

QingshuChen

LGTM

zhangbo9674

LGTM for error message

cqulilujia · 2025-05-13T03:12:04Z

/re-run approval

…addlePaddle#72519)

paddle-bot bot added the XPU label Apr 27, 2025

cqulilujia force-pushed the int64_part2 branch from c17e9d7 to 38d280b Compare May 7, 2025 06:01

cqulilujia closed this May 8, 2025

cqulilujia force-pushed the int64_part2 branch from 38d280b to cefc437 Compare May 8, 2025 10:04

cqulilujia reopened this May 8, 2025

cqulilujia force-pushed the int64_part2 branch from ba9c6e2 to 48c699b Compare May 8, 2025 10:30

cqulilujia changed the title ~~[XPU] fix index's datatype, using int64 instead of int, part 2 (g-n)~~ [XPU] fix index's datatype, using int64 instead of int, part 2 (g-z) May 8, 2025

cqulilujia force-pushed the int64_part2 branch 3 times, most recently from e776275 to 9faff6b Compare May 9, 2025 09:43

[XPU] fix index's datatype, using int64 instead of int, part 2 (g-z)

deaf5cc

cqulilujia force-pushed the int64_part2 branch from 9faff6b to deaf5cc Compare May 9, 2025 10:32

cqulilujia commented May 12, 2025

View reviewed changes

dynamicheart reviewed May 12, 2025

View reviewed changes

cqulilujia commented May 12, 2025

View reviewed changes

dynamicheart approved these changes May 12, 2025

View reviewed changes

QingshuChen approved these changes May 13, 2025

View reviewed changes

zhangbo9674 approved these changes May 13, 2025

View reviewed changes

raindrops2sea approved these changes May 13, 2025

View reviewed changes

QingshuChen merged commit 331d556 into PaddlePaddle:develop May 13, 2025
44 of 48 checks passed

GITD245 pushed a commit to GITD245/Paddle that referenced this pull request May 14, 2025

[XPU] fix index's datatype, using int64 instead of int, part 2 (g-z) (P…

a1eff49

…addlePaddle#72519)

cqulilujia mentioned this pull request May 16, 2025

[XPU] fix int64 index bug of masked_select #72762

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[XPU] fix index's datatype, using int64 instead of int, part 2 (g-z) #72519

[XPU] fix index's datatype, using int64 instead of int, part 2 (g-z) #72519

cqulilujia commented Apr 27, 2025 •

edited

Loading

paddle-bot bot commented Apr 27, 2025

cqulilujia May 12, 2025

cqulilujia May 12, 2025

dynamicheart May 12, 2025

cqulilujia May 12, 2025

dynamicheart May 12, 2025

cqulilujia May 12, 2025

dynamicheart May 12, 2025

cqulilujia May 12, 2025

dynamicheart May 12, 2025

cqulilujia May 12, 2025

cqulilujia May 12, 2025

cqulilujia May 12, 2025

cqulilujia May 12, 2025

cqulilujia May 12, 2025

cqulilujia May 12, 2025

QingshuChen left a comment

zhangbo9674 left a comment

cqulilujia commented May 13, 2025

[XPU] fix index's datatype, using int64 instead of int, part 2 (g-z) #72519

[XPU] fix index's datatype, using int64 instead of int, part 2 (g-z) #72519

Conversation

cqulilujia commented Apr 27, 2025 • edited Loading

PR Category

PR Types

Description

paddle-bot bot commented Apr 27, 2025

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

QingshuChen left a comment

Choose a reason for hiding this comment

zhangbo9674 left a comment

Choose a reason for hiding this comment

cqulilujia commented May 13, 2025

cqulilujia commented Apr 27, 2025 •

edited

Loading