PaddlePaddle
diff --git a/‎paddle/fluid/operators/beam_search_decode_op_xpu.h
Copy file name to clipboard
-171Lines changed: 0 additions & 171 deletions b/‎paddle/fluid/operators/beam_search_decode_op_xpu.h
Copy file name to clipboard
-171Lines changed: 0 additions & 171 deletions
diff --git a/‎test/xpu/cpp/beam_search_decode_op_xpu_test.cc
Copy file name to clipboard
+17-16Lines changed: 17 additions & 16 deletions b/‎test/xpu/cpp/beam_search_decode_op_xpu_test.cc
Copy file name to clipboard
+17-16Lines changed: 17 additions & 16 deletions
@@ -12,22 +12,23 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "paddle/fluid/operators/beam_search_decode_op_xpu.h"
 #include "paddle/phi/backends/xpu/xpu_info.h"
+#include "paddle/phi/common/memory_utils.h"
+#include "paddle/phi/kernels/funcs/beam_search_decode_xpu.h"
 
 #include "gtest/gtest.h"
 
 using CPUPlace = phi::CPUPlace;
 using XPUPlace = phi::XPUPlace;
-using LoD = paddle::framework::LoD;
+using LoD = phi::LoD;
 using LoDTensorArray = phi::TensorArray;
 
 template <typename T>
-using BeamSearchDecoder = paddle::operators::BeamSearchDecoder<T>;
+using BeamSearchDecoder = phi::funcs::BeamSearchDecoder<T>;
 template <typename T>
-using Sentence = paddle::operators::Sentence<T>;
+using Sentence = phi::funcs::Sentence<T>;
 template <typename T>
-using SentenceVector = paddle::operators::SentenceVector<T>;
+using SentenceVector = phi::funcs::SentenceVector<T>;
 
 namespace paddle {
 namespace test {
@@ -79,11 +80,11 @@ void GenerateXPUExample(const std::vector<size_t>& level_0,
   tensor_id.set_lod(lod);
 
   int64_t* id_ptr = tensor_id.mutable_data<int64_t>(xpu_place);
-  paddle::memory::Copy(phi::XPUPlace(XPU_PlaceNo),
-                       id_ptr,
-                       phi::CPUPlace(),
-                       id_cpu_ptr,
-                       tensor_id_cpu.numel() * sizeof(int64_t));
+  phi::memory_utils::Copy(phi::XPUPlace(XPU_PlaceNo),
+                          id_ptr,
+                          phi::CPUPlace(),
+                          id_cpu_ptr,
+                          tensor_id_cpu.numel() * sizeof(int64_t));
 
   // Scores
   phi::DenseTensor tensor_score_cpu;
@@ -123,11 +124,11 @@ void GenerateXPUExample(const std::vector<size_t>& level_0,
 
   T* score_ptr = tensor_score.mutable_data<T>(xpu_place);
 
-  paddle::memory::Copy(phi::XPUPlace(XPU_PlaceNo),
-                       score_ptr,
-                       phi::CPUPlace(),
-                       score_cpu_ptr,
-                       tensor_score_cpu.numel() * sizeof(T));
+  phi::memory_utils::Copy(phi::XPUPlace(XPU_PlaceNo),
+                          score_ptr,
+                          phi::CPUPlace(),
+                          score_cpu_ptr,
+                          tensor_score_cpu.numel() * sizeof(T));
 
   ids->push_back(tensor_id);
   scores->push_back(tensor_score);
@@ -177,7 +178,7 @@ void BeamSearchDecodeTestByXPUFrame() {
   phi::DenseTensor id_tensor_cpu;
   phi::DenseTensor score_tensor_cpu;
 
-  paddle::operators::BeamSearchDecodeXPUFunctor bs_xpu(
+  phi::funcs::BeamSearchDecodeXPUFunctor bs_xpu(
       ids, scores, &id_tensor_cpu, &score_tensor_cpu, 2, 1);
   bs_xpu.apply_xpu<T>();