Rename ctx to dev_ctx in xpu/gather_nd_kernel.cc (#73076)

co63oc · web-flow · commit 451cd2267f32 · 2025-06-05T14:24:42.000+08:00
diff --git a/paddle/phi/kernels/xpu/gather_nd_kernel.cc b/paddle/phi/kernels/xpu/gather_nd_kernel.cc
@@ -20,12 +20,12 @@
 namespace phi {
 
 template <typename T, typename Context>
-void GatherNdKernel(const Context &ctx,
+void GatherNdKernel(const Context &dev_ctx,
                     const DenseTensor &x,
                     const DenseTensor &index,
                     DenseTensor *out) {
   using XPUType = typename XPUTypeTrait<T>::Type;
-  ctx.template Alloc<T>(out);
+  dev_ctx.template Alloc<T>(out);
 
   if (x.numel() == 0 || out->numel() == 0) return;
   if (index.dims()[0] == 0 && index.numel() == 0) return;
@@ -54,9 +54,9 @@ void GatherNdKernel(const Context &ctx,
             remain_numel,
             y_numel));
 
-    // int broadcast(Context* ctx, const T* x, T* y, const std::vector<int64_t>&
-    // xshape, const std::vector<int64_t>& yshape)
-    int r = xpu::broadcast(ctx.x_context(),
+    // int broadcast(Context* dev_ctx, const T* x, T* y, const
+    // std::vector<int64_t>& xshape, const std::vector<int64_t>& yshape)
+    int r = xpu::broadcast(dev_ctx.x_context(),
                            reinterpret_cast<const XPUType *>(x.data<T>()),
                            reinterpret_cast<XPUType *>(out->data<T>()),
                            {1, x_numel},
@@ -89,15 +89,15 @@ void GatherNdKernel(const Context &ctx,
 #ifndef PADDLE_WITH_XPU_PLUGIN
   if (index_type == DataType::INT32) {
     ret = xpu::gather_nd<XPUType, int>(
-        ctx.x_context(),
+        dev_ctx.x_context(),
         reinterpret_cast<const XPUType *>(x.data<T>()),
         index.data<int>(),
         reinterpret_cast<XPUType *>(out->data<T>()),
         x_vec,
         index_shape);
   } else {
     ret = xpu::gather_nd<XPUType, int64_t>(
-        ctx.x_context(),
+        dev_ctx.x_context(),
         reinterpret_cast<const XPUType *>(x.data<T>()),
         index.data<int64_t>(),
         reinterpret_cast<XPUType *>(out->data<T>()),
@@ -108,15 +108,15 @@ void GatherNdKernel(const Context &ctx,
 #else
   if (index_type == DataType::INT32) {
     ret = xpu::plugin::fast_gather_nd<XPUType, int>(
-        ctx.x_context(),
+        dev_ctx.x_context(),
         reinterpret_cast<const XPUType *>(x.data<T>()),
         index.data<int>(),
         reinterpret_cast<XPUType *>(out->data<T>()),
         x_vec,
         index_shape);
   } else {
     ret = xpu::plugin::fast_gather_nd<XPUType, int64_t>(
-        ctx.x_context(),
+        dev_ctx.x_context(),
         reinterpret_cast<const XPUType *>(x.data<T>()),
         index.data<int64_t>(),
         reinterpret_cast<XPUType *>(out->data<T>()),
diff --git a/paddle/phi/kernels/xpu/scatter_nd_add_kernel.cc b/paddle/phi/kernels/xpu/scatter_nd_add_kernel.cc
@@ -19,16 +19,16 @@
 
 namespace phi {
 template <typename T, typename Context>
-void ScatterNdAddKernel(const Context &ctx,
+void ScatterNdAddKernel(const Context &dev_ctx,
                         const DenseTensor &x,
                         const DenseTensor &index,
                         const DenseTensor &updates,
                         DenseTensor *out) {
   const T *x_ptr = x.data<T>();
   const T *updates_ptr = updates.data<T>();
 
-  T *out_ptr = ctx.template Alloc<T>(out);
-  int r = xpu::copy(ctx.x_context(), x_ptr, out_ptr, x.numel());
+  T *out_ptr = dev_ctx.template Alloc<T>(out);
+  int r = xpu::copy(dev_ctx.x_context(), x_ptr, out_ptr, x.numel());
   PADDLE_ENFORCE_XDNN_SUCCESS(r, "copy");
 
   if (updates.numel() == 0) return;
@@ -41,7 +41,7 @@ void ScatterNdAddKernel(const Context &ctx,
                                   index.dims(), 0, index_dims_size - 1));
 
     for (int64_t i = 0; i < loop_time; i++) {
-      r = xpu::broadcast_add<T>(ctx.x_context(),
+      r = xpu::broadcast_add<T>(dev_ctx.x_context(),
                                 updates_ptr + out->numel() * i,
                                 out_ptr,
                                 out_ptr,
@@ -77,7 +77,7 @@ void ScatterNdAddKernel(const Context &ctx,
   if (index_type == phi::DataType::INT32) {
     auto index_data = const_cast<int *>(index.data<int>());
     xpu::VectorParam<int> index_vec{nullptr, index_size, index_data};
-    r = xpu::scatter_nd<T, int>(ctx.x_context(),
+    r = xpu::scatter_nd<T, int>(dev_ctx.x_context(),
                                 nullptr,
                                 updates_ptr,
                                 out_ptr,
@@ -88,7 +88,7 @@ void ScatterNdAddKernel(const Context &ctx,
   } else {
     auto index_data = const_cast<int64_t *>(index.data<int64_t>());
     xpu::VectorParam<int64_t> index_vec{nullptr, index_size, index_data};
-    r = xpu::scatter_nd<T, int64_t>(ctx.x_context(),
+    r = xpu::scatter_nd<T, int64_t>(dev_ctx.x_context(),
                                     nullptr,
                                     updates_ptr,
                                     out_ptr,
