Replace paddle::framework::LoD in test/ [fluid_ops] (#68767)

co63oc · web-flow · commit 0021608e60d2 · 2024-10-18T10:36:08.000+08:00
* Fix

* Fix
diff --git a/test/cpp/fluid/beam_search_decode_op_test.cc b/test/cpp/fluid/beam_search_decode_op_test.cc
@@ -17,7 +17,7 @@ limitations under the License. */
 #include "gtest/gtest.h"
 
 using CPUPlace = phi::CPUPlace;
-using LoD = paddle::framework::LoD;
+using LoD = phi::LoD;
 using LoDTensorArray = phi::TensorArray;
 
 template <typename T>
diff --git a/test/cpp/fluid/benchmark/op_tester.cc b/test/cpp/fluid/benchmark/op_tester.cc
@@ -377,7 +377,7 @@ void OpTester::CreateVariables(framework::Scope *scope) {
 
     VLOG(3) << "Set lod for tensor " << var_name;
     std::vector<std::vector<size_t>> &lod_vec = item.second.lod;
-    framework::LoD lod;
+    phi::LoD lod;
     for (auto &item : lod_vec) {
       lod.push_back(item);
     }
diff --git a/test/cpp/fluid/framework/lod_tensor_test.cu b/test/cpp/fluid/framework/lod_tensor_test.cu
@@ -26,7 +26,7 @@ __global__ void test(size_t* a, int size) {
 TEST(LoD, data) {
   paddle::framework::InitDevices();
 
-  paddle::framework::LoD lod{{0, 1, 2}};
+  phi::LoD lod{{0, 1, 2}};
   lod.push_back({0, 2, 4, 5});
   lod.push_back(std::vector<size_t>({0, 1, 6, 8, 10, 11}));
 
@@ -58,7 +58,7 @@ TEST(DenseTensor, LoDInGPU) {
   phi::DenseTensor lod_tensor;
   phi::GPUPlace place(0);
 
-  paddle::framework::LoD src_lod;
+  phi::LoD src_lod;
   src_lod.push_back(std::vector<size_t>{0, 2, 4, 6, 8, 10, 12, 14});
 
   lod_tensor.Resize({14, 16});
diff --git a/test/cpp/fluid/save_load_combine_op_test.cc b/test/cpp/fluid/save_load_combine_op_test.cc
@@ -29,7 +29,7 @@ T* CreateForSaveCombineOp(int x,
                           std::string var_name,
                           const phi::CPUPlace& place,
                           paddle::framework::Scope* scope,
-                          paddle::framework::LoD* expect_lod) {
+                          phi::LoD* expect_lod) {
   auto var = scope->Var(var_name);
   auto tensor = var->GetMutable<phi::DenseTensor>();
   tensor->Resize({x, y});
@@ -56,7 +56,7 @@ phi::DenseTensor* GeneratePlaceholderBeforeLoad(
 template <typename T>
 T* GetValuesAfterLoadCombineOp(phi::DenseTensor* target,
                                const paddle::framework::Scope& scope,
-                               paddle::framework::LoD* actual_lod) {
+                               phi::LoD* actual_lod) {
   T* actual = target->data<T>();
   *actual_lod = target->lod();
   return actual;
@@ -65,8 +65,8 @@ T* GetValuesAfterLoadCombineOp(phi::DenseTensor* target,
 template <typename T, typename U>
 void CheckValues(T* expect,
                  U* actual,
-                 const paddle::framework::LoD& expect_lod,
-                 const paddle::framework::LoD& actual_lod,
+                 const phi::LoD& expect_lod,
+                 const phi::LoD& actual_lod,
                  const int& numel) {
   for (int i = 0; i < numel; ++i) {
     EXPECT_EQ(expect[i], static_cast<T>(actual[i]));
@@ -88,25 +88,25 @@ void SaveLoadCombineOp() {
 
   std::vector<int> lod1 = {0, 1, 2, 3, 10};
   int numel1 = 100;
-  paddle::framework::LoD expect_lod1;
+  phi::LoD expect_lod1;
   T* expect1 = CreateForSaveCombineOp<T, U>(
       10, 10, lod1, "test_var1", place, &scope, &expect_lod1);
 
   std::vector<int> lod2 = {0, 2, 5, 10};
   int numel2 = 200;
-  paddle::framework::LoD expect_lod2;
+  phi::LoD expect_lod2;
   T* expect2 = CreateForSaveCombineOp<T, U>(
       10, 20, lod2, "test_var2", place, &scope, &expect_lod2);
 
   std::vector<int> lod3 = {0, 2, 3, 20};
   int numel3 = 4000;
-  paddle::framework::LoD expect_lod3;
+  phi::LoD expect_lod3;
   T* expect3 = CreateForSaveCombineOp<T, U>(
       20, 200, lod3, "test_var3", place, &scope, &expect_lod3);
 
   std::vector<int> lod4 = {0, 1, 20};
   int numel4 = 1000;
-  paddle::framework::LoD expect_lod4;
+  phi::LoD expect_lod4;
   T* expect4 = CreateForSaveCombineOp<T, U>(
       20, 50, lod4, "test_var4", place, &scope, &expect_lod4);
 
@@ -137,7 +137,7 @@ void SaveLoadCombineOp() {
       attrs);
   load_combine_op->Run(scope, place);
 
-  paddle::framework::LoD actual_lod1, actual_lod2, actual_lod3, actual_lod4;
+  phi::LoD actual_lod1, actual_lod2, actual_lod3, actual_lod4;
   U* actual1 = GetValuesAfterLoadCombineOp<U>(target1, scope, &actual_lod1);
   U* actual2 = GetValuesAfterLoadCombineOp<U>(target2, scope, &actual_lod2);
   U* actual3 = GetValuesAfterLoadCombineOp<U>(target3, scope, &actual_lod3);
@@ -163,25 +163,25 @@ TEST(SaveCombineFP16Op, CPU) {
 
   std::vector<int> lod1 = {0, 1, 2, 3, 10};
   int numel1 = 100;
-  paddle::framework::LoD expect_lod1;
+  phi::LoD expect_lod1;
   float* expect1 = CreateForSaveCombineOp<float, phi::dtype::float16>(
       10, 10, lod1, "test_var1", place, &scope, &expect_lod1);
 
   std::vector<int> lod2 = {0, 2, 5, 10};
   int numel2 = 200;
-  paddle::framework::LoD expect_lod2;
+  phi::LoD expect_lod2;
   float* expect2 = CreateForSaveCombineOp<float, phi::dtype::float16>(
       10, 20, lod2, "test_var2", place, &scope, &expect_lod2);
 
   std::vector<int> lod3 = {0, 20};
   int numel3 = 4000;
-  paddle::framework::LoD expect_lod3;
+  phi::LoD expect_lod3;
   float* expect3 = CreateForSaveCombineOp<float, phi::dtype::float16>(
       20, 200, lod3, "test_var3", place, &scope, &expect_lod3);
 
   std::vector<int> lod4 = {0, 1, 20};
   int numel4 = 1000;
-  paddle::framework::LoD expect_lod4;
+  phi::LoD expect_lod4;
   float* expect4 = CreateForSaveCombineOp<float, phi::dtype::float16>(
       20, 50, lod4, "test_var4", place, &scope, &expect_lod4);
 
@@ -213,7 +213,7 @@ TEST(SaveCombineFP16Op, CPU) {
       attrs);
   load_combine_op->Run(scope, place);
 
-  paddle::framework::LoD actual_lod1, actual_lod2, actual_lod3, actual_lod4;
+  phi::LoD actual_lod1, actual_lod2, actual_lod3, actual_lod4;
   phi::dtype::float16* actual1 =
       GetValuesAfterLoadCombineOp<phi::dtype::float16>(
           target1, scope, &actual_lod1);
@@ -245,25 +245,25 @@ TEST(LoadCombineFP16Op, CPU) {
 
   std::vector<int> lod1 = {0, 1, 2, 3, 10};
   int numel1 = 100;
-  paddle::framework::LoD expect_lod1;
+  phi::LoD expect_lod1;
   float* expect1 = CreateForSaveCombineOp<float, phi::dtype::float16>(
       10, 10, lod1, "test_var1", place, &scope, &expect_lod1);
 
   std::vector<int> lod2 = {0, 2, 5, 10};
   int numel2 = 200;
-  paddle::framework::LoD expect_lod2;
+  phi::LoD expect_lod2;
   float* expect2 = CreateForSaveCombineOp<float, phi::dtype::float16>(
       10, 20, lod2, "test_var2", place, &scope, &expect_lod2);
 
   std::vector<int> lod3 = {0, 20};
   int numel3 = 4000;
-  paddle::framework::LoD expect_lod3;
+  phi::LoD expect_lod3;
   float* expect3 = CreateForSaveCombineOp<float, phi::dtype::float16>(
       20, 200, lod3, "test_var3", place, &scope, &expect_lod3);
 
   std::vector<int> lod4 = {0, 1, 20};
   int numel4 = 1000;
-  paddle::framework::LoD expect_lod4;
+  phi::LoD expect_lod4;
   float* expect4 = CreateForSaveCombineOp<float, phi::dtype::float16>(
       20, 50, lod4, "test_var4", place, &scope, &expect_lod4);
 
@@ -300,7 +300,7 @@ TEST(LoadCombineFP16Op, CPU) {
   auto* target3 = load_var3->GetMutable<phi::DenseTensor>();
   auto* target4 = load_var4->GetMutable<phi::DenseTensor>();
 
-  paddle::framework::LoD actual_lod1, actual_lod2, actual_lod3, actual_lod4;
+  phi::LoD actual_lod1, actual_lod2, actual_lod3, actual_lod4;
   phi::dtype::float16* actual1 =
       GetValuesAfterLoadCombineOp<phi::dtype::float16>(
           target1, scope, &actual_lod1);
@@ -332,7 +332,7 @@ TEST(SaveLoadTestWithCombineOp, CPU) {
   auto var = scope.Var("test_var");
   auto tensor = var->GetMutable<phi::DenseTensor>();
   tensor->Resize({3, 4000});
-  paddle::framework::LoD expect_lod;
+  phi::LoD expect_lod;
   expect_lod.resize(1);
   expect_lod[0].push_back(0);
   expect_lod[0].push_back(1);
diff --git a/test/cpp/fluid/save_load_combine_op_test_xpu.cc b/test/cpp/fluid/save_load_combine_op_test_xpu.cc
@@ -25,7 +25,7 @@ T* CreateForSaveCombineOp(int x,
                           std::string var_name,
                           const Place& place,
                           paddle::framework::Scope* scope,
-                          paddle::framework::LoD* expect_lod) {
+                          phi::LoD* expect_lod) {
   phi::CPUPlace cpu_place;
   std::vector<T> ground_truth_cpu(x * y);
   for (int i = 0; i < x * y; ++i) {
@@ -59,7 +59,7 @@ phi::DenseTensor* GeneratePlaceholderBeforeLoad(
 template <typename T>
 T* GetValuesAfterLoadCombineOp(phi::DenseTensor* target,
                                const paddle::framework::Scope& scope,
-                               paddle::framework::LoD* actual_lod) {
+                               phi::LoD* actual_lod) {
   T* actual = target->data<T>();
   *actual_lod = target->lod();
   return actual;
@@ -68,8 +68,8 @@ T* GetValuesAfterLoadCombineOp(phi::DenseTensor* target,
 template <typename T, typename U>
 void CheckValues(T* expect,
                  U* actual,
-                 const paddle::framework::LoD& expect_lod,
-                 const paddle::framework::LoD& actual_lod,
+                 const phi::LoD& expect_lod,
+                 const phi::LoD& actual_lod,
                  const int& numel) {
   for (int i = 0; i < numel; ++i) {
     EXPECT_EQ(expect[i], static_cast<T>(actual[i]));
@@ -89,25 +89,25 @@ int SaveLoadCombineOpTest(Place place) {
 
   std::vector<int> lod1 = {0, 1, 2, 3, 10};
   int numel1 = 100;
-  paddle::framework::LoD expect_lod1;
+  phi::LoD expect_lod1;
   T* expect1 = CreateForSaveCombineOp<Place, T>(
       10, 10, lod1, "test_var1", place, &scope, &expect_lod1);
 
   std::vector<int> lod2 = {0, 2, 5, 10};
   int numel2 = 200;
-  paddle::framework::LoD expect_lod2;
+  phi::LoD expect_lod2;
   T* expect2 = CreateForSaveCombineOp<Place, T>(
       10, 20, lod2, "test_var2", place, &scope, &expect_lod2);
 
   std::vector<int> lod3 = {0, 2, 3, 20};
   int numel3 = 4000;
-  paddle::framework::LoD expect_lod3;
+  phi::LoD expect_lod3;
   T* expect3 = CreateForSaveCombineOp<Place, T>(
       20, 200, lod3, "test_var3", place, &scope, &expect_lod3);
 
   std::vector<int> lod4 = {0, 1, 20};
   int numel4 = 1000;
-  paddle::framework::LoD expect_lod4;
+  phi::LoD expect_lod4;
   T* expect4 = CreateForSaveCombineOp<Place, T>(
       20, 50, lod4, "test_var4", place, &scope, &expect_lod4);
 
@@ -134,7 +134,7 @@ int SaveLoadCombineOpTest(Place place) {
       attrs);
   load_combine_op->Run(scope, place);
 
-  paddle::framework::LoD actual_lod1, actual_lod2, actual_lod3, actual_lod4;
+  phi::LoD actual_lod1, actual_lod2, actual_lod3, actual_lod4;
   U* actual1 = GetValuesAfterLoadCombineOp<U>(target1, scope, &actual_lod1);
   U* actual2 = GetValuesAfterLoadCombineOp<U>(target2, scope, &actual_lod2);
   U* actual3 = GetValuesAfterLoadCombineOp<U>(target3, scope, &actual_lod3);
diff --git a/test/cpp/fluid/save_load_op_test.cc b/test/cpp/fluid/save_load_op_test.cc
@@ -28,7 +28,7 @@ TEST(SaveLoadOp, CPU) {
   auto var = scope.Var("test_var");
   auto tensor = var->GetMutable<phi::DenseTensor>();
   tensor->Resize({3, 10});
-  paddle::framework::LoD expect_lod;
+  phi::LoD expect_lod;
   expect_lod.resize(1);
   expect_lod[0].push_back(0);
   expect_lod[0].push_back(1);
@@ -109,7 +109,7 @@ TEST(SaveFP16Op, CPU) {
   auto var = scope.Var("test_var");
   auto tensor = var->GetMutable<phi::DenseTensor>();
   tensor->Resize({3, 10});
-  paddle::framework::LoD expect_lod;
+  phi::LoD expect_lod;
   expect_lod.resize(1);
   expect_lod[0].push_back(0);
   expect_lod[0].push_back(1);
@@ -156,7 +156,7 @@ TEST(LoadFP16Op, CPU) {
   auto tensor = var->GetMutable<phi::DenseTensor>();
   tensor->Resize({3, 10});
 
-  paddle::framework::LoD expect_lod;
+  phi::LoD expect_lod;
   expect_lod.resize(1);
   expect_lod[0].push_back(0);
   expect_lod[0].push_back(1);
diff --git a/test/cpp/fluid/save_load_op_test_xpu.cc b/test/cpp/fluid/save_load_op_test_xpu.cc
@@ -31,7 +31,7 @@ int SaveLoadOpTest(Place place, int dim_1, int dim_2) {
   auto var = scope.Var("test_var");
   auto tensor = var->GetMutable<phi::DenseTensor>();
   tensor->Resize({dim_1, dim_2});
-  paddle::framework::LoD expect_lod;
+  phi::LoD expect_lod;
   expect_lod.resize(1);
   for (int i = 0; i < dim_1; i++) {
     expect_lod[0].push_back(i);
diff --git a/test/cpp/inference/api/api_impl_tester.cc b/test/cpp/inference/api/api_impl_tester.cc
@@ -74,7 +74,7 @@ void MainWord2Vec(const ::paddle::PaddlePlace& place) {
   config.use_xpu = ::paddle::xpu_place_used(place);
 
   phi::DenseTensor first_word, second_word, third_word, fourth_word;
-  framework::LoD lod{{0, 1}};
+  phi::LoD lod{{0, 1}};
   int64_t dict_size = 2073;  // The size of dictionary
 
   SetupLoDTensor(&first_word, lod, static_cast<int64_t>(0), dict_size - 1);
@@ -178,7 +178,7 @@ void MainThreadsWord2Vec(const ::paddle::PaddlePlace& place) {
     // each job has 4 words
     jobs[i].resize(4);
     for (size_t j = 0; j < 4; ++j) {
-      framework::LoD lod{{0, 1}};
+      phi::LoD lod{{0, 1}};
       int64_t dict_size = 2073;  // The size of dictionary
       SetupLoDTensor(&jobs[i][j], lod, static_cast<int64_t>(0), dict_size - 1);
       paddle_tensor_feeds[i].push_back(LodTensorToPaddleTensor(&jobs[i][j]));
diff --git a/test/cpp/inference/api/tester_helper.h b/test/cpp/inference/api/tester_helper.h
@@ -1065,7 +1065,7 @@ std::string LoDTensorSummary(const phi::DenseTensor &tensor) {
   return ss.str();
 }
 
-static bool CompareLoD(const framework::LoD &a, const framework::LoD &b) {
+static bool CompareLoD(const phi::LoD &a, const phi::LoD &b) {
   if (a.size() != b.size()) {
     LOG(ERROR) << string::Sprintf(
         "lod size not match %d != %d", a.size(), b.size());
diff --git a/test/cpp/inference/test_helper.h b/test/cpp/inference/test_helper.h
@@ -69,7 +69,7 @@ void SetupTensor(phi::DenseTensor* input,
 
 template <typename T>
 void SetupLoDTensor(phi::DenseTensor* input,
-                    const paddle::framework::LoD& lod,
+                    const phi::LoD& lod,
                     T lower,
                     T upper) {
   input->set_lod(lod);
@@ -80,7 +80,7 @@ void SetupLoDTensor(phi::DenseTensor* input,
 template <typename T>
 void SetupLoDTensor(phi::DenseTensor* input,
                     phi::DDim dims,
-                    const paddle::framework::LoD lod,
+                    const phi::LoD lod,
                     const std::vector<T>& data) {
   const size_t level = lod.size() - 1;
   PADDLE_ENFORCE_EQ(dims[0],

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ void OpTester::CreateVariables(framework::Scope *scope) {`
`377`	`377`
`378`	`378`	`VLOG(3) << "Set lod for tensor " << var_name;`
`379`	`379`	`std::vector<std::vector<size_t>> &lod_vec = item.second.lod;`
`380`		`- framework::LoD lod;`
	`380`	`+ phi::LoD lod;`
`381`	`381`	`for (auto &item : lod_vec) {`
`382`	`382`	`lod.push_back(item);`
`383`	`383`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1065,7 +1065,7 @@ std::string LoDTensorSummary(const phi::DenseTensor &tensor) {`
`1065`	`1065`	`return ss.str();`
`1066`	`1066`	`}`
`1067`	`1067`
`1068`		`-static bool CompareLoD(const framework::LoD &a, const framework::LoD &b) {`
	`1068`	`+static bool CompareLoD(const phi::LoD &a, const phi::LoD &b) {`
`1069`	`1069`	`if (a.size() != b.size()) {`
`1070`	`1070`	`LOG(ERROR) << string::Sprintf(`
`1071`	`1071`	`"lod size not match %d != %d", a.size(), b.size());`