PaddlePaddle
diff --git a/‎paddle/fluid/operators/lod_reset_op.cc
Copy file name to clipboard
-32Lines changed: 0 additions & 32 deletions b/‎paddle/fluid/operators/lod_reset_op.cc
Copy file name to clipboard
-32Lines changed: 0 additions & 32 deletions
diff --git a/‎paddle/fluid/operators/lod_reset_op.cu
Copy file name to clipboard
-34Lines changed: 0 additions & 34 deletions b/‎paddle/fluid/operators/lod_reset_op.cu
Copy file name to clipboard
-34Lines changed: 0 additions & 34 deletions
diff --git a/‎paddle/fluid/operators/ops_signature/lod_reset_sig.cc
Copy file name to clipboard
+34Lines changed: 34 additions & 0 deletions b/‎paddle/fluid/operators/ops_signature/lod_reset_sig.cc
Copy file name to clipboard
+34Lines changed: 34 additions & 0 deletions
diff --git a/‎paddle/fluid/operators/ops_signature/reshape_sig.cc
Copy file name to clipboard
+23Lines changed: 23 additions & 0 deletions b/‎paddle/fluid/operators/ops_signature/reshape_sig.cc
Copy file name to clipboard
+23Lines changed: 23 additions & 0 deletions
diff --git a/‎paddle/fluid/operators/reshape_op.cc
Copy file name to clipboard
-60Lines changed: 0 additions & 60 deletions b/‎paddle/fluid/operators/reshape_op.cc
Copy file name to clipboard
-60Lines changed: 0 additions & 60 deletions
diff --git a/‎paddle/fluid/pir/dialect/op_generator/ops_api_gen.py
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎paddle/fluid/pir/dialect/op_generator/ops_api_gen.py
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎paddle/phi/core/compat/op_utils.h
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions b/‎paddle/phi/core/compat/op_utils.h
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions
diff --git a/‎paddle/phi/infermeta/backward.cc
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions b/‎paddle/phi/infermeta/backward.cc
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions
diff --git a/‎paddle/phi/infermeta/backward.h
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎paddle/phi/infermeta/backward.h
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎paddle/phi/infermeta/binary.cc
Copy file name to clipboard
+26Lines changed: 26 additions & 0 deletions b/‎paddle/phi/infermeta/binary.cc
Copy file name to clipboard
+26Lines changed: 26 additions & 0 deletions
@@ -246,35 +246,3 @@ REGISTER_OPERATOR(lod_reset_grad,
                   ops::LoDResetGradOp,
                   ops::LoDResetGradNoNeedBufferVarInferer,
                   ops::LoDResetGradInplaceInferer);
-
-PD_REGISTER_STRUCT_KERNEL(lod_reset,
-                          CPU,
-                          ALL_LAYOUT,
-                          ops::LoDResetKernel,
-                          phi::dtype::float16,
-                          float,
-                          double,
-                          int,
-                          int64_t) {}
-
-#ifdef PADDLE_WITH_XPU
-PD_REGISTER_STRUCT_KERNEL(lod_reset,
-                          XPU,
-                          ALL_LAYOUT,
-                          ops::LoDResetKernel,
-                          phi::dtype::float16,
-                          float,
-                          double,
-                          int,
-                          int64_t) {}
-#endif
-
-PD_REGISTER_STRUCT_KERNEL(lod_reset_grad,
-                          CPU,
-                          ALL_LAYOUT,
-                          ops::LoDResetGradKernel,
-                          phi::dtype::float16,
-                          float,
-                          double,
-                          int,
-                          int64_t) {}
@@ -0,0 +1,34 @@
+// Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "paddle/phi/core/compat/op_utils.h"
+
+namespace phi {
+
+KernelSignature LodResetOpArgumentMapping(const ArgumentMappingContext& ctx) {
+  return KernelSignature(
+      "lod_reset", {"X", "Y"}, {"target_lod", "append"}, {"Out"});
+}
+
+KernelSignature LodResetGradOpArgumentMapping(
+    const ArgumentMappingContext& ctx) {
+  return KernelSignature("lod_reset_grad",
+                         {"X", "Out@GRAD"},
+                         {"target_lod", "append"},
+                         {"X@GRAD"});
+}
+}  // namespace phi
+
+PD_REGISTER_ARG_MAPPING_FN(lod_reset, phi::LodResetOpArgumentMapping);
+PD_REGISTER_ARG_MAPPING_FN(lod_reset_grad, phi::LodResetGradOpArgumentMapping);
@@ -50,6 +50,22 @@ KernelSignature ReshapeDoubleGradOpArgumentMapping(
   return KernelSignature("reshape_double_grad", {"DOut", "DDX"}, {}, {"DDOut"});
 }
 
