PaddlePaddle
diff --git a/‎test/cpp/eager/data_structure_tests/accumulation_node_test.cc
Copy file name to clipboard
+30-36Lines changed: 30 additions & 36 deletions b/‎test/cpp/eager/data_structure_tests/accumulation_node_test.cc
Copy file name to clipboard
+30-36Lines changed: 30 additions & 36 deletions
diff --git a/‎test/cpp/eager/data_structure_tests/autograd_meta_test.cc
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions b/‎test/cpp/eager/data_structure_tests/autograd_meta_test.cc
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions
diff --git a/‎test/cpp/eager/data_structure_tests/eager_tensor_test.cc
Copy file name to clipboard
+14-18Lines changed: 14 additions & 18 deletions b/‎test/cpp/eager/data_structure_tests/eager_tensor_test.cc
Copy file name to clipboard
+14-18Lines changed: 14 additions & 18 deletions
diff --git a/‎test/cpp/eager/data_structure_tests/grad_node_info_test.cc
Copy file name to clipboard
+5-7Lines changed: 5 additions & 7 deletions b/‎test/cpp/eager/data_structure_tests/grad_node_info_test.cc
Copy file name to clipboard
+5-7Lines changed: 5 additions & 7 deletions
diff --git a/‎test/cpp/eager/data_structure_tests/grad_node_test.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎test/cpp/eager/data_structure_tests/grad_node_test.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎test/cpp/eager/data_structure_tests/grad_tensor_holder_test.cc
Copy file name to clipboard
+5-8Lines changed: 5 additions & 8 deletions b/‎test/cpp/eager/data_structure_tests/grad_tensor_holder_test.cc
Copy file name to clipboard
+5-8Lines changed: 5 additions & 8 deletions
@@ -37,21 +37,19 @@ TEST(AccumulationNode, SelectedRowsAddToTensor) {
   std::shared_ptr<phi::SelectedRows> sr0 =
       std::make_shared<phi::SelectedRows>(rows, 1);
   sr0->mutable_value()->Resize(common::make_ddim({1, 1}));
-  sr0->mutable_value()->mutable_data<float>(paddle::platform::CPUPlace())[0] =
+  sr0->mutable_value()->mutable_data<float>(phi::CPUPlace())[0] =
       static_cast<float>(10.0f);
   paddle::Tensor et0 = paddle::Tensor(sr0);
   std::shared_ptr<phi::DenseTensor> dt1 = std::make_shared<phi::DenseTensor>(
-      std::make_unique<paddle::experimental::DefaultAllocator>(
-          paddle::platform::CPUPlace())
+      std::make_unique<paddle::experimental::DefaultAllocator>(phi::CPUPlace())
           .get(),
       meta);
-  dt1->mutable_data<float>(paddle::platform::CPUPlace())[0] =
-      static_cast<float>(20.0f);
+  dt1->mutable_data<float>(phi::CPUPlace())[0] = static_cast<float>(20.0f);
   paddle::Tensor et1 = paddle::Tensor(dt1);
   std::shared_ptr<phi::DenseTensor> input_dt =
       std::make_shared<phi::DenseTensor>(
           std::make_unique<paddle::experimental::DefaultAllocator>(
-              paddle::platform::CPUPlace())
+              phi::CPUPlace())
               .get(),
           meta);
   paddle::Tensor input_et = paddle::Tensor(input_dt);
