PaddlePaddle
diff --git a/‎paddle/fluid/operators/assign_op.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/operators/assign_op.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/operators/beam_search_decode_op.h
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions b/‎paddle/fluid/operators/beam_search_decode_op.h
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions
diff --git a/‎paddle/fluid/operators/beam_search_decode_op_def.h
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions b/‎paddle/fluid/operators/beam_search_decode_op_def.h
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions
diff --git a/‎paddle/fluid/operators/beam_search_decode_op_xpu.h
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎paddle/fluid/operators/beam_search_decode_op_xpu.h
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎paddle/fluid/operators/collective/recv_v2_op.cu.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/operators/collective/recv_v2_op.cu.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/operators/collective/send_v2_op.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/operators/collective/send_v2_op.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/operators/collective/send_v2_op.cu.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎paddle/fluid/operators/collective/send_v2_op.cu.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎paddle/fluid/operators/controlflow/control_flow_op_helper.h
Copy file name to clipboard
+5-6Lines changed: 5 additions & 6 deletions b/‎paddle/fluid/operators/controlflow/control_flow_op_helper.h
Copy file name to clipboard
+5-6Lines changed: 5 additions & 6 deletions
diff --git a/‎paddle/fluid/operators/controlflow/fetch_op.cc
Copy file name to clipboard
+3-4Lines changed: 3 additions & 4 deletions b/‎paddle/fluid/operators/controlflow/fetch_op.cc
Copy file name to clipboard
+3-4Lines changed: 3 additions & 4 deletions
diff --git a/‎paddle/fluid/operators/controlflow/fetch_v2_op.cc
Copy file name to clipboard
+4-5Lines changed: 4 additions & 5 deletions b/‎paddle/fluid/operators/controlflow/fetch_v2_op.cc
Copy file name to clipboard
+4-5Lines changed: 4 additions & 5 deletions
@@ -41,8 +41,8 @@ class AssignFunctor {
     copy_tensor(lod_tensor, &out_tensor);
   }
 
