[cmake治理]cmake optimization of fluid/framework/new_executor (#60167)

risemeup1 · web-flow · commit beffc129387f · 2023-12-23T00:51:29.000+08:00
* cmake optimization of fluid/framework/new_executor

* cmake optimization of fluid/framework/new_executor

* cmake optimization of fluid/framework/new_executor

* cmake optimization of fluid/framework/new_executor

* cmake optimization of fluid/framework/new_executor

* cmake optimization of fluid/framework/new_executor

* cmake optimization of fluid/framework/new_executor

* cmake optimization of fluid/framework/new_executor

* fix compile bug

* fix bug

* fix bug

* fix bug

* fix bug

* change new_executor to standalone_executor
diff --git a/paddle/fluid/distributed/fleet_executor/CMakeLists.txt b/paddle/fluid/distributed/fleet_executor/CMakeLists.txt
@@ -35,7 +35,6 @@ cc_library(
        dist_model_tensor_wrapper.cc
   DEPS naive_executor
        proto_desc
-       standalone_executor
        fleet_executor_desc_proto
        interceptor_message_proto
        task_loop_thread_pool
diff --git a/paddle/fluid/framework/CMakeLists.txt b/paddle/fluid/framework/CMakeLists.txt
@@ -530,7 +530,6 @@ set(NAIVE_EXECUTOR_DEPS
     lod_rank_table
     feed_fetch_method
     graph_to_program_pass
-    standalone_executor
     variable_helper)
 
 if(TENSORRT_FOUND)
@@ -888,7 +887,7 @@ cc_library(
 cc_library(
   executor_cache
   SRCS executor_cache.cc
-  DEPS parallel_executor standalone_executor pir_transforms pir)
+  DEPS parallel_executor pir_transforms pir)
 cc_library(
   prune
   SRCS prune.cc
diff --git a/paddle/fluid/framework/new_executor/CMakeLists.txt b/paddle/fluid/framework/new_executor/CMakeLists.txt
@@ -1,30 +1,50 @@
-add_subdirectory(garbage_collector)
-add_subdirectory(instruction)
-add_subdirectory(interpreter)
-add_subdirectory(workqueue)
-add_subdirectory(pir_adaptor)
-
-set(STANDALONE_EXECUTOR_SRCS
-    feed_fetch_utils.cc interpretercore.cc new_executor_defs.cc
-    standalone_executor.cc program_interpreter.cc pir_interpreter.cc)
-
-set(STANDALONE_EXECUTOR_DEPS
-    interpreter
-    interpretercore_garbage_collector
-    workqueue
-    op_dialect_vjp
-    pir_transforms
-    pir_adaptor
+file(GLOB_RECURSE standalone_executor_srcs "*.cc")
+
+if(NOT (WITH_CINN AND NOT CINN_ONLY))
+  list(REMOVE_ITEM standalone_executor_srcs
+       ${CMAKE_CURRENT_SOURCE_DIR}/instruction/cinn_jit_instruction.cc)
+endif()
+
+set(standalone_executor_deps
+    pir
     program_translator
-    instruction_base
-    pir)
+    op_dialect_vjp
+    global_utils
+    buffered_reader
+    framework_io
+    garbage_collector
+    executor_gc_helper
+    device_event_base
+    framework_proto)
+
+if(WITH_CINN AND NOT CINN_ONLY)
+  set(standalone_executor_deps
+      ${standalone_executor_deps}
+      cinn_runtime_dialect
+      phi
+      common
+      cinnapi
+      device_context
+      op_registry
+      ${DEVICE_EVENT_LIBS})
+endif()
+
+if(WITH_CUSTOM_DEVICE)
+  set(standalone_executor_deps ${standalone_executor_deps}
+                               device_event_custom_device)
+endif()
+
+if(WITH_GPU)
+  set(standalone_executor_deps ${standalone_executor_deps} device_event_gpu)
+endif()
 
 cc_library(
   standalone_executor
-  SRCS ${STANDALONE_EXECUTOR_SRCS}
-  DEPS ${STANDALONE_EXECUTOR_DEPS})
+  SRCS ${standalone_executor_srcs}
+  DEPS ${standalone_executor_deps})
 
-cc_library(
-  staticgraph_executor_statistics
-  SRCS executor_statistics.cc
-  DEPS enforce glog phi common)
+add_dependencies(standalone_executor xxhash framework_proto)
+
+if(WITH_MKLDNN)
+  add_dependencies(standalone_executor mkldnn)
+endif()
diff --git a/paddle/fluid/framework/new_executor/garbage_collector/CMakeLists.txt b/paddle/fluid/framework/new_executor/garbage_collector/CMakeLists.txt
diff --git a/paddle/fluid/framework/new_executor/instruction/CMakeLists.txt b/paddle/fluid/framework/new_executor/instruction/CMakeLists.txt
diff --git a/paddle/fluid/framework/new_executor/interpreter/CMakeLists.txt b/paddle/fluid/framework/new_executor/interpreter/CMakeLists.txt
diff --git a/paddle/fluid/framework/new_executor/pir_adaptor/CMakeLists.txt b/paddle/fluid/framework/new_executor/pir_adaptor/CMakeLists.txt
diff --git a/paddle/fluid/framework/new_executor/workqueue/CMakeLists.txt b/paddle/fluid/framework/new_executor/workqueue/CMakeLists.txt
diff --git a/paddle/fluid/operators/cinn/CMakeLists.txt b/paddle/fluid/operators/cinn/CMakeLists.txt
@@ -16,7 +16,6 @@ cc_library(
        build_strategy
        device_context
        parallel_executor
-       standalone_executor
        cinnapi)
 
 set(CINN_OP_DEPS parallel_executor string_helper variable_helper cinnapi
diff --git a/paddle/fluid/operators/controlflow/CMakeLists.txt b/paddle/fluid/operators/controlflow/CMakeLists.txt
@@ -3,8 +3,7 @@ if(WITH_UNITY_BUILD)
   # Load Unity Build rules for operators in paddle/fluid/operators/controlflow.
   include(unity_build_rule.cmake)
 endif()
-register_operators(EXCLUDES conditional_block_op pylayer_op DEPS naive_executor
-                   standalone_executor)
+register_operators(EXCLUDES conditional_block_op pylayer_op DEPS naive_executor)
 
 cc_library(
   conditional_block_op
diff --git a/paddle/fluid/pir/transforms/CMakeLists.txt b/paddle/fluid/pir/transforms/CMakeLists.txt
@@ -9,7 +9,8 @@ if(NOT WITH_CINN)
     ${CMAKE_CURRENT_SOURCE_DIR}/shape_optimization_pass.cc)
 endif()
 
-set(transforms_deps drr op_dialect op_dialect_vjp standalone_executor pir)
+set(transforms_deps drr op_dialect op_dialect_vjp standalone_executor pir
+                    device_event_base)
 
 if(WITH_CINN)
   set(transforms_deps ${transforms_deps} cinn_op_dialect cinnapi)
diff --git a/paddle/fluid/platform/CMakeLists.txt b/paddle/fluid/platform/CMakeLists.txt
@@ -269,36 +269,23 @@ if(WITH_GPU)
          gpu_info
          enforce
          dynload_cuda
-         new_profiler
          op_proto_maker
          shape_inference)
 elseif(WITH_ROCM)
   hip_library(
     profiler
     SRCS profiler.cc profiler.cu
-    DEPS phi
-         common
-         gpu_info
-         enforce
-         new_profiler
-         op_proto_maker
-         shape_inference)
+    DEPS phi common gpu_info enforce op_proto_maker shape_inference)
 elseif(WITH_XPU)
   cc_library(
     profiler
     SRCS profiler.cc
-    DEPS phi
-         common
-         enforce
-         dynload_xpti
-         new_profiler
-         op_proto_maker
-         shape_inference)
+    DEPS phi common enforce dynload_xpti op_proto_maker shape_inference)
 else()
   cc_library(
     profiler
     SRCS profiler.cc
-    DEPS phi common enforce new_profiler op_proto_maker shape_inference)
+    DEPS phi common enforce op_proto_maker shape_inference)
 endif()
 
 cc_test(
diff --git a/paddle/fluid/platform/profiler/CMakeLists.txt b/paddle/fluid/platform/profiler/CMakeLists.txt
@@ -5,7 +5,7 @@ cc_library(
 cc_library(
   cuda_tracer
   SRCS cuda_tracer.cc cupti_data_process.cc
-  DEPS workqueue enforce glog common)
+  DEPS standalone_executor enforce glog common)
 cc_library(
   xpu_tracer
   SRCS xpu_tracer.cc
diff --git a/paddle/fluid/pybind/CMakeLists.txt b/paddle/fluid/pybind/CMakeLists.txt
@@ -4,7 +4,7 @@ set(PYBIND_DEPS
     pybind
     python
     proto_desc
-    staticgraph_executor_statistics
+    standalone_executor
     executor
     fleet_wrapper
     box_wrapper
@@ -39,7 +39,6 @@ set(PYBIND_DEPS
     phi_utils
     phi
     op_dialect_vjp
-    pir_adaptor
     program_translator
     pir_transforms
     new_profiler
@@ -500,8 +499,6 @@ if(WITH_PYTHON)
                       DEPENDS ${eager_impl_file})
   endif()
 
-  list(APPEND PYBIND_DEPS standalone_executor staticgraph_executor_statistics)
-
   if(NOT ((NOT WITH_PYTHON) AND ON_INFER))
     set(PYBIND_SRCS eager.cc ${PYBIND_SRCS})
     set(PYBIND_SRCS eager_functions.cc ${PYBIND_SRCS})
diff --git a/paddle/fluid/sub_graph/CMakeLists.txt b/paddle/fluid/sub_graph/CMakeLists.txt
@@ -2,5 +2,5 @@ if(WITH_CINN)
   cc_library(
     sub_graph_checker
     SRCS sub_graph_checker.cc
-    DEPS op_dialect standalone_executor pir cinn_op_dialect cinnapi)
+    DEPS op_dialect pir cinn_op_dialect cinnapi)
 endif()
diff --git a/test/cpp/fluid/controlflow/CMakeLists.txt b/test/cpp/fluid/controlflow/CMakeLists.txt
@@ -1,4 +1,4 @@
 cc_test(
   conditional_block_op_test
   SRCS conditional_block_op_test.cc
-  DEPS conditional_block_op standalone_executor executor)
+  DEPS conditional_block_op executor)
diff --git a/test/cpp/pir/control_flow_dialect/CMakeLists.txt b/test/cpp/pir/control_flow_dialect/CMakeLists.txt
@@ -7,5 +7,5 @@ if(NOT WITH_ROCM)
   cc_test(
     while_op_test
     SRCS while_op_test.cc
-    DEPS pir op_dialect_vjp pir_transforms op_dialect gtest)
+    DEPS pir op_dialect_vjp pir_transforms op_dialect gtest device_event_base)
 endif()
