Modify python

PaddlePaddle · Jun 17, 2022 · c558d14 · c558d14
1 parent 468847f
commit c558d14
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 509 deletions.
diff --git a/paddle/fluid/operators/soft_margin_loss_op.cc b/paddle/fluid/operators/soft_margin_loss_op.cc
diff --git a/paddle/phi/infermeta/binary.cc b/paddle/phi/infermeta/binary.cc
@@ -1838,46 +1838,6 @@ void SigmoidCrossEntropyWithLogitsInferMeta(const MetaTensor& x,
   out->share_lod(x);
 }
 
-void SoftMarginLossInferMeta(const MetaTensor& input,
-                             const MetaTensor& label,
-                             MetaTensor* out,
-                             MetaConfig config) {
-  auto input_dims = input.dims();
-  auto label_dims = label.dims();
-
-  int rank = input_dims.size();
-  PADDLE_ENFORCE_EQ(rank,
-                    label_dims.size(),
-                    phi::errors::InvalidArgument(
-                        "Input(X) and Input(Label) shall have the same rank."
-                        "But received: the rank of Input(X) is [%d], "
-                        "the rank of Input(Label) is [%d].",
-                        rank,
-                        label_dims.size()));
-
-  bool check = true;
-
-  if ((!config.is_runtime) &&
-      (phi::product(input_dims) <= 0 || phi::product(label_dims) <= 0)) {
-    check = false;
-  }
-
-  if (check) {
-    PADDLE_ENFORCE_EQ(input_dims,
-                      label_dims,
-                      phi::errors::InvalidArgument(
-                          "Input(X) and Input(Label) shall have the same "
-                          "shape. But received: the shape of Input(X) is "
-                          "[%s], the shape of Input(Label) is [%s].",
-                          input_dims,
-                          label_dims));
-  }
-
-  out->set_dims(input_dims);
-  out->set_dtype(input.dtype());
-  out->share_lod(input);
-}
-
 void TakeAlongAxisInferMeta(const MetaTensor& x,
                             const MetaTensor& index,
                             int axis,

diff --git a/paddle/phi/infermeta/binary.h b/paddle/phi/infermeta/binary.h
@@ -270,11 +270,6 @@ void SigmoidCrossEntropyWithLogitsInferMeta(const MetaTensor& x,
                                             MetaTensor* out,
                                             MetaConfig config = MetaConfig());
 
-void SoftMarginLossInferMeta(const MetaTensor& input,
-                             const MetaTensor& label,
-                             MetaTensor* out,
-                             MetaConfig config = MetaConfig());
-
 void TakeAlongAxisInferMeta(const MetaTensor& x,
                             const MetaTensor& index,
                             int axis,

diff --git a/paddle/phi/kernels/cpu/soft_margin_loss_grad_kernel.cc b/paddle/phi/kernels/cpu/soft_margin_loss_grad_kernel.cc
diff --git a/paddle/phi/kernels/cpu/soft_margin_loss_kernel.cc b/paddle/phi/kernels/cpu/soft_margin_loss_kernel.cc
diff --git a/paddle/phi/kernels/gpu/soft_margin_loss_grad_kernel.cu b/paddle/phi/kernels/gpu/soft_margin_loss_grad_kernel.cu