+KernelSignature LegacyReshapeOpArgumentMapping(
+    const ArgumentMappingContext& ctx) {
+  if (ctx.InputSize("ShapeTensor") > 0) {
+    return KernelSignature("reshape", {"X"}, {"ShapeTensor"}, {"Out"});
+  } else if (ctx.HasInput("Shape")) {
+    return KernelSignature("reshape", {"X"}, {"Shape"}, {"Out"});
+  } else {
+    return KernelSignature("reshape", {"X"}, {"shape"}, {"Out"});
+  }
+}
+
+KernelSignature LegacyReshapeGradOpArgumentMapping(
+    const ArgumentMappingContext& ctx UNUSED) {
+  return KernelSignature("reshape_grad", {"X", "Out@GRAD"}, {}, {"X@GRAD"});
+}
+
 }  // namespace phi
 
 PD_REGISTER_BASE_KERNEL_NAME(reshape2, reshape_with_xshape);
@@ -60,3 +76,10 @@ PD_REGISTER_ARG_MAPPING_FN(reshape2, phi::ReshapeOpArgumentMapping);
 PD_REGISTER_ARG_MAPPING_FN(reshape2_grad, phi::ReshapeGradOpArgumentMapping);
 PD_REGISTER_ARG_MAPPING_FN(reshape2_grad_grad,
                            phi::ReshapeDoubleGradOpArgumentMapping);
+
+PD_REGISTER_BASE_KERNEL_NAME(reshape, legacy_reshape);
+PD_REGISTER_BASE_KERNEL_NAME(reshape_grad, legacy_reshape_grad);
+
+PD_REGISTER_ARG_MAPPING_FN(reshape, phi::LegacyReshapeOpArgumentMapping);
+PD_REGISTER_ARG_MAPPING_FN(reshape_grad,
+                           phi::LegacyReshapeGradOpArgumentMapping);
@@ -714,29 +714,6 @@ REGISTER_OPERATOR(reshape_grad,
                   ops::ReshapeGradOp,
                   ops::ReshapeGradInplaceInferer);
 
