Fix

Author: co63oc

paddle/fluid/distributed/collective/CMakeLists.txt

@@ -22,7 +22,6 @@ if(WITH_NCCL OR WITH_RCCL)
     DEPS process_group
          phi
          common
-         place
          enforce
          collective_helper
          device_context
@@ -31,21 +30,15 @@ if(WITH_NCCL OR WITH_RCCL)
   cc_library(
     async_load
     SRCS async_load.cc
-    DEPS device_context place ${DEVICE_EVENT_LIBS})
+    DEPS device_context phi common ${DEVICE_EVENT_LIBS})
 
 endif()
 
 if(WITH_XPU_BKCL)
   cc_library(
     process_group_bkcl
     SRCS process_group_bkcl.cc bkcl_tools.cc common.cc
-    DEPS process_group
-         phi
-         common
-         place
-         enforce
-         collective_helper
-         device_context)
+    DEPS process_group phi common enforce collective_helper device_context)
 endif()
 
 if(WITH_MPI)
@@ -59,13 +52,7 @@ if(WITH_CUSTOM_DEVICE)
   cc_library(
     process_group_custom
     SRCS process_group_custom.cc custom_ccl_tools.cc common.cc
-    DEPS process_group
-         phi
-         common
-         place
-         enforce
-         collective_helper
-         device_context)
+    DEPS process_group phi common enforce collective_helper device_context)
 endif()
 
 set(COMM_UTILS_DEPS process_group)

paddle/fluid/eager/api/utils/CMakeLists.txt

@@ -1,7 +1,7 @@
 cc_library(
   global_utils
   SRCS global_utils.cc
-  DEPS place tracer)
+  DEPS phi common tracer)
 
 if(NOT (NOT WITH_PYTHON AND ON_INFER))
   cc_library(

paddle/fluid/framework/CMakeLists.txt

@@ -123,12 +123,12 @@ cc_library(
 cc_library(
   tensor
   SRCS tensor_util.cc
-  DEPS place fluid_memory data_type device_context phi common)
+  DEPS fluid_memory data_type device_context phi common)
 
 cc_library(
   lod_tensor
   SRCS lod_tensor.cc
-  DEPS phi common place tensor framework_proto version)
+  DEPS phi common tensor framework_proto version)
 
 cc_library(
   garbage_collector
@@ -290,15 +290,14 @@ cc_library(
 cc_library(
   op_kernel_type
   SRCS op_kernel_type.cc
-  DEPS device_context place)
+  DEPS device_context phi common)
 
 if(WITH_XPU)
   cc_library(
     phi_utils
     SRCS phi_utils.cc
     DEPS lod_tensor
          selected_rows_utils
-         place
          phi
          common
          var_type_traits
@@ -308,13 +307,7 @@ else()
   cc_library(
     phi_utils
     SRCS phi_utils.cc
-    DEPS lod_tensor
-         selected_rows_utils
-         place
-         phi
-         common
-         var_type_traits
-         op_info)
+    DEPS lod_tensor selected_rows_utils phi common var_type_traits op_info)
 endif()
 
 if(WITH_XPU)
@@ -920,7 +913,6 @@ cc_library(
   DEPS lod_tensor
        selected_rows_utils
        attribute
-       place
        var_type_traits
        phi
        common

paddle/fluid/framework/details/CMakeLists.txt

@@ -11,7 +11,8 @@ set(op_handle_srcs
 set(op_handle_deps
     pass
     operator
-    place
+    phi
+    common
     framework_proto
     node
     device_context

paddle/fluid/imperative/CMakeLists.txt

@@ -22,8 +22,7 @@ if(WITH_XPU)
          phi
          common
          var_helper
-         profiler
-         place)
+         profiler)
 else()
   cc_library(
     prepared_operator
@@ -39,8 +38,7 @@ else()
          phi
          common
          var_helper
-         profiler
-         place)
+         profiler)
 endif()
 cc_library(
   layer

paddle/fluid/memory/CMakeLists.txt

@@ -7,7 +7,7 @@ if(WITH_ONEDNN)
 else()
   set(ONEDNN_CTX_DEPS)
 endif()
-set(fluid_memory_deps place enforce common allocator ${ONEDNN_CTX_DEPS})
+set(fluid_memory_deps phi enforce common allocator ${ONEDNN_CTX_DEPS})
 
 cc_library(
   fluid_memory

paddle/fluid/memory/allocation/CMakeLists.txt

@@ -1,6 +1,6 @@
 include(ExternalProject)
 
-set(ALLOCATOR_DEPS place profiler phi common device_context)
+set(ALLOCATOR_DEPS profiler phi common device_context)
 set(ALLOCATOR_SRCS
     allocator.cc
     cpu_allocator.cc

paddle/fluid/platform/CMakeLists.txt

@@ -32,14 +32,10 @@ cc_test(
   SRCS os_info_test.cc
   DEPS phi common)
 
-cc_library(
-  place
-  SRCS place.cc
-  DEPS enforce phi common)
 cc_test(
   place_test
   SRCS place_test.cc
-  DEPS place glog phi common)
+  DEPS glog phi common)
 
 if(WITH_ONEDNN)
   set(ONEDNN_CTX_DEPS onednn)
@@ -120,7 +116,6 @@ cc_library(
        allocator
        xxhash
        ${STREAM_CALLBACK_DEPS}
-       place
        eigen3
        cpu_helper
        framework_proto
@@ -160,7 +155,7 @@ set(DEVICE_EVENT_LIBS)
 cc_library(
   device_event_base
   SRCS device_event_base.cc
-  DEPS place enforce device_context op_registry common)
+  DEPS enforce device_context op_registry phi common)
 set(DEVICE_EVENT_LIBS
     device_event_base
     CACHE INTERNAL "device event libs")
@@ -247,7 +242,6 @@ cc_library(
   SRCS lodtensor_printer.cc
   DEPS phi
        common
-       place
        tensor
        scope
        lod_tensor

paddle/fluid/platform/device/xpu/CMakeLists.txt

@@ -18,7 +18,6 @@ cc_library(
        enforce
        xpulib
        device_context
-       place
        phi
        common
        dynload_xpti)