PaddlePaddle
diff --git a/‎paddle/fluid/distributed/fleet_executor/compute_interceptor.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/distributed/fleet_executor/compute_interceptor.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/distributed/ps/service/brpc_ps_server.cc
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions b/‎paddle/fluid/distributed/ps/service/brpc_ps_server.cc
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions
diff --git a/‎paddle/fluid/distributed/ps/service/communicator/communicator.cc
Copy file name to clipboard
+37-37Lines changed: 37 additions & 37 deletions b/‎paddle/fluid/distributed/ps/service/communicator/communicator.cc
Copy file name to clipboard
+37-37Lines changed: 37 additions & 37 deletions
diff --git a/‎paddle/fluid/distributed/ps/service/heter_client.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎paddle/fluid/distributed/ps/service/heter_client.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎paddle/fluid/distributed/ps/service/heter_server.h
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎paddle/fluid/distributed/ps/service/heter_server.h
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎paddle/fluid/imperative/all_reduce.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/imperative/all_reduce.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/imperative/basic_engine.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/imperative/basic_engine.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/imperative/bkcl_context.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/imperative/bkcl_context.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/imperative/gloo_context.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/imperative/gloo_context.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/imperative/layer.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/imperative/layer.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
@@ -352,8 +352,8 @@ void ComputeInterceptor::Run() {
     for (auto var_name : vars_names) {
       if (var_name == "feed" || var_name == "fetch") continue;
       auto* var = microbatch_scopes_[cur_scope_id_]->Var(var_name);
-      if (var != nullptr && var->IsType<framework::LoDTensorArray>()) {
-        auto* lod_tensor_arr = var->GetMutable<framework::LoDTensorArray>();
+      if (var != nullptr && var->IsType<phi::TensorArray>()) {
+        auto* lod_tensor_arr = var->GetMutable<phi::TensorArray>();
         lod_tensor_arr->clear();
       }
     }
 
@@ -303,7 +303,7 @@ int32_t BrpcPsService::PullDense(Table *table,
                                  const PsRequestMessage &request,
                                  PsResponseMessage &response,
                                  brpc::Controller *cntl) {
-  platform::RecordEvent record_event(
+  phi::RecordEvent record_event(
       "PsService->PullDense", platform::TracerEventType::Communication, 1);
   CHECK_TABLE_EXIST(table, request, response)
   if (request.params_size() < 1) {
@@ -338,7 +338,7 @@ int32_t BrpcPsService::PushDenseParam(Table *table,
                                       const PsRequestMessage &request,
                                       PsResponseMessage &response,
                                       brpc::Controller *cntl) {
-  platform::RecordEvent record_event(
+  phi::RecordEvent record_event(
       "PsService->PushDenseParam", platform::TracerEventType::Communication, 1);
   CHECK_TABLE_EXIST(table, request, response)
   thread_local std::string push_buffer;
@@ -372,7 +372,7 @@ int32_t BrpcPsService::PushDense(Table *table,
                                  const PsRequestMessage &request,
                                  PsResponseMessage &response,
                                  brpc::Controller *cntl) {
-  platform::RecordEvent record_event(
+  phi::RecordEvent record_event(
       "PsService->PushDense", platform::TracerEventType::Communication, 1);
   CHECK_TABLE_EXIST(table, request, response)
   auto req_buffer_size = request.data().size();
@@ -427,9 +427,9 @@ int32_t BrpcPsService::PushSparseParam(Table *table,
                                        const PsRequestMessage &request,
                                        PsResponseMessage &response,
                                        brpc::Controller *cntl) {
-  platform::RecordEvent record_event("PsService->PushSparseParam",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("PsService->PushSparseParam",
+                                platform::TracerEventType::Communication,
+                                1);
   CHECK_TABLE_EXIST(table, request, response)
   auto &push_data = request.data();
   if (push_data.empty()) {
@@ -471,7 +471,7 @@ int32_t BrpcPsService::PullGeoParam(Table *table,
                                     const PsRequestMessage &request,
                                     PsResponseMessage &response,
                                     brpc::Controller *cntl) {
-  platform::RecordEvent record_event(
+  phi::RecordEvent record_event(
       "PsService->pull_geo_param", platform::TracerEventType::Communication, 1);
   CHECK_TABLE_EXIST(table, request, response)
   thread_local std::string push_sparse_request_buffer;
@@ -503,7 +503,7 @@ int32_t BrpcPsService::PullSparse(Table *table,
                                   const PsRequestMessage &request,
                                   PsResponseMessage &response,
                                   brpc::Controller *cntl) {
-  platform::RecordEvent record_event(
+  phi::RecordEvent record_event(
       "PsService->PullSparse", platform::TracerEventType::Communication, 1);
   CHECK_TABLE_EXIST(table, request, response)
 
@@ -557,7 +557,7 @@ int32_t BrpcPsService::PushSparse(Table *table,
                                   const PsRequestMessage &request,
                                   PsResponseMessage &response,
                                   brpc::Controller *cntl) {
-  platform::RecordEvent record_event(
+  phi::RecordEvent record_event(
       "PsService->PushSparse", platform::TracerEventType::Communication, 1);
   CHECK_TABLE_EXIST(table, request, response)
   auto &push_data = request.data();
 
@@ -96,9 +96,9 @@ int Communicator::SetClients(std::vector<uint64_t> &host_sign_list) {
 void Communicator::RpcRecvDense(const std::vector<std::string> &varnames,
                                 int table_id,
                                 Scope *scope) {  // pserver_scope_
-  platform::RecordEvent record_event("Communicator->RpcRecvDense",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("Communicator->RpcRecvDense",
+                                platform::TracerEventType::Communication,
+                                1);
   std::vector<::paddle::distributed::Region> regions;
   regions.reserve(varnames.size());
   for (auto &t : varnames) {
@@ -155,9 +155,9 @@ void Communicator::RpcRecvDense(const std::vector<std::string> &varnames,
 void Communicator::RpcSendDenseParam(const std::vector<std::string> &varnames,
                                      int table_id,
                                      const Scope &scope) {
-  platform::RecordEvent record_event("Communicator->RpcSendDenseParam",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("Communicator->RpcSendDenseParam",
+                                platform::TracerEventType::Communication,
+                                1);
   auto place = phi::CPUPlace();
   std::vector<::paddle::distributed::Region> regions;
   for (auto &t : varnames) {
@@ -198,9 +198,9 @@ void Communicator::RpcSendDenseParam(const std::vector<std::string> &varnames,
 
 void Communicator::RpcSendDense(const CommContext &ctx,
                                 const Scope &scope) {  // delta_scope_
-  platform::RecordEvent record_event("Communicator->RpcSendDense",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("Communicator->RpcSendDense",
+                                platform::TracerEventType::Communication,
+                                1);
   auto &var_names = ctx.origin_varnames;
   auto &table_id = ctx.table_id;
   auto dense_data = std::make_shared<std::vector<float>>();
@@ -250,9 +250,9 @@ void Communicator::RpcSendDense(const CommContext &ctx,
 void Communicator::RpcSendSparseParam(const std::string &varname,
                                       int table_id,
                                       const Scope &scope) {
-  platform::RecordEvent record_event("Communicator->RpcSendSparseParam",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("Communicator->RpcSendSparseParam",
+                                platform::TracerEventType::Communication,
+                                1);
   size_t request_call_num = _worker_ptr->GetServerNums();
   std::vector<float *> push_g_vec;
 
@@ -292,9 +292,9 @@ void Communicator::RpcSendSparseParam(const std::string &varname,
 void Communicator::RpcSendSparse(const std::string &var_name,
                                  int table_id,
                                  const Scope &scope) {
-  platform::RecordEvent record_event("Communicator->RpcSendSparse",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("Communicator->RpcSendSparse",
+                                platform::TracerEventType::Communication,
+                                1);
   size_t request_call_num = _worker_ptr->GetServerNums();
   std::vector<uint64_t> sparse_push_keys;
   std::vector<float *> push_g_vec;
@@ -350,9 +350,9 @@ void Communicator::RpcSendSparse(const std::string &var_name,
 void Communicator::RpcRecvSparse(const std::string &varname,
                                  int table_id,
                                  Scope *scope) {
-  platform::RecordEvent record_event("Communicator->RpcRecvSparse",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("Communicator->RpcRecvSparse",
+                                platform::TracerEventType::Communication,
+                                1);
   auto *send_var = scope->Var(varname);
   auto *tensor = send_var->GetMutable<phi::DenseTensor>();
   auto dim = tensor->dims()[1];
@@ -424,9 +424,9 @@ void Communicator::SendGlobalStep(const CommContext &ctx,
   if (batches == 0) {
     return;
   }
-  platform::RecordEvent record_event("Communicator->SendGlobalStep",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("Communicator->SendGlobalStep",
+                                platform::TracerEventType::Communication,
+                                1);
   auto &table_id = ctx.table_id;
   size_t request_call_num = _worker_ptr->GetServerNums();
 
@@ -1071,7 +1071,7 @@ void SyncCommunicator::BarrierRecv() {
 void GeoCommunicator::Send(
     const std::vector<std::string> &var_names,
     const framework::Scope &scope) {  // last op in program
-  platform::RecordEvent record_event(
+  phi::RecordEvent record_event(
       "GeoCommunicator->Send", platform::TracerEventType::Communication, 1);
   waiting_ = false;
   auto before_send = GetCurrentUS();
@@ -1230,9 +1230,9 @@ void GeoCommunicator::InitDense(std::vector<std::string> &varnames,
 }
 
 void GeoCommunicator::SendDense(const CommContext &send_ctx) {
-  platform::RecordEvent record_event("GeoCommunicator->SendDense",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("GeoCommunicator->SendDense",
+                                platform::TracerEventType::Communication,
+                                1);
   auto &var_names = send_ctx.origin_varnames;
   auto &table_id = send_ctx.table_id;
   for (auto &varname : var_names) {
@@ -1277,9 +1277,9 @@ void GeoCommunicator::SendDense(const CommContext &send_ctx) {
 }
 
 void GeoCommunicator::RecvDense(const CommContext &send_ctx) {
-  platform::RecordEvent record_event("GeoCommunicator->RecvDense",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("GeoCommunicator->RecvDense",
+                                platform::TracerEventType::Communication,
+                                1);
   auto &table_id = send_ctx.table_id;
   auto &varnames = recv_varname_to_ctx_.at(table_id);
   // 1. recv from pserver
@@ -1341,9 +1341,9 @@ void GeoCommunicator::InitSparse(const std::string &var_name, int table_id) {
 
 std::vector<int64_t> GeoCommunicator::MergeSparseIds(
     const std::string &send_varname) {
-  platform::RecordEvent record_event("GeoCommunicator->MergeSparseIds",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("GeoCommunicator->MergeSparseIds",
+                                platform::TracerEventType::Communication,
+                                1);
   size_t merge_num = 0, wait_times = 0;
   std::unordered_set<int64_t> sparse_ids;
   while (merge_num <
@@ -1377,9 +1377,9 @@ void GeoCommunicator::SendSparse(const std::string &varname,
                                  std::vector<int64_t> &sparse_ids,
                                  int table_id,
                                  int ep_idx) {
-  platform::RecordEvent record_event("GeoCommunicator->SendSparse",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("GeoCommunicator->SendSparse",
+                                platform::TracerEventType::Communication,
+                                1);
   if (sparse_ids.empty()) {
     return;
   }
@@ -1463,9 +1463,9 @@ void GeoCommunicator::SendSparse(const std::string &varname,
 void GeoCommunicator::RecvSparse(const std::string &varname,
                                  int table_id,
                                  int ep_idx) {
-  platform::RecordEvent record_event("GeoCommunicator->RecvSparse",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("GeoCommunicator->RecvSparse",
+                                platform::TracerEventType::Communication,
+                                1);
   // 1. recv from pserver
   std::vector<uint64_t> keys;
   std::vector<float> values;
 
@@ -118,9 +118,9 @@ void HeterClient::SendAndRecvAsync(
     const std::vector<std::string>& send_var_name,
     const std::vector<std::string>& recv_var_name,
     const std::string& mode) {
-  platform::RecordEvent record_event("HeterClient->SendAndRecvAsync",
-                                     platform::TracerEventType::Communication,
-                                     1);
+  phi::RecordEvent record_event("HeterClient->SendAndRecvAsync",
+                                platform::TracerEventType::Communication,
+                                1);
   const phi::DeviceContext* p_ctx = &ctx;
   const framework::Scope* p_scope = &scope;
   const std::vector<std::string> send_var_name_val = send_var_name;
 
@@ -208,9 +208,9 @@ class SendAndRecvVariableHandler final : public ServiceHandlerBase {
              MultiVarMsg* response,
              brpc::Controller* cntl) override {
     LOG(INFO) << "entered Handle";
-    platform::RecordEvent record_event("SendAndRecvVariableHandler->Handle",
-                                       platform::TracerEventType::Communication,
-                                       1);
+    phi::RecordEvent record_event("SendAndRecvVariableHandler->Handle",
+                                  platform::TracerEventType::Communication,
+                                  1);
     FLAGS_eager_delete_tensor_gb = -1;
 
     // get microID from request
 
@@ -49,7 +49,7 @@ static const phi::Place &GetVarPlace(const framework::Variable &src) {
         "Cannot get unsupported variable type %s for imperative allreduce, "
         "only "
         "LoDTensor and SelectedRows are supported.",
-        platform::demangle(framework::ToTypeName(src.Type()))));
+        common::demangle(framework::ToTypeName(src.Type()))));
   }
 }
 
@@ -262,7 +262,7 @@ void AllReduce(const framework::Variable &src,
     PADDLE_THROW(common::errors::InvalidArgument(
         "Unsupported variable type %s for imperative allreduce, only "
         "LoDTensor and SelectedRows are supported.",
-        platform::demangle(framework::ToTypeName(src.Type()))));
+        common::demangle(framework::ToTypeName(src.Type()))));
   }
 }
 
 
@@ -402,7 +402,7 @@ static void PerformBackwardInplace(const std::string& op_type,
 }
 
 void BasicEngine::Execute() {
-  platform::RecordEvent backward_record_event(
+  phi::RecordEvent backward_record_event(
       "backward", platform::TracerEventType::UserDefined, 1);
 
   if (init_nodes_.empty()) {
@@ -427,7 +427,7 @@ void BasicEngine::Execute() {
     auto& inplace_grad_name_map = shared_cur_node->InplaceGradNameMap();
 
     for (auto& cur_op : *shared_cur_node) {
-      platform::RecordEvent op_type_record_event(
+      phi::RecordEvent op_type_record_event(
           cur_op.Type() + " grad_node", platform::TracerEventType::Operator, 1);
 
       ++op_num;
 
@@ -175,7 +175,7 @@ void BKCLParallelContext::AllReduceByStream(const framework::Variable &src,
     PADDLE_THROW(common::errors::InvalidArgument(
         "XPU unsupported variable type %s for imperative allreduce, only "
         "LoDTensor are supported.",
-        platform::demangle(framework::ToTypeName(src.Type()))));
+        common::demangle(framework::ToTypeName(src.Type()))));
   }
 }
 
 
@@ -102,7 +102,7 @@ void GLOOParallelContext::AllReduceByStream(const framework::Variable &src,
     PADDLE_THROW(common::errors::InvalidArgument(
         "Unsupported variable type %s for imperative allreduce, only "
         "LoDTensor and SelectedRows are supported.",
-        platform::demangle(framework::ToTypeName(src.Type()))));
+        common::demangle(framework::ToTypeName(src.Type()))));
   }
 }
 
 
@@ -234,7 +234,7 @@ void VarBase::ClearGradient(bool set_to_zero) {
         grad_t->mutable_value()->clear();
       }
     } else {
-      platform::RecordEvent record_event(
+      phi::RecordEvent record_event(
           "ClearGradient", platform::TracerEventType::UserDefined, 2);
       auto* grad_t = grad_var_->MutableVar()->GetMutable<phi::DenseTensor>();
       if (grad_t->IsInitialized()) {
Original file line number	Diff line number	Diff line change
`@@ -352,8 +352,8 @@ void ComputeInterceptor::Run() {`
`352`	`352`	`for (auto var_name : vars_names) {`
`353`	`353`	`if (var_name == "feed" \|\| var_name == "fetch") continue;`
`354`	`354`	`auto* var = microbatch_scopes_[cur_scope_id_]->Var(var_name);`
`355`		`- if (var != nullptr && var->IsType<framework::LoDTensorArray>()) {`
`356`		`- auto* lod_tensor_arr = var->GetMutable<framework::LoDTensorArray>();`
	`355`	`+ if (var != nullptr && var->IsType<phi::TensorArray>()) {`
	`356`	`+ auto* lod_tensor_arr = var->GetMutable<phi::TensorArray>();`
`357`	`357`	`lod_tensor_arr->clear();`
`358`	`358`	`}`
`359`	`359`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ static const phi::Place &GetVarPlace(const framework::Variable &src) {`
`49`	`49`	`"Cannot get unsupported variable type %s for imperative allreduce, "`
`50`	`50`	`"only "`
`51`	`51`	`"LoDTensor and SelectedRows are supported.",`
`52`		`- platform::demangle(framework::ToTypeName(src.Type()))));`
	`52`	`+ common::demangle(framework::ToTypeName(src.Type()))));`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`@@ -262,7 +262,7 @@ void AllReduce(const framework::Variable &src,`
`262`	`262`	`PADDLE_THROW(common::errors::InvalidArgument(`
`263`	`263`	`"Unsupported variable type %s for imperative allreduce, only "`
`264`	`264`	`"LoDTensor and SelectedRows are supported.",`
`265`		`- platform::demangle(framework::ToTypeName(src.Type()))));`
	`265`	`+ common::demangle(framework::ToTypeName(src.Type()))));`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ void BKCLParallelContext::AllReduceByStream(const framework::Variable &src,`
`175`	`175`	`PADDLE_THROW(common::errors::InvalidArgument(`
`176`	`176`	`"XPU unsupported variable type %s for imperative allreduce, only "`
`177`	`177`	`"LoDTensor are supported.",`
`178`		`- platform::demangle(framework::ToTypeName(src.Type()))));`
	`178`	`+ common::demangle(framework::ToTypeName(src.Type()))));`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ void GLOOParallelContext::AllReduceByStream(const framework::Variable &src,`
`102`	`102`	`PADDLE_THROW(common::errors::InvalidArgument(`
`103`	`103`	`"Unsupported variable type %s for imperative allreduce, only "`
`104`	`104`	`"LoDTensor and SelectedRows are supported.",`
`105`		`- platform::demangle(framework::ToTypeName(src.Type()))));`
	`105`	`+ common::demangle(framework::ToTypeName(src.Type()))));`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ void VarBase::ClearGradient(bool set_to_zero) {`
`234`	`234`	`grad_t->mutable_value()->clear();`
`235`	`235`	`}`
`236`	`236`	`} else {`
`237`		`- platform::RecordEvent record_event(`
	`237`	`+ phi::RecordEvent record_event(`
`238`	`238`	`"ClearGradient", platform::TracerEventType::UserDefined, 2);`
`239`	`239`	`auto* grad_t = grad_var_->MutableVar()->GetMutable<phi::DenseTensor>();`
`240`	`240`	`if (grad_t->IsInitialized()) {`