-REGISTER_OP_CPU_KERNEL_FUNCTOR(reshape,
-                               float,
-                               ops::ReshapeKernel,
-                               double,
-                               ops::ReshapeKernel,
-                               int16_t,
-                               ops::ReshapeKernel,
-                               int,
-                               ops::ReshapeKernel,
-                               int64_t,
-                               ops::ReshapeKernel);
-REGISTER_OP_CPU_KERNEL_FUNCTOR(reshape_grad,
-                               float,
-                               ops::ReshapeGradKernel,
-                               double,
-                               ops::ReshapeGradKernel,
-                               int16_t,
-                               ops::ReshapeGradKernel,
-                               int,
-                               ops::ReshapeGradKernel,
-                               int64_t,
-                               ops::ReshapeGradKernel);
-
 REGISTER_OPERATOR(reshape2,
                   ops::Reshape2Op,
                   ops::Reshape2OpMaker,
@@ -760,40 +737,3 @@ REGISTER_OPERATOR(reshape2_grad_grad,
                   ops::ReshapeDoubleGradInplaceInferer,
                   ops::ReshapeDoubleGradOpNoNeedBufferVarInferer,
                   Reshape2DoubleGradInferShapeFunctor);
-
-#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
-REGISTER_OP_CUDA_KERNEL_FUNCTOR(reshape,
-                                float,
-                                ops::ReshapeKernel,
-                                double,
-                                ops::ReshapeKernel,
-                                int16_t,
-                                ops::ReshapeKernel,
-                                int,
-                                ops::ReshapeKernel,
-                                uint8_t,
-                                ops::ReshapeKernel,
-                                int64_t,
-                                ops::ReshapeKernel,
-                                phi::dtype::float16,
-                                ops::ReshapeKernel,
-                                phi::dtype::bfloat16,
-                                ops::ReshapeKernel);
-REGISTER_OP_CUDA_KERNEL_FUNCTOR(reshape_grad,
-                                float,
-                                ops::ReshapeGradKernel,
-                                double,
-                                ops::ReshapeGradKernel,
-                                int16_t,
-                                ops::ReshapeKernel,
-                                int,
-                                ops::ReshapeGradKernel,
-                                int64_t,
-                                ops::ReshapeGradKernel,
-                                uint8_t,
-                                ops::ReshapeGradKernel,
-                                phi::dtype::float16,
-                                ops::ReshapeGradKernel,
-                                phi::dtype::bfloat16,
-                                ops::ReshapeGradKernel);
-#endif
@@ -200,8 +200,13 @@
     'fusion_lstm',
     'fusion_seqpool_cvm_concat',
     'nce',
+    'legacy_reshape',
+    'legacy_reshape_',
+    'legacy_reshape_grad',
     'lookup_table',
     'lrn',
+    'lod_reset',
+    'lod_reset_',
     'max_pool2d_v2',
     'partial_sum',
     'pull_gpups_sparse',
 
@@ -55,8 +55,6 @@ static const std::unordered_set<std::string> deprecated_op_names(
      "prod_grad",
      "any",
      "all",
-     "reshape",
-     "reshape_grad",
      "expand_as",
      "expand_as_grad",
      "one_hot",
 
@@ -971,6 +971,19 @@ void GradSameWithXInferMeta(const MetaTensor& x,
   dx->share_lod(x);
 }
 
+void LodResetGradInferMeta(const MetaTensor& x,
+                           const MetaTensor& out_grad,
+                           const std::vector<int>& target_lod,
+                           bool append,
+                           MetaTensor* x_grad,
+                           MetaConfig config) {
+  if (x_grad != nullptr) {
+    x_grad->set_dims(x.dims());
+    x_grad->share_lod(x);
+    x_grad->set_dtype(x.dtype());
+  }
+}
+
 void LUGradInferMeta(const MetaTensor& x,
                      const MetaTensor& out,
                      const MetaTensor& pivots,
 
@@ -360,6 +360,13 @@ void GradSameWithXInferMeta(const MetaTensor& xshape,
                             const MetaTensor& out,
                             MetaTensor* dx);
 
+void LodResetGradInferMeta(const MetaTensor& x,
+                           const MetaTensor& out_grad,
+                           const std::vector<int>& target_lod,
+                           bool append,
+                           MetaTensor* x_grad,
+                           MetaConfig config = MetaConfig());
+
 void LUGradInferMeta(const MetaTensor& x,
                      const MetaTensor& out,
                      const MetaTensor& pivots,
 
@@ -2611,6 +2611,32 @@ void LimitByCapacityInferMeta(const MetaTensor& expert_count,
   out->set_dtype(expert_count.dtype());
 }
 
+void LodResetInferMeta(const MetaTensor& x,
+                       const MetaTensor& y,
+                       const std::vector<int>& target_lod,
+                       bool append,
+                       MetaTensor* out,
+                       MetaConfig config) {
+  if (y.initialized()) {
+    auto level0 = target_lod;
+    PADDLE_ENFORCE_GT(
+        static_cast<int64_t>(level0.size()),
+        0,
+        common::errors::InvalidArgument(
+            "If Input(Y) is not provided, the output's LoD should be "
+            "specified by attribute 'target_lod'. But the size of "
+            "'target_lod' is 0."));
+  } else if (config.is_runtime) {
+    out->share_lod(y);
+  }
+  if (append) {
+    out->share_lod(x);
+  }
+
+  out->set_dims(x.dims());
+  out->set_dtype(x.dtype());
+}
+
 void LogLossInferMeta(const MetaTensor& input,
                       const MetaTensor& label,
                       float epsilon,