PaddlePaddle
diff --git a/‎test/cpp/eager/performance_tests/benchmark_fluid_cpu.cc
Copy file name to clipboard
+6-7Lines changed: 6 additions & 7 deletions b/‎test/cpp/eager/performance_tests/benchmark_fluid_cpu.cc
Copy file name to clipboard
+6-7Lines changed: 6 additions & 7 deletions
diff --git a/‎test/cpp/eager/performance_tests/benchmark_fluid_cuda.cc
Copy file name to clipboard
+9-10Lines changed: 9 additions & 10 deletions b/‎test/cpp/eager/performance_tests/benchmark_fluid_cuda.cc
Copy file name to clipboard
+9-10Lines changed: 9 additions & 10 deletions
diff --git a/‎test/cpp/fluid/framework/copy_same_tensor_test.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎test/cpp/fluid/framework/copy_same_tensor_test.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎test/cpp/fluid/framework/details/build_strategy_test.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎test/cpp/fluid/framework/details/build_strategy_test.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎test/cpp/fluid/framework/dlpack_tensor_test.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎test/cpp/fluid/framework/dlpack_tensor_test.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎test/cpp/fluid/framework/ir/memory_optimize_pass/test_reference_count_pass_last_lived_ops.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎test/cpp/fluid/framework/ir/memory_optimize_pass/test_reference_count_pass_last_lived_ops.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎test/cpp/fluid/framework/lod_tensor_test.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎test/cpp/fluid/framework/lod_tensor_test.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎test/cpp/fluid/framework/op_registry_test.cc
Copy file name to clipboard
+2-4Lines changed: 2 additions & 4 deletions b/‎test/cpp/fluid/framework/op_registry_test.cc
Copy file name to clipboard
+2-4Lines changed: 2 additions & 4 deletions
diff --git a/‎test/cpp/fluid/framework/operator_test.cc
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions b/‎test/cpp/fluid/framework/operator_test.cc
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎test/cpp/fluid/framework/var_type_inference_test.cc
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions b/‎test/cpp/fluid/framework/var_type_inference_test.cc
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
@@ -60,15 +60,14 @@ TEST(Benchmark, FluidScaleCPU) {
                          sizeof(float) * src_data.size());
 
     if (mode == "Accuracy") {
-      benchmark_fluid_scale(
-          X, platform::Place(place), true /* accuracy_check */);
+      benchmark_fluid_scale(X, phi::Place(place), true /* accuracy_check */);
 
     } else if (mode == "Performance") {
       auto t_start = std::chrono::high_resolution_clock::now();
 #ifdef WITH_GPERFTOOLS
       ProfilerStart("fluid_scale_cpu.out");
 #endif
-      benchmark_fluid_scale(X, platform::Place(place));
+      benchmark_fluid_scale(X, phi::Place(place));
 
 #ifdef WITH_GPERFTOOLS
       ProfilerStop();
@@ -119,14 +118,14 @@ TEST(Benchmark, FluidMatmulCPU) {
 
     if (mode == "Accuracy") {
       benchmark_fluid_matmul(
-          X, Y, platform::Place(place), true /* accuracy_check */);
+          X, Y, phi::Place(place), true /* accuracy_check */);
 
     } else if (mode == "Performance") {
       auto t_start = std::chrono::high_resolution_clock::now();
 #ifdef WITH_GPERFTOOLS
       ProfilerStart("fluid_matmul_cpu.out");
 #endif
-      benchmark_fluid_matmul(X, Y, platform::Place(place));
+      benchmark_fluid_matmul(X, Y, phi::Place(place));
 
 #ifdef WITH_GPERFTOOLS
       ProfilerStop();
@@ -203,14 +202,14 @@ TEST(Benchmark, FluidMLPCPU) {
 
     if (mode == "Accuracy") {
       benchmark_fluid_mlp(
-          X, Ws, Bs, platform::Place(place), true /* accuracy_check */);
+          X, Ws, Bs, phi::Place(place), true /* accuracy_check */);
 
     } else if (mode == "Performance") {
       auto t_start = std::chrono::high_resolution_clock::now();
 #ifdef WITH_GPERFTOOLS
       ProfilerStart("fluid_mlp_cpu.out");
 #endif
-      benchmark_fluid_mlp(X, Ws, Bs, platform::Place(place));
+      benchmark_fluid_mlp(X, Ws, Bs, phi::Place(place));
 
 #ifdef WITH_GPERFTOOLS
       ProfilerStop();
 
@@ -66,18 +66,17 @@ TEST(Benchmark, FluidScaleCUDA) {
                          stream);
 
     if (mode == "Accuracy") {
-      benchmark_fluid_scale(
-          X, platform::Place(place), true /* accuracy_check */);
+      benchmark_fluid_scale(X, phi::Place(place), true /* accuracy_check */);
 
     } else if (mode == "WarmUp") {
-      benchmark_fluid_scale(X, platform::Place(place));
+      benchmark_fluid_scale(X, phi::Place(place));
 
     } else if (mode == "Performance") {
       auto t_start = std::chrono::high_resolution_clock::now();
 #ifdef WITH_GPERFTOOLS
       ProfilerStart("fluid_scale_cuda.out");
 #endif
-      benchmark_fluid_scale(X, platform::Place(place));
+      benchmark_fluid_scale(X, phi::Place(place));
 
 #ifdef WITH_GPERFTOOLS
       ProfilerStop();
@@ -134,17 +133,17 @@ TEST(Benchmark, FluidMatmulCUDA) {
 
     if (mode == "Accuracy") {
       benchmark_fluid_matmul(
-          X, Y, platform::Place(place), true /* accuracy_check */);
+          X, Y, phi::Place(place), true /* accuracy_check */);
 
     } else if (mode == "WarmUp") {
-      benchmark_fluid_matmul(X, Y, platform::Place(place));
+      benchmark_fluid_matmul(X, Y, phi::Place(place));
 
     } else if (mode == "Performance") {
       auto t_start = std::chrono::high_resolution_clock::now();
 #ifdef WITH_GPERFTOOLS
       ProfilerStart("fluid_matmul_cuda.out");
 #endif
-      benchmark_fluid_matmul(X, Y, platform::Place(place));
+      benchmark_fluid_matmul(X, Y, phi::Place(place));
 
 #ifdef WITH_GPERFTOOLS
       ProfilerStop();
@@ -227,17 +226,17 @@ TEST(Benchmark, FluidMLPCUDA) {
 
     if (mode == "Accuracy") {
       benchmark_fluid_mlp(
-          X, Ws, Bs, platform::Place(place), true /* accuracy_check */);
+          X, Ws, Bs, phi::Place(place), true /* accuracy_check */);
 
     } else if (mode == "WarmUp") {
-      benchmark_fluid_mlp(X, Ws, Bs, platform::Place(place));
+      benchmark_fluid_mlp(X, Ws, Bs, phi::Place(place));
 
     } else if (mode == "Performance") {
       auto t_start = std::chrono::high_resolution_clock::now();
 #ifdef WITH_GPERFTOOLS
       ProfilerStart("fluid_mlp_cuda.out");
 #endif
-      benchmark_fluid_mlp(X, Ws, Bs, platform::Place(place));
+      benchmark_fluid_mlp(X, Ws, Bs, phi::Place(place));
 
 #ifdef WITH_GPERFTOOLS
       ProfilerStop();
 
@@ -29,8 +29,8 @@ PD_DECLARE_bool(use_system_allocator);
 namespace paddle {
 namespace framework {
 
-static std::vector<platform::Place> CreatePlaceList() {
-  std::vector<platform::Place> places;
+static std::vector<phi::Place> CreatePlaceList() {
+  std::vector<phi::Place> places;
   places.emplace_back(phi::CPUPlace());
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
   places.emplace_back(phi::GPUPlace(0));
 
@@ -68,8 +68,8 @@ namespace paddle {
 namespace framework {
 namespace details {
 
-static std::vector<platform::Place> CreatePlaces(size_t num, bool use_cuda) {
-  std::vector<platform::Place> result;
+static std::vector<phi::Place> CreatePlaces(size_t num, bool use_cuda) {
+  std::vector<phi::Place> result;
   result.reserve(num);
   for (size_t i = 0; i < num; ++i) {
     if (use_cuda) {
 
@@ -109,13 +109,13 @@ void TestToDLManagedTensor(const phi::Place &place, uint16_t lanes) {
 template <typename T>
 void TestMainLoop() {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
-  std::vector<platform::Place> places{
+  std::vector<phi::Place> places{
       phi::CPUPlace(), phi::GPUPlace(0), phi::GPUPinnedPlace()};
   if (platform::GetGPUDeviceCount() > 1) {
     places.emplace_back(phi::GPUPlace(1));
   }
 #else
-  std::vector<platform::Place> places{phi::CPUPlace()};
+  std::vector<phi::Place> places{phi::CPUPlace()};
 #endif
   std::vector<uint16_t> lanes{1, 2};
   for (auto &p : places) {
 
@@ -29,8 +29,8 @@ namespace paddle {
 namespace framework {
 namespace p = paddle::platform;
 
-static std::vector<platform::Place> CreatePlaces(size_t num, bool use_cuda) {
-  std::vector<platform::Place> result;
+static std::vector<phi::Place> CreatePlaces(size_t num, bool use_cuda) {
+  std::vector<phi::Place> result;
   result.reserve(num);
   for (size_t i = 0; i < num; ++i) {
     if (use_cuda) {
 
@@ -140,7 +140,7 @@ TEST(LoD, SplitLoDTensor) {
   }
   lod_tensor.set_lod(lod);
 
-  std::vector<platform::Place> places{phi::CPUPlace(), phi::CPUPlace()};
+  std::vector<phi::Place> places{phi::CPUPlace(), phi::CPUPlace()};
   LoD lod0;
   lod0.push_back(std::vector<size_t>({0, 2, 4}));
   lod0.push_back(std::vector<size_t>({0, 1, 6, 8, 13}));
@@ -163,7 +163,7 @@ TEST(LoD, SplitLoDTensorWithZeroBatchSize) {
   lod_tensor.mutable_data<float>(place);
   lod_tensor.set_lod(lod);
 
-  std::vector<platform::Place> places{phi::CPUPlace(), phi::CPUPlace()};
+  std::vector<phi::Place> places{phi::CPUPlace(), phi::CPUPlace()};
   LoD lod_res;
   lod_res.push_back(std::vector<size_t>({0}));
 
 
@@ -25,8 +25,7 @@ class CosineOp : public OperatorBase {
   using OperatorBase::OperatorBase;
 
  private:
-  void RunImpl(const Scope& scope,
-               const platform::Place& place) const override {}
+  void RunImpl(const Scope& scope, const phi::Place& place) const override {}
 };
 
 class CosineOpProtoAndCheckerMaker : public OpProtoAndCheckerMaker {
@@ -46,8 +45,7 @@ class MyTestOp : public OperatorBase {
   using OperatorBase::OperatorBase;
 
  private:
-  void RunImpl(const Scope& scope,
-               const platform::Place& place) const override {}
+  void RunImpl(const Scope& scope, const phi::Place& place) const override {}
 };
 
 class MyTestOpProtoAndCheckerMaker : public OpProtoAndCheckerMaker {
 
@@ -35,8 +35,7 @@ class OpWithoutKernelTest : public OperatorBase {
       : OperatorBase(type, inputs, outputs, attrs), x(1) {}
 
  private:
-  void RunImpl(const Scope& scope,
-               const platform::Place& place) const override {
+  void RunImpl(const Scope& scope, const phi::Place& place) const override {
     ++op_run_num;
     ASSERT_EQ(static_cast<int>(inputs_.size()), 1);
     ASSERT_EQ(static_cast<int>(outputs_.size()), 1);
 
@@ -35,8 +35,7 @@ class NOP : public OperatorBase {
       : OperatorBase(type, inputs, outputs, attrs) {}
 
  private:
-  void RunImpl(const Scope& scope,
-               const platform::Place& place) const override {}
+  void RunImpl(const Scope& scope, const phi::Place& place) const override {}
 };
 
 class SumOpMaker : public OpProtoAndCheckerMaker {