PaddlePaddle
diff --git a/‎paddle/fluid/framework/attribute.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/attribute.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/attribute.h
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions b/‎paddle/fluid/framework/attribute.h
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions
diff --git a/‎paddle/fluid/framework/data_type.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/data_type.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/details/eager_deletion_op_handle.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎paddle/fluid/framework/details/eager_deletion_op_handle.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎paddle/fluid/framework/dlpack_tensor.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/dlpack_tensor.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/executor.cc
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions b/‎paddle/fluid/framework/executor.cc
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions
diff --git a/‎paddle/fluid/framework/executor_gc_helper.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/framework/executor_gc_helper.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/framework/feed_fetch_type.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/framework/feed_fetch_type.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/framework/infershape_utils.cc
Copy file name to clipboard
+15-15Lines changed: 15 additions & 15 deletions b/‎paddle/fluid/framework/infershape_utils.cc
Copy file name to clipboard
+15-15Lines changed: 15 additions & 15 deletions
diff --git a/‎paddle/fluid/framework/ir/graph.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/framework/ir/graph.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
@@ -61,7 +61,7 @@ paddle::any GetAttrValue(const Attribute& attr) {
     default:
       PADDLE_THROW(common::errors::Unimplemented(
           "Unsupported Attribute value type `%s` for phi.",
-          platform::demangle(attr.type().name())));
+          common::demangle(attr.type().name())));
   }
 }
 
 
@@ -53,8 +53,8 @@ struct ExtractAttribute {
       PADDLE_THROW(common::errors::InvalidArgument(
           "Cannot get attribute (%s) by type %s, its type is %s.",
           attr_name_,
-          paddle::platform::demangle(typeid(T).name()),
-          paddle::platform::demangle(attr.type().name())));
+          common::demangle(typeid(T).name()),
+          common::demangle(attr.type().name())));
     }
     return attr_value;
   }
@@ -88,7 +88,7 @@ struct ExtractAttribute<bool> {
       PADDLE_THROW(common::errors::InvalidArgument(
           "Cannot get attribute (%s) by type bool, its type is %s.",
           attr_name_,
-          paddle::platform::demangle(attr.type().name())));
+          common::demangle(attr.type().name())));
     }
     return attr_value;
   }
@@ -116,7 +116,7 @@ struct ExtractAttribute<int64_t> {
       PADDLE_THROW(common::errors::InvalidArgument(
           "Cannot get attribute (%s) by type int64_t, its type is %s.",
           attr_name_,
-          paddle::platform::demangle(attr.type().name())));
+          common::demangle(attr.type().name())));
     }
     return attr_value;
   }
@@ -147,7 +147,7 @@ struct ExtractAttribute<std::vector<int64_t>> {
           "Cannot get attribute (%s) by type std::vector<int64_t>, its type is "
           "%s.",
           attr_name_,
-          paddle::platform::demangle(attr.type().name())));
+          common::demangle(attr.type().name())));
     }
     return attr_value;
   }
@@ -175,7 +175,7 @@ struct ExtractAttribute<float> {
       PADDLE_THROW(common::errors::InvalidArgument(
           "Cannot get attribute (%s) by type float, its type is %s.",
           attr_name_,
-          paddle::platform::demangle(attr.type().name())));
+          common::demangle(attr.type().name())));
     }
     return attr_value;
   }
@@ -206,7 +206,7 @@ struct ExtractAttribute<double> {
       PADDLE_THROW(common::errors::InvalidArgument(
           "Cannot get attribute (%s) by type double, its type is %s.",
           attr_name_,
-          paddle::platform::demangle(attr.type().name())));
+          common::demangle(attr.type().name())));
     }
     return attr_value;
   }
@@ -237,7 +237,7 @@ struct ExtractAttribute<std::vector<double>> {
           "Cannot get attribute (%s) by type std::vector<double>, its type is "
           "%s.",
           attr_name_,
-          paddle::platform::demangle(attr.type().name())));
+          common::demangle(attr.type().name())));
     }
     return attr_value;
   }
@@ -259,7 +259,7 @@ struct ExtractAttribute<paddle::experimental::Scalar> {
           "Cannot get attribute (%s) by type Scalar, its type is %s, index is "
           "%d",
           attr_name_,
-          paddle::platform::demangle(attr.type().name()),
+          common::demangle(attr.type().name()),
           attr.index()));
     }
     return attr_value;
 
