CI测试不review[fluid_ops] Modify _legacy_C_ops.c_softmax_with_cross_entropy

paddle/fluid/pir/dialect/op_generator/ops_api_gen.py

@@ -98,7 +98,6 @@
     'c_reducescatter',
     'c_allreduce_min_',
     'c_allreduce_prod_',
-    'c_softmax_with_cross_entropy',
     'c_softmax_with_multi_label_cross_entropy',
     'distributed_fused_lamb_init',
     'distributed_fused_lamb_init_',

paddle/phi/ops/yaml/backward.yaml

@@ -308,6 +308,19 @@
     data_type : out_grad
   no_need_buffer : input
 
+- backward_op : c_softmax_with_cross_entropy_grad
+  forward: c_softmax_with_cross_entropy (Tensor logits, Tensor label,  int64_t ignore_index=-100, int ring_id=0, int rank=0, int nranks=0) -> Tensor(softmax), Tensor(loss)
+  args: (Tensor softmax, Tensor label, Tensor loss_grad,int64_t ignore_index=-100, int ring_id=0, int rank=0, int nranks=0)
+  output: Tensor(logits_grad)
+  infer_meta :
+    func: CSoftmaxWithCrossEntropyGradInferMeta
+    spmd_rule : CSoftmaxWithCrossEntropyGradSpmd
+    param: [softmax, label, loss_grad, ignore_index, rank, nranks]
+  kernel:
+    func: c_softmax_with_cross_entropy_grad
+    data_type: loss_grad
+    param: [softmax, label, loss_grad, ignore_index, rank, nranks]
+
 - backward_op : cast_grad
   forward : cast (Tensor x, DataType dtype) -> Tensor(out)
   args : (Tensor x, Tensor out_grad)

paddle/phi/ops/yaml/inconsistent/static_backward.yaml

@@ -107,19 +107,6 @@
     func : c_embedding_grad
   no_need_buffer : weight
 
-- backward_op : c_softmax_with_cross_entropy_grad
-  forward: c_softmax_with_cross_entropy (Tensor logits, Tensor label,  int64_t ignore_index=-100, int ring_id=0, int rank=0, int nranks=0) -> Tensor(softmax), Tensor(loss)
-  args: (Tensor softmax, Tensor label, Tensor loss_grad,int64_t ignore_index=-100, int ring_id=0, int rank=0, int nranks=0)
-  output: Tensor(logits_grad)
-  infer_meta :
-    func: CSoftmaxWithCrossEntropyGradInferMeta
-    spmd_rule : CSoftmaxWithCrossEntropyGradSpmd
-    param: [softmax, label, loss_grad, ignore_index, rank, nranks]
-  kernel:
-    func: c_softmax_with_cross_entropy_grad
-    data_type: loss_grad
-    param: [softmax, label, loss_grad, ignore_index, rank, nranks]
-
 - backward_op : c_softmax_with_multi_label_cross_entropy_grad
   forward: c_softmax_with_multi_label_cross_entropy (Tensor logits, Tensor label, Tensor smooth_weight, int64_t ignore_index=-100, bool sum_multi_label_loss=true, int ring_id=0, int rank=0, int nranks=0) -> Tensor(softmax), Tensor(loss)
   args: (Tensor softmax, Tensor label, Tensor smooth_weight, Tensor loss_grad, int64_t ignore_index=-100, bool sum_multi_label_loss=true, int ring_id=0, int rank=0, int nranks=0)

paddle/phi/ops/yaml/inconsistent/static_ops.yaml

@@ -988,19 +988,6 @@
   args : (Tensor i, Tensor x)
   output : Tensor[](out)
 
-- op: c_softmax_with_cross_entropy
-  args: (Tensor logits, Tensor label,  int64_t ignore_index=-100, int ring_id=0, int rank=0, int nranks=0)
-  output: Tensor(softmax), Tensor(loss)
-  infer_meta:
-    func : CSoftmaxWithCrossEntropyInferMeta
-    spmd_rule : CSoftmaxWithCrossEntropyInferSpmd
-    param: [logits, label, ignore_index, rank, nranks]
-  kernel:
-    func: c_softmax_with_cross_entropy
-    data_type : logits
-    param: [logits, label, ignore_index, rank, nranks]
-  backward: c_softmax_with_cross_entropy_grad
-
 - op: c_softmax_with_multi_label_cross_entropy
   args: (Tensor logits, Tensor label, Tensor smooth_weight, int64_t ignore_index=-100, bool sum_multi_label_loss=true, int ring_id=0, int rank=0, int nranks=0)
   output: Tensor(softmax), Tensor(loss)

paddle/phi/ops/yaml/legacy/backward_exclude.yaml

@@ -4,6 +4,7 @@
 
 - amax_grad
 - amin_grad
+- c_softmax_with_cross_entropy_grad
 - cast_grad
 - conv2d_transpose_double_grad
 - conv2d_transpose_grad

paddle/phi/ops/yaml/legacy/ops_exclude.yaml

@@ -19,6 +19,7 @@
 - c_concat
 - c_identity
 - c_reduce_sum
+- c_softmax_with_cross_entropy
 - c_split
 - cast
 - conv2d_transpose

paddle/phi/ops/yaml/ops.yaml

@@ -849,6 +849,19 @@
     func : c_scatter
   traits : paddle::dialect::ForwardOnlyTrait
 
+- op : c_softmax_with_cross_entropy
+  args: (Tensor logits, Tensor label,  int64_t ignore_index=-100, int ring_id=0, int rank=0, int nranks=0)
+  output: Tensor(softmax), Tensor(loss)
+  infer_meta:
+    func : CSoftmaxWithCrossEntropyInferMeta
+    spmd_rule : CSoftmaxWithCrossEntropyInferSpmd
+    param: [logits, label, ignore_index, rank, nranks]
+  kernel:
+    func: c_softmax_with_cross_entropy
+    data_type : logits
+    param: [logits, label, ignore_index, rank, nranks]
+  backward: c_softmax_with_cross_entropy_grad
+
 - op : c_split
   args : (Tensor x, int rank = 0, int nranks = 1, int ring_id = 0, bool use_model_parallel = true)
   output : Tensor(out)

python/paddle/distributed/fleet/layers/mpu/mp_ops.py

@@ -440,17 +440,8 @@ def _c_softmax_with_cross_entropy(
         )
 
     if in_dynamic_mode():
-        softmax, loss = _legacy_C_ops.c_softmax_with_cross_entropy(
-            logits,
-            label,
-            'ring_id',
-            ring_id,
-            'rank',
-            rank,
-            'nranks',
-            nranks,
-            'ignore_index',
-            ignore_index,
+        softmax, loss = _C_ops.c_softmax_with_cross_entropy(
+            logits, label, ignore_index, ring_id, rank, nranks
         )
         if not return_softmax:
             return loss