[Dy2St] Cleanup legacy OpMaker based run program op

paddle/fluid/operators/CMakeLists.txt

@@ -78,12 +78,10 @@ endif()
 
 set(OP_HEADER_DEPS ${OP_HEADER_DEPS} phi common phi_utils static_prim_api get_expected_kernel_func)
 
-register_operators(EXCLUDES py_func_op generated_op1 generated_op2 generated_op3 generated_op4 load_combine_op run_program_op quantize_linear_op
+register_operators(EXCLUDES py_func_op generated_op1 generated_op2 generated_op3 generated_op4 load_combine_op quantize_linear_op
         save_combine_op sync_batch_norm_op activation_op ${OP_MKL_DEPS} DEPS ${OP_HEADER_DEPS} processgroup_comm_utils)
 
 op_library(generated_op UNITY SRCS generated_op1.cc generated_op2.cc generated_op3.cc generated_op4.cc DEPS ${OP_HEADER_DEPS})
-op_library(run_program_op DEPS executor_cache ${OP_HEADER_DEPS})
-target_link_libraries(run_program_op phi common)
 op_library(quantize_linear_op DEPS phi common)
 op_library(save_combine_op DEPS phi)
 op_library(load_combine_op DEPS phi)

paddle/fluid/operators/unity_build_rule.cmake

@@ -216,7 +216,6 @@ register_unity_group(
   cc
   roi_align_op.cc
   roll_op.cc
-  run_program_op.cc
   sampling_id_op.cc
   save_combine_op.cc
   save_op.cc
@@ -317,7 +316,6 @@ register_unity_group(
   partial_concat_op.cc
   pyramid_hash_op.cc
   recurrent_op.cc
-  run_program_op.cc
   softmax_with_cross_entropy_op.cc
   warpctc_op.cc)
 register_unity_group(cc lstm_op.cu.cc rnn_op.cu.cc split_op.cu.cc
@@ -439,14 +437,8 @@ register_unity_group(
   pad3d_op.cu
   pad_constant_like_op.cu
   pad_op.cu)
-register_unity_group(
-  cu
-  partial_sum_op.cu
-  pixel_shuffle_op.cu
-  prelu_op.cu
-  run_program_op.cu
-  pull_box_extended_sparse_op.cu
-  pull_box_sparse_op.cu)
+register_unity_group(cu partial_sum_op.cu pixel_shuffle_op.cu prelu_op.cu
+                     pull_box_extended_sparse_op.cu pull_box_sparse_op.cu)
 register_unity_group(cu range_op.cu reverse_op.cu partial_concat_op.cu
                      kldiv_loss_op.cu instance_norm_op.cu)
 register_unity_group(

paddle/fluid/pybind/CMakeLists.txt

@@ -44,7 +44,8 @@ set(PYBIND_DEPS
     prim_utils
     detail_op_handle
     type_info
-    auto_parallel)
+    auto_parallel
+    executor_cache)
 
 if(WITH_GPU)
   list(APPEND PYBIND_DEPS gpu_event_timer)

paddle/fluid/pybind/eager_legacy_custom_python_api.h

@@ -43,8 +43,7 @@ static PyObject *eager_api_run_program(PyObject *self,  // TOREMOVE
       Out = GetTensorPtrListFromArgs("run_program", "Out", args, 2, true, mesh);
     }
     framework::AttributeMap attrs;
-    // TODO(zengjinle): support CUDA Graph on eager mode
-    ConstructAttrMapFromPyArgs(
+    ConstructAttrMapForLegacyRunProgram(
         "run_program", args, 5, PyTuple_GET_SIZE(args), attrs);
 
     tstate = PyEval_SaveThread();