@@ -60,8 +58,8 @@ TEST(AccumulationNode, SelectedRowsAddToTensor) {
   std::shared_ptr<phi::SelectedRows> grad_dt =
       std::make_shared<phi::SelectedRows>(rows, 1);
   grad_dt->mutable_value()->Resize(common::make_ddim({1, 1}));
-  grad_dt->mutable_value()->mutable_data<float>(
-      paddle::platform::CPUPlace())[0] = static_cast<float>(0.0f);
+  grad_dt->mutable_value()->mutable_data<float>(phi::CPUPlace())[0] =
+      static_cast<float>(0.0f);
   grad_meta->MutableGrad()->set_impl(grad_dt);
   // AccumulationNode
   auto node = std::make_shared<GradNodeAccumulation>(grad_meta);
@@ -102,19 +100,19 @@ TEST(AccumulationNode, SelectedRowsMerge) {
   std::shared_ptr<phi::SelectedRows> sr0 =
       std::make_shared<phi::SelectedRows>(rows, 1);
   sr0->mutable_value()->Resize(common::make_ddim({1, 1}));
-  sr0->mutable_value()->mutable_data<float>(paddle::platform::CPUPlace())[0] =
+  sr0->mutable_value()->mutable_data<float>(phi::CPUPlace())[0] =
       static_cast<float>(10.0f);
   paddle::Tensor et0 = paddle::Tensor(sr0);
   std::shared_ptr<phi::SelectedRows> sr1 =
       std::make_shared<phi::SelectedRows>(rows, 1);
   sr1->mutable_value()->Resize(common::make_ddim({1, 1}));
-  sr1->mutable_value()->mutable_data<float>(paddle::platform::CPUPlace())[0] =
+  sr1->mutable_value()->mutable_data<float>(phi::CPUPlace())[0] =
       static_cast<float>(20.0f);
   paddle::Tensor et1 = paddle::Tensor(sr1);
   std::shared_ptr<phi::DenseTensor> input_dt =
       std::make_shared<phi::DenseTensor>(
           std::make_unique<paddle::experimental::DefaultAllocator>(
-              paddle::platform::CPUPlace())
+              phi::CPUPlace())
               .get(),
           meta);
   paddle::Tensor input_et = paddle::Tensor(input_dt);
@@ -123,8 +121,8 @@ TEST(AccumulationNode, SelectedRowsMerge) {
   std::shared_ptr<phi::SelectedRows> grad_dt =
       std::make_shared<phi::SelectedRows>(rows, 1);
   grad_dt->mutable_value()->Resize(common::make_ddim({1, 1}));
-  grad_dt->mutable_value()->mutable_data<float>(
-      paddle::platform::CPUPlace())[0] = static_cast<float>(0.0f);
+  grad_dt->mutable_value()->mutable_data<float>(phi::CPUPlace())[0] =
+      static_cast<float>(0.0f);
   grad_meta->MutableGrad()->set_impl(grad_dt);
   // AccumulationNode
   auto node = std::make_shared<GradNodeAccumulation>(grad_meta);
@@ -167,19 +165,19 @@ TEST(AccumulationNode, SelectedRowsAddTensor) {
   std::shared_ptr<phi::SelectedRows> sr0 =
       std::make_shared<phi::SelectedRows>(rows, 1);
   sr0->mutable_value()->Resize(common::make_ddim({1, 1}));
-  sr0->mutable_value()->mutable_data<float>(paddle::platform::CPUPlace())[0] =
+  sr0->mutable_value()->mutable_data<float>(phi::CPUPlace())[0] =
       static_cast<float>(10.0f);
   paddle::Tensor et0 = paddle::Tensor(sr0);
   std::shared_ptr<phi::SelectedRows> sr1 =
       std::make_shared<phi::SelectedRows>(rows, 1);
   sr1->mutable_value()->Resize(common::make_ddim({1, 1}));
-  sr1->mutable_value()->mutable_data<float>(paddle::platform::CPUPlace())[0] =
+  sr1->mutable_value()->mutable_data<float>(phi::CPUPlace())[0] =
       static_cast<float>(20.0f);
   paddle::Tensor et1 = paddle::Tensor(sr1);
   std::shared_ptr<phi::DenseTensor> input_dt =
       std::make_shared<phi::DenseTensor>(
           std::make_unique<paddle::experimental::DefaultAllocator>(
-              paddle::platform::CPUPlace())
+              phi::CPUPlace())
               .get(),
           meta);
   paddle::Tensor input_et = paddle::Tensor(input_dt);
@@ -188,11 +186,10 @@ TEST(AccumulationNode, SelectedRowsAddTensor) {
   std::shared_ptr<phi::DenseTensor> grad_dt =
       std::make_shared<phi::DenseTensor>(
           std::make_unique<paddle::experimental::DefaultAllocator>(
-              paddle::platform::CPUPlace())
+              phi::CPUPlace())
               .get(),
           meta);
-  grad_dt->mutable_data<float>(paddle::platform::CPUPlace())[0] =
-      static_cast<float>(0.0f);
+  grad_dt->mutable_data<float>(phi::CPUPlace())[0] = static_cast<float>(0.0f);
   grad_meta->MutableGrad()->set_impl(grad_dt);
   // AccumulationNode
   auto node = std::make_shared<GradNodeAccumulation>(grad_meta);
@@ -231,28 +228,26 @@ TEST(AccumulationNode, Tensor) {
   phi::DenseTensorMeta meta =
       phi::DenseTensorMeta(phi::DataType::FLOAT16, common::make_ddim({1, 1}));
   std::shared_ptr<phi::DenseTensor> dt0 = std::make_shared<phi::DenseTensor>(
-      std::make_unique<paddle::experimental::DefaultAllocator>(
-          paddle::platform::CPUPlace())
+      std::make_unique<paddle::experimental::DefaultAllocator>(phi::CPUPlace())
           .get(),
       meta);
-  dt0->mutable_data<paddle::platform::float16>(
-      paddle::platform::CPUPlace())[0] = paddle::platform::float16(10.0f);
+  dt0->mutable_data<paddle::platform::float16>(phi::CPUPlace())[0] =
+      paddle::platform::float16(10.0f);
   paddle::Tensor et0 = paddle::Tensor(dt0);
 
   std::shared_ptr<phi::DenseTensor> dt1 = std::make_shared<phi::DenseTensor>(
-      std::make_unique<paddle::experimental::DefaultAllocator>(
-          paddle::platform::CPUPlace())
+      std::make_unique<paddle::experimental::DefaultAllocator>(phi::CPUPlace())
           .get(),
       meta);
 
-  dt1->mutable_data<paddle::platform::float16>(
-      paddle::platform::CPUPlace())[0] = paddle::platform::float16(20.0f);
+  dt1->mutable_data<paddle::platform::float16>(phi::CPUPlace())[0] =
+      paddle::platform::float16(20.0f);
   paddle::Tensor et1 = paddle::Tensor(dt1);
 
   std::shared_ptr<phi::DenseTensor> input_dt =
       std::make_shared<phi::DenseTensor>(
           std::make_unique<paddle::experimental::DefaultAllocator>(
-              paddle::platform::CPUPlace())
+              phi::CPUPlace())
               .get(),
           meta);
   paddle::Tensor input_et = paddle::Tensor(input_dt);
@@ -262,11 +257,11 @@ TEST(AccumulationNode, Tensor) {
   std::shared_ptr<phi::DenseTensor> grad_dt =
       std::make_shared<phi::DenseTensor>(
           std::make_unique<paddle::experimental::DefaultAllocator>(
-              paddle::platform::CPUPlace())
+              phi::CPUPlace())
               .get(),
           meta);
-  grad_dt->mutable_data<paddle::platform::float16>(
-      paddle::platform::CPUPlace())[0] = paddle::platform::float16(0.0f);
+  grad_dt->mutable_data<paddle::platform::float16>(phi::CPUPlace())[0] =
+      paddle::platform::float16(0.0f);
   grad_meta->MutableGrad()->set_impl(grad_dt);
 
   // AccumulationNode
@@ -310,8 +305,7 @@ TEST(AccumulationNode, Tensor) {
   auto reduce_hook_1 = [&]() -> void {
     auto* input_et_ptr =
         std::dynamic_pointer_cast<phi::DenseTensor>(input_et.impl())
-            ->mutable_data<paddle::platform::float16>(
-                paddle::platform::CPUPlace());
+            ->mutable_data<paddle::platform::float16>(phi::CPUPlace());
     input_et_ptr[0] = 36.0;
     VLOG(6) << "Running Reduce Hook";
   };
@@ -335,9 +329,9 @@ TEST(AccumulationNode, Tensor) {
   // Reduce Hook case 2: Call RegisterReduceHook and ApplyReduceHooks directly
   VLOG(6) << "Test Reduce Hook";
   auto reduce_hook_2 = [&]() -> void {
-    auto* ret_et0_ptr = std::dynamic_pointer_cast<phi::DenseTensor>(et0.impl())
-                            ->mutable_data<paddle::platform::float16>(
-                                paddle::platform::CPUPlace());
+    auto* ret_et0_ptr =
+        std::dynamic_pointer_cast<phi::DenseTensor>(et0.impl())
+            ->mutable_data<paddle::platform::float16>(phi::CPUPlace());
     ret_et0_ptr[0] = 100.0;  // set to 100.0
     VLOG(6) << "Running Reduce Hook";
   };
 
@@ -42,11 +42,10 @@ TEST(AutogradMeta, MemberFunction) {
   phi::DenseTensorMeta meta =
       phi::DenseTensorMeta(phi::DataType::FLOAT32, common::make_ddim({1, 2}));
   std::shared_ptr<phi::DenseTensor> dt = std::make_shared<phi::DenseTensor>(
-      std::make_unique<paddle::experimental::DefaultAllocator>(
-          paddle::platform::CPUPlace())
+      std::make_unique<paddle::experimental::DefaultAllocator>(phi::CPUPlace())
           .get(),
       meta);
-  auto* dt_ptr = dt->mutable_data<float>(paddle::platform::CPUPlace());
+  auto* dt_ptr = dt->mutable_data<float>(phi::CPUPlace());
   dt_ptr[0] = 5.0f;
   dt_ptr[1] = 10.0f;
   grad_t->set_impl(dt);
 
@@ -39,11 +39,10 @@ TEST(Tensor, Constructor) {
   phi::DenseTensorMeta meta =
       phi::DenseTensorMeta(phi::DataType::FLOAT32, common::make_ddim({1, 2}));
   std::shared_ptr<phi::DenseTensor> dt = std::make_shared<phi::DenseTensor>(
-      std::make_unique<paddle::experimental::DefaultAllocator>(
-          paddle::platform::CPUPlace())
+      std::make_unique<paddle::experimental::DefaultAllocator>(phi::CPUPlace())
           .get(),
       meta);
-  auto* dt_ptr = dt->mutable_data<float>(paddle::platform::CPUPlace());
+  auto* dt_ptr = dt->mutable_data<float>(phi::CPUPlace());
   dt_ptr[0] = 5.0f;
   dt_ptr[1] = 10.0f;
   paddle::Tensor et3 = paddle::Tensor(dt);
@@ -69,11 +68,10 @@ TEST(Tensor, MemberFunction) {
   phi::DenseTensorMeta meta =
       phi::DenseTensorMeta(phi::DataType::FLOAT32, common::make_ddim({1, 2}));
   std::shared_ptr<phi::DenseTensor> dt = std::make_shared<phi::DenseTensor>(
-      std::make_unique<paddle::experimental::DefaultAllocator>(
-          paddle::platform::CPUPlace())
+      std::make_unique<paddle::experimental::DefaultAllocator>(phi::CPUPlace())
           .get(),
       meta);
-  auto* dt_ptr = dt->mutable_data<float>(paddle::platform::CPUPlace());
+  auto* dt_ptr = dt->mutable_data<float>(phi::CPUPlace());
   dt_ptr[0] = 5.0f;
   dt_ptr[1] = 10.0f;
   VLOG(6) << "Make Dense Tensor";
@@ -123,11 +121,10 @@ TEST(EagerVariable, Constructor) {
   phi::DenseTensorMeta meta =
       phi::DenseTensorMeta(phi::DataType::FLOAT32, common::make_ddim({1, 2}));
   std::shared_ptr<phi::DenseTensor> dt = std::make_shared<phi::DenseTensor>(
-      std::make_unique<paddle::experimental::DefaultAllocator>(
-          paddle::platform::CPUPlace())
+      std::make_unique<paddle::experimental::DefaultAllocator>(phi::CPUPlace())
           .get(),
       meta);
-  auto* dt_ptr = dt->mutable_data<float>(paddle::platform::CPUPlace());
+  auto* dt_ptr = dt->mutable_data<float>(phi::CPUPlace());
   dt_ptr[0] = 5.0f;
   dt_ptr[1] = 10.0f;
   VLOG(6) << "Make Dense Tensor";
@@ -162,7 +159,7 @@ TEST(EagerVariable, Constructor) {
       ->Resize(common::make_ddim(dims));
   auto* dt7_tmp_ptr = std::dynamic_pointer_cast<phi::SelectedRows>(t7.impl())
                           ->mutable_value()
-                          ->mutable_data<float>(paddle::platform::CPUPlace());
+                          ->mutable_data<float>(phi::CPUPlace());
   dt7_tmp_ptr[0] = 6.0f;
   dt7_tmp_ptr[1] = 11.0f;
 
@@ -172,8 +169,8 @@ TEST(EagerVariable, Constructor) {
   paddle::Tensor t6;
   paddle::Tensor t9;
   VLOG(6) << "Check Tensor Copy_ Selected Rows";
-  t8.copy_(t7, paddle::platform::CUDAPlace(0), false);
-  t9.copy_(t8, paddle::platform::CPUPlace(), false);
+  t8.copy_(t7, phi::GPUPlace(0), false);
+  t9.copy_(t8, phi::CPUPlace(), false);
   auto* dt9_tmp_ptr = std::dynamic_pointer_cast<phi::SelectedRows>(t9.impl())
                           ->value()
                           .data<float>();
@@ -183,14 +180,14 @@ TEST(EagerVariable, Constructor) {
            2);
 
   VLOG(6) << "Check Tensor Copy_ Dense Tensor";
-  t5.copy_(t3, paddle::platform::CUDAPlace(0), false);
-  t6.copy_(t5, paddle::platform::CPUPlace(), false);
+  t5.copy_(t3, phi::GPUPlace(0), false);
+  t6.copy_(t5, phi::CPUPlace(), false);
   auto* dt6_tmp_ptr =
       std::dynamic_pointer_cast<phi::DenseTensor>(t6.impl())->data<float>();
   CHECK_EQ(dt6_tmp_ptr[0], 5.0f);
   CHECK_EQ(dt6_tmp_ptr[1], 10.0f);
 #else
-  t5.copy_(t3, paddle::platform::CPUPlace(), false);
+  t5.copy_(t3, phi::CPUPlace(), false);
   auto* dt5_tmp_ptr =
       std::dynamic_pointer_cast<phi::DenseTensor>(t5.impl())->data<float>();
   CHECK_EQ(dt5_tmp_ptr[0], 5.0f);
@@ -207,11 +204,10 @@ TEST(EagerVariable, DataLayout) {
                            common::make_ddim({1, 1, 1, 1}),
                            phi::DataLayout::UNDEFINED);
   std::shared_ptr<phi::DenseTensor> dt = std::make_shared<phi::DenseTensor>(
-      std::make_unique<paddle::experimental::DefaultAllocator>(
-          paddle::platform::CPUPlace())
+      std::make_unique<paddle::experimental::DefaultAllocator>(phi::CPUPlace())
           .get(),
       meta);
-  auto* dt_ptr = dt->mutable_data<float>(paddle::platform::CPUPlace());
+  auto* dt_ptr = dt->mutable_data<float>(phi::CPUPlace());
   dt_ptr[0] = 5.0f;
   dt_ptr[1] = 5.0f;
   dt_ptr[2] = 5.0f;
 
@@ -39,11 +39,10 @@ void TestGradNodeBase(bool is_remove_gradient_hook) {
   phi::DenseTensorMeta meta =
       phi::DenseTensorMeta(phi::DataType::FLOAT32, common::make_ddim({1, 1}));
   std::shared_ptr<phi::DenseTensor> dt = std::make_shared<phi::DenseTensor>(
-      std::make_unique<paddle::experimental::DefaultAllocator>(
-          paddle::platform::CPUPlace())
+      std::make_unique<paddle::experimental::DefaultAllocator>(phi::CPUPlace())
           .get(),
       meta);
-  auto* dt_ptr = dt->mutable_data<float>(paddle::platform::CPUPlace());
+  auto* dt_ptr = dt->mutable_data<float>(phi::CPUPlace());
   dt_ptr[0] = 5.0f;
   paddle::Tensor et1(dt);
   grads = {{et1}};
@@ -90,10 +89,10 @@ void TestGradNodeBase(bool is_remove_gradient_hook) {
         phi::DenseTensorMeta(phi::DataType::FLOAT32, common::make_ddim({1, 1}));
     std::shared_ptr<phi::DenseTensor> dt = std::make_shared<phi::DenseTensor>(
         std::make_unique<paddle::experimental::DefaultAllocator>(
-            paddle::platform::CPUPlace())
+            phi::CPUPlace())
             .get(),
         meta);
-    auto* dt_ptr = dt->mutable_data<float>(paddle::platform::CPUPlace());
+    auto* dt_ptr = dt->mutable_data<float>(phi::CPUPlace());
     dt_ptr[0] = 6.0f;
     auto* et_ptr =
         std::dynamic_pointer_cast<phi::DenseTensor>(et.impl())->data<float>();
@@ -127,8 +126,7 @@ TEST(GradNodeInfo, Edge) {
   phi::DenseTensorMeta meta =
       phi::DenseTensorMeta(phi::DataType::FLOAT32, common::make_ddim({1, 1}));
   std::shared_ptr<phi::DenseTensor> dt = std::make_shared<phi::DenseTensor>(
-      std::make_unique<paddle::experimental::DefaultAllocator>(
-          paddle::platform::CPUPlace())
+      std::make_unique<paddle::experimental::DefaultAllocator>(phi::CPUPlace())
           .get(),
       meta);
   paddle::Tensor et1(dt);
 
@@ -41,10 +41,10 @@ class GradTestNode : public egr::GradNodeBase {
         phi::DenseTensorMeta(phi::DataType::FLOAT32, common::make_ddim({1, 1}));
     std::shared_ptr<phi::DenseTensor> dt = std::make_shared<phi::DenseTensor>(
         std::make_unique<paddle::experimental::DefaultAllocator>(
-            paddle::platform::CPUPlace())
+            phi::CPUPlace())
             .get(),
         meta);
-    auto* dt_ptr = dt->mutable_data<float>(paddle::platform::CPUPlace());
+    auto* dt_ptr = dt->mutable_data<float>(phi::CPUPlace());
     dt_ptr[0] = 6.0f;
     paddle::Tensor et1(dt);
     paddle::small_vector<std::vector<paddle::Tensor>, egr::kSlotSmallVectorSize>
 
@@ -39,8 +39,7 @@ TEST(GradTensorHolder, Constructor) {
   phi::DenseTensorMeta meta =
       phi::DenseTensorMeta(phi::DataType::FLOAT32, common::make_ddim({2, 2}));
   std::shared_ptr<phi::DenseTensor> dt = std::make_shared<phi::DenseTensor>(
-      std::make_unique<paddle::experimental::DefaultAllocator>(
-          paddle::platform::CPUPlace())
+      std::make_unique<paddle::experimental::DefaultAllocator>(phi::CPUPlace())
           .get(),
       meta);
   paddle::Tensor et = paddle::Tensor(dt);
@@ -57,19 +56,17 @@ TEST(GradTensorHolder, Interfaces) {
   phi::DenseTensorMeta meta =
       phi::DenseTensorMeta(phi::DataType::FLOAT32, common::make_ddim({1, 1}));
   std::shared_ptr<phi::DenseTensor> dt0 = std::make_shared<phi::DenseTensor>(
-      std::make_unique<paddle::experimental::DefaultAllocator>(
-          paddle::platform::CPUPlace())
+      std::make_unique<paddle::experimental::DefaultAllocator>(phi::CPUPlace())
           .get(),
       meta);
-  dt0->mutable_data<float>(paddle::platform::CPUPlace())[0] = 10.0;
+  dt0->mutable_data<float>(phi::CPUPlace())[0] = 10.0;
   paddle::Tensor et0 = paddle::Tensor(dt0);
 
   std::shared_ptr<phi::DenseTensor> dt1 = std::make_shared<phi::DenseTensor>(
-      std::make_unique<paddle::experimental::DefaultAllocator>(
-          paddle::platform::CPUPlace())
+      std::make_unique<paddle::experimental::DefaultAllocator>(phi::CPUPlace())
           .get(),
       meta);
-  dt1->mutable_data<float>(paddle::platform::CPUPlace())[0] = 20.0;
+  dt1->mutable_data<float>(phi::CPUPlace())[0] = 20.0;
   paddle::Tensor et1 = paddle::Tensor(dt1);
 
   // Constructor empty GradTensorHolder