[Lod][fluid_ops]Change lod_level to legacy_lod_level in framework.proto (#69893)

co63oc · web-flow · commit cf5ce024baf2 · 2024-12-04T09:28:21.000+08:00
* Fix

* Fix

* Fix

* Fix

* Fix
diff --git a/paddle/fluid/framework/framework.proto b/paddle/fluid/framework/framework.proto
@@ -197,13 +197,13 @@ message VarType {
 
   message DenseTensorDesc {
     required TensorDesc tensor = 1;
-    optional int32 lod_level = 2 [ default = 0 ];
+    optional int32 legacy_lod_level = 2 [ default = 0 ];
   }
   optional DenseTensorDesc dense_tensor = 3;
 
   message DenseTensorArrayDesc {
     required TensorDesc tensor = 1;
-    optional int32 lod_level = 2 [ default = 0 ];
+    optional int32 legacy_lod_level = 2 [ default = 0 ];
   }
   optional DenseTensorArrayDesc tensor_array = 4;
 
diff --git a/paddle/fluid/framework/var_desc.cc b/paddle/fluid/framework/var_desc.cc
@@ -159,77 +159,96 @@ std::vector<proto::VarType::Type> VarDesc::GetDataTypes() const {
   return res;
 }
 
-void VarDesc::SetLoDLevel(int32_t lod_level) {
+void VarDesc::SetLegacyLoDLevel(int32_t legacy_lod_level) {
   switch (desc_.type().type()) {
     case proto::VarType::DENSE_TENSOR:
-      desc_.mutable_type()->mutable_dense_tensor()->set_lod_level(lod_level);
+      desc_.mutable_type()->mutable_dense_tensor()->set_legacy_lod_level(
+          legacy_lod_level);
       break;
     case proto::VarType::DENSE_TENSOR_ARRAY:
-      desc_.mutable_type()->mutable_tensor_array()->set_lod_level(lod_level);
+      desc_.mutable_type()->mutable_tensor_array()->set_legacy_lod_level(
+          legacy_lod_level);
       break;
     default:
-      PADDLE_THROW(common::errors::Unavailable(
-          "Setting 'lod_level' is not supported by the %s type variable.",
-          this->Name()));
+      PADDLE_THROW(
+          common::errors::Unavailable("Setting 'legacy_lod_level' is not "
+                                      "supported by the %s type variable.",
+                                      this->Name()));
   }
   need_updated_ = true;
 }
 
-void VarDesc::SetLoDLevels(const std::vector<int32_t> &multiple_lod_level) {
-  if (multiple_lod_level.size() != GetTensorDescNum()) {
-    VLOG(3) << "WARNING: The number of given lod_levels("
-            << multiple_lod_level.size()
+void VarDesc::SetLegacyLoDLevels(
+    const std::vector<int32_t> &multiple_legacy_lod_level) {
+  if (multiple_legacy_lod_level.size() != GetTensorDescNum()) {
+    VLOG(3) << "WARNING: The number of given legacy_lod_levels("
+            << multiple_legacy_lod_level.size()
             << ") doesn't match the existing tensor number("
             << GetTensorDescNum()
             << "). The Reader is going to be reinitialized.";
-    SetTensorDescNum(multiple_lod_level.size());
+    SetTensorDescNum(multiple_legacy_lod_level.size());
   }
   switch (desc_.type().type()) {
     case proto::VarType::READER: {
       size_t i = 0;
       for (auto &dense_tensor :
            *desc_.mutable_type()->mutable_reader()->mutable_dense_tensor()) {
-        dense_tensor.set_lod_level(multiple_lod_level[i++]);
+        dense_tensor.set_legacy_lod_level(multiple_legacy_lod_level[i++]);
       }
     } break;
     default:
-      PADDLE_THROW(common::errors::Unavailable(
-          "Setting 'lod_levels' is not supported by the %s type variable",
-          this->Name()));
+      PADDLE_THROW(
+          common::errors::Unavailable("Setting 'legacy_lod_levels' is not "
+                                      "supported by the %s type variable",
+                                      this->Name()));
   }
   need_updated_ = true;
 }
 
-int32_t VarDesc::GetLoDLevel() const {
+int32_t VarDesc::GetLegacyLoDLevel() const {
   switch (desc_.type().type()) {
     case proto::VarType::DENSE_TENSOR:
-      return desc_.type().dense_tensor().lod_level();
+      return desc_.type().dense_tensor().legacy_lod_level();
     case proto::VarType::DENSE_TENSOR_ARRAY:
-      return desc_.type().tensor_array().lod_level();
+      return desc_.type().tensor_array().legacy_lod_level();
     default:
-      PADDLE_THROW(common::errors::Unavailable(
-          "Getting 'lod_level' is not supported by the %s type variable.",
-          this->Name()));
+      PADDLE_THROW(
+          common::errors::Unavailable("Getting 'legacy_lod_level' is not "
+                                      "supported by the %s type variable.",
+                                      this->Name()));
   }
 }
 
-std::vector<int32_t> VarDesc::GetLoDLevels() const {
+std::vector<int32_t> VarDesc::GetLegacyLoDLevels() const {
   std::vector<int32_t> res;
   switch (desc_.type().type()) {
     case proto::VarType::READER:
       res.reserve(desc_.type().reader().dense_tensor_size());
       for (auto &dense_tensor : desc_.type().reader().dense_tensor()) {
-        res.push_back(dense_tensor.lod_level());
+        res.push_back(dense_tensor.legacy_lod_level());
       }
       return res;
       break;
     default:
-      PADDLE_THROW(common::errors::Unavailable(
-          "Getting 'lod_levels' is not supported by the %s type variable.",
-          this->Name()));
+      PADDLE_THROW(
+          common::errors::Unavailable("Getting 'legacy_lod_levels' is not "
+                                      "supported by the %s type variable.",
+                                      this->Name()));
   }
 }
 
+void VarDesc::SetLoDLevel(int32_t lod_level) { SetLegacyLoDLevel(lod_level); }
+
+void VarDesc::SetLoDLevels(const std::vector<int32_t> &multiple_lod_level) {
+  SetLegacyLoDLevels(multiple_lod_level);
+}
+
+int32_t VarDesc::GetLoDLevel() const { return GetLegacyLoDLevel(); }
+
+std::vector<int32_t> VarDesc::GetLoDLevels() const {
+  return GetLegacyLoDLevels();
+}
+
 const proto::VarType::TensorDesc &VarDesc::tensor_desc() const {
   PADDLE_ENFORCE_EQ(
       desc_.has_type(),
diff --git a/paddle/fluid/framework/var_desc.h b/paddle/fluid/framework/var_desc.h
@@ -135,6 +135,15 @@ class TEST_API VarDesc {
 
   std::vector<int32_t> GetLoDLevels() const;
 
+  void SetLegacyLoDLevel(int32_t legacy_lod_level);
+
+  void SetLegacyLoDLevels(
+      const std::vector<int32_t> &multiple_legacy_lod_level);
+
+  int32_t GetLegacyLoDLevel() const;
+
+  std::vector<int32_t> GetLegacyLoDLevels() const;
+
   proto::VarType::Type GetType() const;
 
   void SetType(proto::VarType::Type type);
diff --git a/paddle/fluid/pybind/protobuf.cc b/paddle/fluid/pybind/protobuf.cc
@@ -251,6 +251,12 @@ void BindVarDesc(pybind11::module *m) {
            pybind11::return_value_policy::reference)
       .def("set_lod_level", &pd::VarDesc::SetLoDLevel)
       .def("set_lod_levels", &pd::VarDesc::SetLoDLevels)
+      .def("legacy_lod_level", &pd::VarDesc::GetLegacyLoDLevel)
+      .def("legacy_lod_levels",
+           &pd::VarDesc::GetLegacyLoDLevels,
+           pybind11::return_value_policy::reference)
+      .def("set_legacy_lod_level", &pd::VarDesc::SetLegacyLoDLevel)
+      .def("set_legacy_lod_levels", &pd::VarDesc::SetLegacyLoDLevels)
       .def("type", &pd::VarDesc::GetType)
       .def("set_type", &pd::VarDesc::SetType)
       .def("serialize_to_string", SerializeMessage<pd::VarDesc>)
diff --git a/paddle/phi/core/framework/framework.proto b/paddle/phi/core/framework/framework.proto
@@ -197,13 +197,13 @@ message VarType {
 
   message DenseTensorDesc {
     required TensorDesc tensor = 1;
-    optional int32 lod_level = 2 [ default = 0 ];
+    optional int32 legacy_lod_level = 2 [ default = 0 ];
   }
   optional DenseTensorDesc dense_tensor = 3;
 
   message DenseTensorArrayDesc {
     required TensorDesc tensor = 1;
-    optional int32 lod_level = 2 [ default = 0 ];
+    optional int32 legacy_lod_level = 2 [ default = 0 ];
   }
   optional DenseTensorArrayDesc tensor_array = 4;
 

Original file line number	Diff line number	Diff line change
`@@ -197,13 +197,13 @@ message VarType {`
`197`	`197`
`198`	`198`	`message DenseTensorDesc {`
`199`	`199`	`required TensorDesc tensor = 1;`
`200`		`- optional int32 lod_level = 2 [ default = 0 ];`
	`200`	`+ optional int32 legacy_lod_level = 2 [ default = 0 ];`
`201`	`201`	`}`
`202`	`202`	`optional DenseTensorDesc dense_tensor = 3;`
`203`	`203`
`204`	`204`	`message DenseTensorArrayDesc {`
`205`	`205`	`required TensorDesc tensor = 1;`
`206`		`- optional int32 lod_level = 2 [ default = 0 ];`
	`206`	`+ optional int32 legacy_lod_level = 2 [ default = 0 ];`
`207`	`207`	`}`
`208`	`208`	`optional DenseTensorArrayDesc tensor_array = 4;`
`209`	`209`