Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into nested-namespace-part-1

Author: walkalone20

paddle/fluid/distributed/ps/table/common_graph_table.cc

@@ -3467,7 +3467,7 @@ int32_t GraphTable::Initialize(const GraphParameter &graph) {
           << ", graph_edges_split_only_by_src_id="
           << FLAGS_graph_edges_split_only_by_src_id;
   feat_id_map.resize(node_types.size());
-  for (int k = 0; k < edge_types.size(); k++) {
+  for (int k = 0; k < edge_types.size(); k++) {  // NOLINT
     VLOG(0) << "in initialize: get a edge_type " << edge_types[k];
     edge_to_id[edge_types[k]] = k;
     id_to_edge.push_back(edge_types[k]);

paddle/fluid/framework/CMakeLists.txt

@@ -882,21 +882,22 @@ target_link_libraries(
   conditional_block_op_helper
   pylayer_op_helper)
 
-cc_library(
-  parallel_executor
-  SRCS parallel_executor.cc
-  DEPS ssa_graph_executor graph build_strategy collective_helper
-       variable_helper)
-
 cc_library(
   compiled_program
   SRCS compiled_program.cc
-  DEPS graph build_strategy)
+  DEPS graph
+       build_strategy
+       reference_count_pass
+       eager_deletion_pass
+       buffer_shared_inplace_op_pass
+       buffer_shared_cross_op_memory_reuse_pass
+       inplace_addto_op_pass
+       set_reader_device_info_utils)
 
 cc_library(
   executor_cache
   SRCS executor_cache.cc
-  DEPS parallel_executor pir_transforms pir)
+  DEPS pir_transforms pir)
 cc_library(
   prune
   SRCS prune.cc
@@ -962,7 +963,8 @@ cc_library(
        phi
        common
        imperative_flag
-       layer)
+       layer
+       op_dialect_vjp)
 
 cc_library(
   type_info

paddle/fluid/framework/details/CMakeLists.txt

@@ -7,12 +7,6 @@ if(WITH_PSCORE)
   endif()
   set_source_files_properties(
     reduce_op_handle.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
-  set_source_files_properties(
-    threaded_ssa_graph_executor.cc PROPERTIES COMPILE_FLAGS
-                                              ${DISTRIBUTE_COMPILE_FLAGS})
-  set_source_files_properties(
-    async_ssa_graph_executor.cc PROPERTIES COMPILE_FLAGS
-                                           ${DISTRIBUTE_COMPILE_FLAGS})
 endif()
 
 set(op_handle_srcs
@@ -81,36 +75,6 @@ endif()
 
 add_dependencies(detail_op_handle framework_proto auto_parallel_proto xxhash)
 
-set(ssa_graph_executor_srcs
-    ssa_graph_executor.cc
-    threaded_ssa_graph_executor.cc
-    parallel_ssa_graph_executor.cc
-    async_ssa_graph_executor.cc
-    bind_threaded_ssa_graph_executor.cc
-    fast_threaded_ssa_graph_executor.cc
-    scope_buffered_ssa_graph_executor.cc
-    scope_buffered_monitor.cc)
-set(SSA_GRAPH_EXECUTOR_DEPS
-    graph
-    framework_proto
-    detail_op_handle
-    reference_count_pass
-    eager_deletion_pass
-    buffer_shared_inplace_op_pass
-    buffer_shared_cross_op_memory_reuse_pass
-    inplace_addto_op_pass
-    set_reader_device_info_utils
-    scope
-    simple_threadpool
-    device_context
-    profiler
-    selected_rows_utils)
-
-cc_library(
-  ssa_graph_executor
-  SRCS ${ssa_graph_executor_srcs}
-  DEPS ${SSA_GRAPH_EXECUTOR_DEPS})
-
 set(IR_PASS_DEPS
     graph_viz_pass
     multi_devices_graph_pass