-  void operator()(const framework::LoDTensorArray &array) const {
-    auto &out_array = *out_->GetMutable<framework::LoDTensorArray>();
+  void operator()(const phi::TensorArray &array) const {
+    auto &out_array = *out_->GetMutable<phi::TensorArray>();
     out_array.resize(array.size());
     for (size_t i = 0; i < array.size(); ++i) {
       copy_tensor(array[i], &out_array[i]);
 
@@ -21,8 +21,8 @@ namespace paddle {
 namespace operators {
 
 struct BeamSearchDecodeFunctor {
-  BeamSearchDecodeFunctor(const LoDTensorArray& step_ids,
-                          const LoDTensorArray& step_scores,
+  BeamSearchDecodeFunctor(const phi::TensorArray& step_ids,
+                          const phi::TensorArray& step_scores,
                           phi::DenseTensor* id_tensor,
                           phi::DenseTensor* score_tensor,
                           size_t beam_size,
@@ -105,10 +105,10 @@ struct BeamSearchDecodeFunctor {
   // TODO(Superjomn) Here might result serious performance issue in the
   // concurrency
   // scenarios.
-  const LoDTensorArray& step_ids_origin_;
-  const LoDTensorArray& step_scores_origin_;
-  LoDTensorArray step_ids_ = LoDTensorArray();
-  LoDTensorArray step_scores_ = LoDTensorArray();
+  const phi::TensorArray& step_ids_origin_;
+  const phi::TensorArray& step_scores_origin_;
+  phi::TensorArray step_ids_ = phi::TensorArray();
+  phi::TensorArray step_scores_ = phi::TensorArray();
   phi::DenseTensor* id_tensor_;
   phi::DenseTensor* score_tensor_;
 };
 
@@ -23,7 +23,7 @@ limitations under the License. */
 
 namespace paddle {
 namespace operators {
-using LoDTensorArray = framework::LoDTensorArray;
+using TensorArray = phi::TensorArray;
 
 // all the lod have 2 levels.
 // The first is source level, the second is sentence level.
@@ -67,10 +67,10 @@ struct BeamSearchDecoder {
 
   /**
    * Gather the hypotheses for each source sentence by backtrace though the
-   * LoDTensorArray step_ids whose lods reserve the path in the tree.
+   * phi::TensorArray step_ids whose lods reserve the path in the tree.
    */
-  void Backtrace(const LoDTensorArray& step_ids,
-                 const LoDTensorArray& step_scores,
+  void Backtrace(const phi::TensorArray& step_ids,
+                 const phi::TensorArray& step_scores,
                  phi::DenseTensor* id_tensor,
                  phi::DenseTensor* score_tensor) const;
 
@@ -154,8 +154,8 @@ void BeamSearchDecoder<T>::ConvertSentenceVectorToLodTensor(
 }
 
 template <typename T>
-void BeamSearchDecoder<T>::Backtrace(const LoDTensorArray& step_ids,
-                                     const LoDTensorArray& step_scores,
+void BeamSearchDecoder<T>::Backtrace(const phi::TensorArray& step_ids,
+                                     const phi::TensorArray& step_scores,
                                      phi::DenseTensor* id_tensor,
                                      phi::DenseTensor* score_tensor) const {
   PADDLE_ENFORCE_NE(
 
@@ -94,8 +94,8 @@ const int CopyTensorByType(const phi::DenseTensor& srcTensor,
 }
 
 struct BeamSearchDecodeXPUFunctor {
-  BeamSearchDecodeXPUFunctor(const LoDTensorArray& step_ids,
-                             const LoDTensorArray& step_scores,
+  BeamSearchDecodeXPUFunctor(const phi::TensorArray& step_ids,
+                             const phi::TensorArray& step_scores,
                              phi::DenseTensor* id_tensor,
                              phi::DenseTensor* score_tensor,
                              size_t beam_size,
@@ -161,8 +161,8 @@ struct BeamSearchDecodeXPUFunctor {
   // TODO(Superjomn) Here might result serious performance issue in the
   // concurrency
   // scenarios.
-  LoDTensorArray step_ids_ = LoDTensorArray();
-  LoDTensorArray step_scores_ = LoDTensorArray();
+  phi::TensorArray step_ids_ = phi::TensorArray();
+  phi::TensorArray step_scores_ = phi::TensorArray();
   phi::DenseTensor* id_tensor_;
   phi::DenseTensor* score_tensor_;
 };
 
@@ -217,13 +217,13 @@ class RecvOpV2CUDAKernel : public framework::OpKernel<T> {
     ncclDataType_t dtype = platform::ToNCCLDataType(type);
 
     auto *out_var = ctx.OutputVar("Out");
-    if (out_var->IsType<framework::LoDTensorArray>()) {
+    if (out_var->IsType<phi::TensorArray>()) {
       PADDLE_ENFORCE_EQ(
           dynamic_shape,
           false,
           common::errors::InvalidArgument("Dynamic shape for send/recv not "
                                           "support LoDTensorArray for now."));
-      auto out_array = out_var->GetMutable<framework::LoDTensorArray>();
+      auto out_array = out_var->GetMutable<phi::TensorArray>();
       for (size_t idx = 0; idx < out_array->size(); ++idx) {
         VLOG(3) << "LodTensorArray: idx(" << idx << ")";
         auto out = &out_array->at(idx);
 
@@ -40,8 +40,8 @@ class SendOpV2 : public framework::OperatorWithKernel {
   phi::KernelKey GetExpectedKernelType(
       const framework::ExecutionContext& ctx) const override {
     const framework::Variable* var = ctx.InputVar("X");
-    if (var->IsType<framework::LoDTensorArray>()) {
-      auto t_arr = var->Get<framework::LoDTensorArray>();
+    if (var->IsType<phi::TensorArray>()) {
+      auto t_arr = var->Get<phi::TensorArray>();
       // NOTE(sandyhouse): Support an empty tensor array as Input.
       // And set the kernel type is float.
       if (t_arr.empty()) {
 
@@ -205,13 +205,13 @@ class SendOpV2CUDAKernel : public framework::OpKernel<T> {
     }
 
     auto* x_var = ctx.InputVar("X");
-    if (x_var->IsType<framework::LoDTensorArray>()) {
+    if (x_var->IsType<phi::TensorArray>()) {
       PADDLE_ENFORCE_EQ(
           dynamic_shape,
           false,
           common::errors::InvalidArgument("Dynamic shape for send/recv not "
-                                          "support LoDTensorArray for now."));
-      auto& x_array = x_var->Get<framework::LoDTensorArray>();
+                                          "support phi::TensorArray for now."));
+      auto& x_array = x_var->Get<phi::TensorArray>();
       for (size_t idx = 0; idx < x_array.size(); idx++) {
         VLOG(3) << "LodTensorArray: idx(" << idx << ")";
         auto& x = x_array.at(idx);
 
@@ -105,17 +105,16 @@ static void AssignZeroToParentScope(
                                 scope,
                                 input_var->Get<phi::DenseTensor>(),
                                 outside_var->GetMutable<phi::DenseTensor>());
-    } else if (input_var->IsType<framework::LoDTensorArray>()) {
-      PADDLE_ENFORCE_EQ(outside_var->IsType<framework::LoDTensorArray>(),
+    } else if (input_var->IsType<phi::TensorArray>()) {
+      PADDLE_ENFORCE_EQ(outside_var->IsType<phi::TensorArray>(),
                         true,
                         common::errors::InvalidArgument(
-                            "Type of outside_var %s is NOT LoDTensorArray, "
+                            "Type of outside_var %s is NOT phi::TensorArray, "
                             "which doesn't match input_var %s.",
                             outside_grad_name,
                             input_name));
-      const auto &input_tensors = input_var->Get<framework::LoDTensorArray>();
-      auto *outside_tensors =
-          outside_var->GetMutable<framework::LoDTensorArray>();
+      const auto &input_tensors = input_var->Get<phi::TensorArray>();
+      auto *outside_tensors = outside_var->GetMutable<phi::TensorArray>();
       if (outside_tensors->empty()) {
         outside_tensors->resize(input_tensors.size());
       }
 
@@ -125,11 +125,10 @@ class FetchOp : public framework::OperatorBase {
       auto &src_item = fetch_var->Get<phi::SparseCooTensor>();
       fetch_list->at(col) = src_item;
     } else {
-      auto &src_item = fetch_var->Get<framework::LoDTensorArray>();
-      framework::LoDTensorArray tmp(src_item.size());
+      auto &src_item = fetch_var->Get<phi::TensorArray>();
+      phi::TensorArray tmp(src_item.size());
       fetch_list->at(col) = tmp;
-      auto &dst_item =
-          PADDLE_GET(framework::LoDTensorArray, fetch_list->at(col));
+      auto &dst_item = PADDLE_GET(phi::TensorArray, fetch_list->at(col));
       for (size_t i = 0; i < src_item.size(); ++i) {
         DataCopy(src_item[i], fetch_var_name, &dst_item[i]);
       }
 
@@ -100,7 +100,7 @@ class FetchV2Op : public framework::OperatorWithKernel {
         return phi::KernelKey(framework::proto::VarType::FP32, phi::CPUPlace());
       }
     } else {
-      auto &src_item = fetch_var->Get<framework::LoDTensorArray>();
+      auto &src_item = fetch_var->Get<phi::TensorArray>();
       if (src_item.empty() || !src_item[0].IsInitialized()) {
         return phi::KernelKey(framework::proto::VarType::FP32, phi::CPUPlace());
       }
@@ -174,11 +174,10 @@ class FetchV2Kernel {
       }
       fetch_list->at(col) = src_item;
     } else {
-      auto &src_item = fetch_var->Get<framework::LoDTensorArray>();
-      framework::LoDTensorArray tmp(src_item.size());
+      auto &src_item = fetch_var->Get<phi::TensorArray>();
+      phi::TensorArray tmp(src_item.size());
       fetch_list->at(col) = tmp;
-      auto &dst_item =
-          PADDLE_GET(framework::LoDTensorArray, fetch_list->at(col));
+      auto &dst_item = PADDLE_GET(phi::TensorArray, fetch_list->at(col));
       for (size_t i = 0; i < src_item.size(); ++i) {
         PADDLE_ENFORCE_EQ(
             src_item[i].place().GetType() == phi::AllocationType::CPU,