@@ -73,7 +73,7 @@ proto::VarType::Type ToDataType(std::type_index type) {
     return it->second;
   }
   PADDLE_THROW(common::errors::Unimplemented(
-      "Not support %s as tensor data type.", platform::demangle(type.name())));
+      "Not support %s as tensor data type.", common::demangle(type.name())));
 }
 
 std::type_index ToTypeIndex(proto::VarType::Type type) {
 
@@ -133,7 +133,7 @@ void EagerDeletionOpHandle::RunImpl() {
     CallOnce();
   }
 
-  platform::RecordEvent record_event(
+  phi::RecordEvent record_event(
       Name(), platform::TracerEventType::UserDefined, 2);
   std::deque<std::shared_ptr<memory::Allocation>> garbages;
   for (size_t i = 0; i < var_infos_.size(); ++i) {
@@ -154,8 +154,8 @@ void EagerDeletionOpHandle::RunImpl() {
       garbages.emplace_back(var->GetMutable<phi::SelectedRows>()
                                 ->mutable_value()
                                 ->MoveMemoryHolder());
-    } else if (var->IsType<LoDTensorArray>()) {
-      auto *tensor_arr = var->GetMutable<LoDTensorArray>();
+    } else if (var->IsType<phi::TensorArray>()) {
+      auto *tensor_arr = var->GetMutable<phi::TensorArray>();
       for (auto &t : *tensor_arr) {
         garbages.emplace_back(t.MoveMemoryHolder());
       }
 
@@ -41,7 +41,7 @@ static ::DLDataType GetDLDataTypeCode() {
     PADDLE_THROW(common::errors::Unavailable(
         "Unsupported data type (%s), only supports float16, float, unsigned "
         "int and int.",
-        platform::demangle(typeid(T).name())));
+        common::demangle(typeid(T).name())));
   }
   dtype.bits = 8 * sizeof(T);
   dtype.lanes = 1;
 
@@ -181,7 +181,7 @@ void Executor::Run(const ProgramDesc& pdesc,
                    bool force_disable_gc,
                    bool keep_kid_scopes) {
   LOG_FIRST_N(INFO, 1) << "Old Executor is Running.";
-  platform::RecordEvent record_run(
+  phi::RecordEvent record_run(
       "Executor::Run", platform::TracerEventType::UserDefined, 1);
   platform::RecordBlock b(block_id);
   if (FLAGS_use_mkldnn) EnableMKLDNN(pdesc);
@@ -327,7 +327,7 @@ void Executor::Run(const ProgramDesc& program,
                    bool create_vars,
                    const std::string& feed_holder_name,
                    const std::string& fetch_holder_name) {
-  platform::RecordEvent record_run(
+  phi::RecordEvent record_run(
       "Executor::Run", platform::TracerEventType::UserDefined, 1);
   platform::RecordBlock b(kProgramId);
   if (FLAGS_use_mkldnn) EnableMKLDNN(program);
@@ -470,9 +470,9 @@ void Executor::RunPartialPreparedContext(ExecutorPrepareContext* ctx,
                                          bool create_local_scope,
                                          bool create_vars,
                                          bool keep_kids) {
-  platform::RecordEvent record_run("Executor::RunPartialPreparedContext",
-                                   platform::TracerEventType::UserDefined,
-                                   1);
+  phi::RecordEvent record_run("Executor::RunPartialPreparedContext",
+                              platform::TracerEventType::UserDefined,
+                              1);
   platform::RecordBlock b(kProgramId);
   PADDLE_ENFORCE_NOT_NULL(
       scope, common::errors::InvalidArgument("Scope shouldn't be null"));
@@ -494,7 +494,7 @@ void Executor::RunPartialPreparedContext(ExecutorPrepareContext* ctx,
     auto& op = ctx->ops_[i];
     op->Run(*local_scope, place_);
     if (gc) {
-      platform::RecordEvent record(
+      phi::RecordEvent record(
           "CheckGC", platform::TracerEventType::UserDefined, 10);
       DeleteUnusedTensors(*local_scope, op.get(), ctx->unused_vars_, gc.get());
     }
 
@@ -193,8 +193,8 @@ void DeleteUnusedTensors(const Scope &scope,
       garbages.emplace_back(var->GetMutable<phi::SelectedRows>()
                                 ->mutable_value()
                                 ->MoveMemoryHolder());
-    } else if (var->IsType<LoDTensorArray>()) {
-      auto *lod_tensor_arr = var->GetMutable<LoDTensorArray>();
+    } else if (var->IsType<phi::TensorArray>()) {
+      auto *lod_tensor_arr = var->GetMutable<phi::TensorArray>();
       for (auto &t : *lod_tensor_arr) {
         garbages.emplace_back(t.MoveMemoryHolder());
       }
 
@@ -34,7 +34,7 @@ struct PhiVectorType<FeedType> {
 using FeedList = paddle::framework::PhiVector<FeedType>;
 
 using FetchType = paddle::variant<phi::DenseTensor,
-                                  LoDTensorArray,
+                                  phi::TensorArray,
                                   framework::Vocab,
                                   phi::SparseCooTensor>;
 using FetchList = std::vector<FetchType>;
@@ -50,7 +50,7 @@ inline bool data_is_lod_tensor(const FetchType &data) {
 }
 
 inline bool data_is_lod_tensor_array(const FetchType &data) {
-  if (data.type() == typeid(LoDTensorArray)) {
+  if (data.type() == typeid(phi::TensorArray)) {
     return true;
   }
   return false;
 
@@ -198,7 +198,7 @@ bool CompatMetaTensor::is_dense() const {
 bool CompatMetaTensor::is_tensor_array() const {
   if (is_runtime_) {
     auto* var = PADDLE_GET_CONST(Variable*, var_);
-    return var->IsType<framework::LoDTensorArray>();
+    return var->IsType<phi::TensorArray>();
   } else {
     auto* var = PADDLE_GET_CONST(VarDesc*, var_);
     return var->GetType() == proto::VarType::LOD_TENSOR_ARRAY;
@@ -215,9 +215,9 @@ DDim CompatMetaTensor::dims() const {
       return var->Get<phi::SelectedRows>().GetCompleteDims();
     } else if (var->IsType<phi::SparseCooTensor>()) {
       return var->Get<phi::SparseCooTensor>().dims();
-    } else if (var->IsType<framework::LoDTensorArray>()) {
+    } else if (var->IsType<phi::TensorArray>()) {
       // use tensor array size as dims
-      auto& tensor_array = var->Get<framework::LoDTensorArray>();
+      auto& tensor_array = var->Get<phi::TensorArray>();
       return common::make_ddim({static_cast<int64_t>(tensor_array.size())});
     } else {
       PADDLE_THROW(common::errors::Unimplemented(
@@ -243,9 +243,9 @@ phi::DataType CompatMetaTensor::dtype() const {
       return var->Get<phi::SelectedRows>().dtype();
     } else if (var->IsType<phi::SparseCooTensor>()) {
       return var->Get<phi::SparseCooTensor>().dtype();
-    } else if (var->IsType<framework::LoDTensorArray>()) {
+    } else if (var->IsType<phi::TensorArray>()) {
       // NOTE(chenweihang): do nothing
-      // Unsupported get dtype from LoDTensorArray now
+      // Unsupported get dtype from phi::TensorArray now
       return phi::DataType::UNDEFINED;
     } else {
       PADDLE_THROW(common::errors::Unimplemented(
@@ -267,9 +267,9 @@ DataLayout CompatMetaTensor::layout() const {
       return var->Get<phi::SelectedRows>().layout();
     } else if (var->IsType<phi::SparseCooTensor>()) {
       return var->Get<phi::SparseCooTensor>().layout();
-    } else if (var->IsType<framework::LoDTensorArray>()) {
+    } else if (var->IsType<phi::TensorArray>()) {
       // NOTE(chenweihang): do nothing
-      // Unsupported get layout from LoDTensorArray now
+      // Unsupported get layout from phi::TensorArray now
       return phi::DataLayout::UNDEFINED;
     } else {
       PADDLE_THROW(common::errors::Unimplemented(
@@ -298,16 +298,16 @@ void CompatMetaTensor::set_dims(const DDim& dims) {
     } else if (var->IsType<phi::SparseCooTensor>()) {
       auto* tensor = var->GetMutable<phi::SparseCooTensor>();
       phi::DenseTensorUtils::GetMutableMeta(tensor)->dims = dims;
-    } else if (var->IsType<framework::LoDTensorArray>()) {
-      auto* tensor_array = var->GetMutable<framework::LoDTensorArray>();
+    } else if (var->IsType<phi::TensorArray>()) {
+      auto* tensor_array = var->GetMutable<phi::TensorArray>();
       // Note: Here I want enforce `tensor_array->size() == 0UL`, because
-      // inplace using on LoDTensorArray is dangerous, but the unittest
+      // inplace using on phi::TensorArray is dangerous, but the unittest
       // `test_list` contains this behavior
       PADDLE_ENFORCE_EQ(dims.size(),
                         1UL,
                         common::errors::InvalidArgument(
                             "LoDTensorArray can only have one dimension."));
-      // only set the array size for LoDTensorArray input
+      // only set the array size for phi::TensorArray input
       tensor_array->resize(dims[0]);
     } else {
       PADDLE_THROW(common::errors::Unimplemented(
@@ -335,9 +335,9 @@ void CompatMetaTensor::set_dtype(phi::DataType dtype) {
     } else if (var->IsType<phi::SparseCooTensor>()) {
       auto* tensor = var->GetMutable<phi::SparseCooTensor>();
       phi::DenseTensorUtils::GetMutableMeta(tensor)->dtype = dtype;
-    } else if (var->IsType<framework::LoDTensorArray>()) {
+    } else if (var->IsType<phi::TensorArray>()) {
       // NOTE(chenweihang): do nothing
-      // Unsupported set dtype for LoDTensorArray now
+      // Unsupported set dtype for phi::TensorArray now
     } else {
       PADDLE_THROW(common::errors::Unimplemented(
           "Currently, only can set dtype from DenseTensor or SelectedRows."));
@@ -366,9 +366,9 @@ void CompatMetaTensor::set_layout(DataLayout layout) {
     } else if (var->IsType<phi::SparseCooTensor>()) {
       auto* tensor = var->GetMutable<phi::SparseCooTensor>();
       phi::DenseTensorUtils::GetMutableMeta(tensor)->layout = layout;
-    } else if (var->IsType<framework::LoDTensorArray>()) {
+    } else if (var->IsType<phi::TensorArray>()) {
       // NOTE(chenweihang): do nothing
-      // Unsupported set dtype for LoDTensorArray now
+      // Unsupported set dtype for phi::TensorArray now
     } else {
       PADDLE_THROW(common::errors::Unimplemented(
           "Currently, only can set layout from DenseTensor or "
 
@@ -160,8 +160,8 @@ class Graph {
       PADDLE_THROW(common::errors::InvalidArgument(
           "Invalid attribute type of %s, expected: %s, received: %s.",
           attr_name,
-          platform::demangle(typeid(AttrType *).name()),  // NOLINT
-          platform::demangle(attrs_.at(attr_name).type().name())));
+          common::demangle(typeid(AttrType *).name()),  // NOLINT
+          common::demangle(attrs_.at(attr_name).type().name())));
     }
   }
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ paddle::any GetAttrValue(const Attribute& attr) {`
`61`	`61`	`default:`
`62`	`62`	`PADDLE_THROW(common::errors::Unimplemented(`
`63`	`63`	"Unsupported Attribute value type `%s` for phi.",
`64`		`- platform::demangle(attr.type().name())));`
	`64`	`+ common::demangle(attr.type().name())));`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ struct ExtractAttribute {`
`53`	`53`	`PADDLE_THROW(common::errors::InvalidArgument(`
`54`	`54`	`"Cannot get attribute (%s) by type %s, its type is %s.",`
`55`	`55`	`attr_name_,`
`56`		`- paddle::platform::demangle(typeid(T).name()),`
`57`		`- paddle::platform::demangle(attr.type().name())));`
	`56`	`+ common::demangle(typeid(T).name()),`
	`57`	`+ common::demangle(attr.type().name())));`
`58`	`58`	`}`
`59`	`59`	`return attr_value;`
`60`	`60`	`}`
`@@ -88,7 +88,7 @@ struct ExtractAttribute<bool> {`
`88`	`88`	`PADDLE_THROW(common::errors::InvalidArgument(`
`89`	`89`	`"Cannot get attribute (%s) by type bool, its type is %s.",`
`90`	`90`	`attr_name_,`
`91`		`- paddle::platform::demangle(attr.type().name())));`
	`91`	`+ common::demangle(attr.type().name())));`
`92`	`92`	`}`
`93`	`93`	`return attr_value;`
`94`	`94`	`}`
`@@ -116,7 +116,7 @@ struct ExtractAttribute<int64_t> {`
`116`	`116`	`PADDLE_THROW(common::errors::InvalidArgument(`
`117`	`117`	`"Cannot get attribute (%s) by type int64_t, its type is %s.",`
`118`	`118`	`attr_name_,`
`119`		`- paddle::platform::demangle(attr.type().name())));`
	`119`	`+ common::demangle(attr.type().name())));`
`120`	`120`	`}`
`121`	`121`	`return attr_value;`
`122`	`122`	`}`
`@@ -147,7 +147,7 @@ struct ExtractAttribute<std::vector<int64_t>> {`
`147`	`147`	`"Cannot get attribute (%s) by type std::vector<int64_t>, its type is "`
`148`	`148`	`"%s.",`
`149`	`149`	`attr_name_,`
`150`		`- paddle::platform::demangle(attr.type().name())));`
	`150`	`+ common::demangle(attr.type().name())));`
`151`	`151`	`}`
`152`	`152`	`return attr_value;`
`153`	`153`	`}`
`@@ -175,7 +175,7 @@ struct ExtractAttribute<float> {`
`175`	`175`	`PADDLE_THROW(common::errors::InvalidArgument(`
`176`	`176`	`"Cannot get attribute (%s) by type float, its type is %s.",`
`177`	`177`	`attr_name_,`
`178`		`- paddle::platform::demangle(attr.type().name())));`
	`178`	`+ common::demangle(attr.type().name())));`
`179`	`179`	`}`
`180`	`180`	`return attr_value;`
`181`	`181`	`}`
`@@ -206,7 +206,7 @@ struct ExtractAttribute<double> {`
`206`	`206`	`PADDLE_THROW(common::errors::InvalidArgument(`
`207`	`207`	`"Cannot get attribute (%s) by type double, its type is %s.",`
`208`	`208`	`attr_name_,`
`209`		`- paddle::platform::demangle(attr.type().name())));`
	`209`	`+ common::demangle(attr.type().name())));`
`210`	`210`	`}`
`211`	`211`	`return attr_value;`
`212`	`212`	`}`
`@@ -237,7 +237,7 @@ struct ExtractAttribute<std::vector<double>> {`
`237`	`237`	`"Cannot get attribute (%s) by type std::vector<double>, its type is "`
`238`	`238`	`"%s.",`
`239`	`239`	`attr_name_,`
`240`		`- paddle::platform::demangle(attr.type().name())));`
	`240`	`+ common::demangle(attr.type().name())));`
`241`	`241`	`}`
`242`	`242`	`return attr_value;`
`243`	`243`	`}`
`@@ -259,7 +259,7 @@ struct ExtractAttribute<paddle::experimental::Scalar> {`
`259`	`259`	`"Cannot get attribute (%s) by type Scalar, its type is %s, index is "`
`260`	`260`	`"%d",`
`261`	`261`	`attr_name_,`
`262`		`- paddle::platform::demangle(attr.type().name()),`
	`262`	`+ common::demangle(attr.type().name()),`
`263`	`263`	`attr.index()));`
`264`	`264`	`}`
`265`	`265`	`return attr_value;`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ proto::VarType::Type ToDataType(std::type_index type) {`
`73`	`73`	`return it->second;`
`74`	`74`	`}`
`75`	`75`	`PADDLE_THROW(common::errors::Unimplemented(`
`76`		`- "Not support %s as tensor data type.", platform::demangle(type.name())));`
	`76`	`+ "Not support %s as tensor data type.", common::demangle(type.name())));`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`std::type_index ToTypeIndex(proto::VarType::Type type) {`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ static ::DLDataType GetDLDataTypeCode() {`
`41`	`41`	`PADDLE_THROW(common::errors::Unavailable(`
`42`	`42`	`"Unsupported data type (%s), only supports float16, float, unsigned "`
`43`	`43`	`"int and int.",`
`44`		`- platform::demangle(typeid(T).name())));`
	`44`	`+ common::demangle(typeid(T).name())));`
`45`	`45`	`}`
`46`	`46`	`dtype.bits = 8 * sizeof(T);`
`47`	`47`	`dtype.lanes = 1;`
Original file line number	Diff line number	Diff line change
`@@ -160,8 +160,8 @@ class Graph {`
`160`	`160`	`PADDLE_THROW(common::errors::InvalidArgument(`
`161`	`161`	`"Invalid attribute type of %s, expected: %s, received: %s.",`
`162`	`162`	`attr_name,`
`163`		`- platform::demangle(typeid(AttrType *).name()), // NOLINT`
`164`		`- platform::demangle(attrs_.at(attr_name).type().name())));`
	`163`	`+ common::demangle(typeid(AttrType *).name()), // NOLINT`
	`164`	`+ common::demangle(attrs_.at(attr_name).type().name())));`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`