Fix (#68785)

Author: co63oc

paddle/fluid/framework/operator.cc

@@ -25,7 +25,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/details/nan_inf_utils.h"
 #include "paddle/fluid/framework/op_call_stack.h"
 #include "paddle/fluid/framework/phi_utils.h"
-#include "paddle/fluid/framework/raw_tensor.h"
 #include "paddle/fluid/framework/transfer_scope_cache.h"
 #include "paddle/fluid/framework/unused_var_check.h"
 #include "paddle/fluid/framework/var_type.h"
@@ -42,6 +41,7 @@ limitations under the License. */
 #include "paddle/phi/core/kernel_factory.h"
 #include "paddle/phi/core/platform/device/device_wrapper.h"
 #include "paddle/phi/core/platform/profiler.h"
+#include "paddle/phi/core/raw_tensor.h"
 
 namespace phi {
 class DenseTensor;

paddle/fluid/framework/raw_tensor.h

@@ -14,12 +14,12 @@ limitations under the License. */
 
 #include "paddle/fluid/eager/eager_tensor.h"
 #include "paddle/fluid/framework/feed_fetch_type.h"
-#include "paddle/fluid/framework/raw_tensor.h"
 #include "paddle/fluid/pir/dialect/operator/ir/ir_selected_rows.h"
 #include "paddle/fluid/pir/dialect/operator/ir/ir_sparse_tensor.h"
 #include "paddle/fluid/pir/dialect/operator/ir/ir_tensor.h"
 #include "paddle/fluid/prim/utils/static/desc_tensor.h"
 #include "paddle/fluid/primitive/type/lazy_tensor.h"
+#include "paddle/phi/core/raw_tensor.h"
 #include "paddle/phi/core/vocab/string_array.h"
 
 namespace phi {

paddle/fluid/framework/type_info.cc

@@ -41,7 +41,7 @@
 #include "paddle/fluid/platform/device/xpu/bkcl_helper.h"
 #endif
 
-#include "paddle/fluid/framework/raw_tensor.h"
+#include "paddle/phi/core/raw_tensor.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/var_type_traits.cc

@@ -23,9 +23,9 @@
 
 #include "paddle/fluid/framework/feed_fetch_type.h"
 #include "paddle/fluid/framework/lod_tensor_array.h"
-#include "paddle/fluid/framework/raw_tensor.h"
 #include "paddle/fluid/framework/tensor_ref_array.h"
 #include "paddle/phi/common/place.h"
+#include "paddle/phi/core/raw_tensor.h"
 #include "paddle/phi/core/vocab/string_array.h"
 #include "paddle/utils/test_macros.h"
 #ifdef PADDLE_WITH_CUDA

paddle/fluid/framework/var_type_traits.h

@@ -11,8 +11,8 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/framework/operator.h"
-#include "paddle/fluid/framework/raw_tensor.h"
 #include "paddle/phi/core/kernel_registry.h"
+#include "paddle/phi/core/raw_tensor.h"
 #include "paddle/phi/core/tensor_utils.h"
 
 namespace paddle {

paddle/fluid/operators/controlflow/feed_op.cc

@@ -27,10 +27,10 @@ limitations under the License. */
 #include "paddle/fluid/framework/data_type_transform.h"
 #include "paddle/fluid/framework/lod_tensor.h"
 #include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/framework/raw_tensor.h"
 #include "paddle/phi/common/port.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/platform/device_context.h"
+#include "paddle/phi/core/raw_tensor.h"
 #include "paddle/phi/core/vocab/string_array.h"
 
 namespace paddle {

paddle/fluid/operators/save_combine_op.h

@@ -65,7 +65,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/op_version_registry.h"
 #include "paddle/fluid/framework/phi_utils.h"
 #include "paddle/fluid/framework/prune.h"
-#include "paddle/fluid/framework/raw_tensor.h"
 #include "paddle/fluid/framework/reader.h"
 #include "paddle/fluid/framework/scope_pool.h"
 #include "paddle/fluid/framework/selected_rows_utils.h"
@@ -79,6 +78,7 @@ limitations under the License. */
 #include "paddle/phi/common/bfloat16.h"
 #include "paddle/phi/common/float16.h"
 #include "paddle/phi/core/memory/allocation/allocator_strategy.h"
+#include "paddle/phi/core/raw_tensor.h"
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
 #include "paddle/phi/core/memory/allocation/auto_growth_best_fit_allocator_v2.h"
 #include "paddle/phi/core/memory/allocation/cuda_ipc_allocator.h"

paddle/fluid/pybind/pybind.cc

@@ -38,7 +38,7 @@
 #if defined(PADDLE_WITH_XPU_BKCL)
 #include "paddle/fluid/platform/device/xpu/bkcl_helper.h"
 #endif
-#include "paddle/fluid/framework/raw_tensor.h"
+#include "paddle/phi/core/raw_tensor.h"
 
 namespace paddle {
 namespace framework {