Fix

PaddlePaddle · Oct 25, 2024 · 0c10106 · 0c10106
1 parent 41503fd
commit 0c10106
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 94 deletions.
diff --git a/paddle/fluid/operators/collective/mp_allreduce_sum_op.cc b/paddle/fluid/operators/collective/mp_allreduce_sum_op.cc
diff --git a/paddle/phi/kernels/gpu/mp_allreduce_sum_kernel.cu b/paddle/phi/kernels/gpu/mp_allreduce_sum_kernel.cu
@@ -19,8 +19,6 @@ namespace phi {
 template <typename T, typename Context>
 void MpAllReduceSumKernel(const Context& dev_ctx,
                           const DenseTensor& x,
-                          int ring_id UNUSED,
-                          bool use_calc_stream UNUSED,
                           DenseTensor* out) {
   AllReduceKernel<T, Context>(
       dev_ctx, x, static_cast<int>(ReduceType::kRedSum), out);

diff --git a/paddle/phi/kernels/kps/mp_allreduce_sum_kernel.kps b/paddle/phi/kernels/kps/mp_allreduce_sum_kernel.kps
@@ -24,8 +24,6 @@ namespace phi {
 template <typename T, typename Context>
 void MpAllReduceSumKernel(const Context& dev_ctx,
                           const DenseTensor& x,
-                          int ring_id UNUSED,
-                          bool use_calc_stream UNUSED,
                           DenseTensor* out) {
   AllReduceKernel<T, Context>(
       dev_ctx, x, static_cast<int>(ReduceType::kRedSum), out);

diff --git a/paddle/phi/kernels/xpu/mp_allreduce_sum_kernel.cc b/paddle/phi/kernels/xpu/mp_allreduce_sum_kernel.cc
@@ -19,8 +19,6 @@ namespace phi {
 template <typename T, typename Context>
 void MpAllReduceSumKernel(const Context& dev_ctx,
                           const DenseTensor& x,
-                          int ring_id UNUSED,
-                          bool use_calc_stream UNUSED,
                           DenseTensor* out) {
   AllReduceKernel<T, Context>(
       dev_ctx, x, static_cast<int>(ReduceType::kRedSum), out);

diff --git a/paddle/phi/ops/yaml/inconsistent/static_backward.yaml b/paddle/phi/ops/yaml/inconsistent/static_backward.yaml
@@ -410,8 +410,8 @@
   composite : minimum_grad(x, y, out_grad, x_grad, y_grad)
 
 - backward_op : mp_allreduce_sum_grad
-  forward : mp_allreduce_sum(Tensor x, int ring_id = 0, bool use_calc_stream = false) -> Tensor(out)
-  args : (Tensor out_grad, int ring_id = 0, bool use_calc_stream = false)
+  forward : mp_allreduce_sum(Tensor x, int ring_id = 0) -> Tensor(out)
+  args : (Tensor out_grad, int ring_id = 0)
   output : Tensor(x_grad)
   invoke : c_identity(out_grad, ring_id, false, false)
 

diff --git a/paddle/phi/ops/yaml/inconsistent/static_ops.yaml b/paddle/phi/ops/yaml/inconsistent/static_ops.yaml
@@ -644,14 +644,14 @@
   interfaces : paddle::dialect::InferSymbolicShapeInterface
 
 - op : mp_allreduce_sum
-  args : (Tensor x, int ring_id = 0, bool use_calc_stream = false)
+  args : (Tensor x, int ring_id = 0)
   output : Tensor(out)
   infer_meta :
     func : AllReduceInferMeta
     param: [x]
   kernel :
     func : mp_allreduce_sum
-    param: [x, ring_id, use_calc_stream]
+    param: [x]
   backward: mp_allreduce_sum_grad
   inplace: (x -> out)