【Hackathon 6th Fundable Projects 3 No.300】recurrent (#64545)

paddle/fluid/framework/CMakeLists.txt

@@ -550,7 +550,6 @@ cc_library(
   executor_gc_helper
   SRCS executor_gc_helper.cc
   DEPS while_op_helper
-       recurrent_op_helper
        conditional_block_op_helper
        pylayer_op_helper
        scope
@@ -585,7 +584,6 @@ if(WITH_DISTRIBUTE)
            device_worker_factory.cc
            data_set.cc
       DEPS fleet_wrapper
-           recurrent_op_helper
            op_registry
            device_context
            scope
@@ -660,8 +658,7 @@ if(WITH_DISTRIBUTE)
            heter_section_worker.cc
            device_worker_factory.cc
            data_set.cc
-      DEPS recurrent_op_helper
-           op_registry
+      DEPS op_registry
            device_context
            scope
            framework_proto
@@ -736,8 +733,7 @@ if(WITH_DISTRIBUTE)
            section_worker.cc
            device_worker_factory.cc
            data_set.cc
-      DEPS recurrent_op_helper
-           op_registry
+      DEPS op_registry
            device_context
            scope
            framework_proto
@@ -796,8 +792,7 @@ elseif(WITH_PSLIB)
          section_worker.cc
          device_worker_factory.cc
          data_set.cc
-    DEPS recurrent_op_helper
-         op_registry
+    DEPS op_registry
          device_context
          scope
          framework_proto
@@ -843,8 +838,7 @@ else()
          section_worker.cc
          device_worker_factory.cc
          data_set.cc
-    DEPS recurrent_op_helper
-         op_registry
+    DEPS op_registry
          device_context
          scope
          framework_proto
@@ -867,8 +861,14 @@ else()
 endif()
 
 target_link_libraries(
-  executor while_op_helper executor_gc_helper recurrent_op_helper
-  conditional_block_op_helper pylayer_op_helper)
+  executor
+  while_op_helper
+  executor_gc_helper
+  static_prim_api
+  static_utils
+  get_expected_kernel_func
+  conditional_block_op_helper
+  pylayer_op_helper)
 
 cc_library(
   parallel_executor

paddle/fluid/framework/executor.cc

@@ -20,7 +20,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/trainer_desc.pb.h"
 #include "paddle/fluid/framework/trainer_factory.h"
 #include "paddle/fluid/operators/controlflow/conditional_block_op_helper.h"
-#include "paddle/fluid/operators/controlflow/recurrent_op_helper.h"
 #include "paddle/fluid/operators/controlflow/while_op_helper.h"
 #include "paddle/fluid/platform/place.h"
 #include "paddle/fluid/platform/profiler.h"
@@ -54,8 +53,6 @@ void ExecutorPrepareContext::PrepareUnusedVars(
         prog_, static_cast<int>(block_id_), ops_);
     operators::PrepareSafeEagerDeletionOnWhileOpAndWhileGradOp(
         prog_, static_cast<int>(block_id_), ops_);
-    operators::PrepareSafeEagerDeletionOnRecurrentOpAndRecurrentGradOp(
-        prog_, static_cast<int>(block_id_), ops_);
   }
 
   force_disable_gc_ = force_disable_gc;

paddle/fluid/framework/executor_gc_helper.cc

@@ -25,7 +25,6 @@
 #include "paddle/fluid/framework/var_desc.h"
 #include "paddle/fluid/operators/controlflow/conditional_block_op_helper.h"
 #include "paddle/fluid/operators/controlflow/pylayer_op_helper.h"
-#include "paddle/fluid/operators/controlflow/recurrent_op_helper.h"
 #include "paddle/fluid/operators/controlflow/while_op_helper.h"
 #include "paddle/fluid/platform/enforce.h"
 
@@ -271,8 +270,6 @@ GetEagerDeletionCleanVarsForPartial(const ProgramDesc &origin_program,
         program, 0, global_block_ops);
     operators::PrepareSafeEagerDeletionOnWhileOpAndWhileGradOp(
         program, 0, global_block_ops);
-    operators::PrepareSafeEagerDeletionOnRecurrentOpAndRecurrentGradOp(
-        program, 0, global_block_ops);
   }
 
   // find the skip vars on each block

paddle/fluid/framework/ir/memory_optimize_pass/CMakeLists.txt

@@ -14,10 +14,6 @@ cc_library(
   while_op_eager_deletion_pass
   SRCS while_op_eager_deletion_pass.cc
   DEPS while_op_helper graph_helper pass)
-cc_library(
-  recurrent_op_eager_deletion_pass
-  SRCS recurrent_op_eager_deletion_pass.cc
-  DEPS recurrent_op_helper graph_helper pass)
 cc_library(
   reference_count_pass_helper
   SRCS reference_count_pass_helper.cc
@@ -34,7 +30,6 @@ set(EAGER_DELETETION_PASS_DEPS
     conditional_block_op_eager_deletion_pass
     pylayer_op_eager_deletion_pass
     while_op_eager_deletion_pass
-    recurrent_op_eager_deletion_pass
     reference_count_pass_helper)
 
 cc_library(

paddle/fluid/framework/ir/memory_optimize_pass/eager_deletion_pass.cc

@@ -301,10 +301,6 @@ void EagerDeletionPass::ApplyImpl(ir::Graph *graph) const {
   auto while_op_eager_deletion_pass =
       ir::PassRegistry::Instance().Get("while_op_eager_deletion_pass");
   while_op_eager_deletion_pass->Apply(graph);
-
-  auto recurrent_op_eager_deletion_pass =
-      ir::PassRegistry::Instance().Get("recurrent_op_eager_deletion_pass");
-  recurrent_op_eager_deletion_pass->Apply(graph);
 }
 
 }  // namespace ir
@@ -320,4 +316,3 @@ REGISTER_PASS(eager_deletion_pass, paddle::framework::ir::EagerDeletionPass)
 USE_PASS(conditional_block_op_eager_deletion_pass);
 USE_PASS(pylayer_op_eager_deletion_pass);
 USE_PASS(while_op_eager_deletion_pass);
-USE_PASS(recurrent_op_eager_deletion_pass);

paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc

@@ -29,7 +29,6 @@
 #include "paddle/fluid/memory/stats.h"
 #include "paddle/fluid/operators/controlflow/conditional_block_op_helper.h"
 #include "paddle/fluid/operators/controlflow/pylayer_op_helper.h"
-#include "paddle/fluid/operators/controlflow/recurrent_op_helper.h"
 #include "paddle/fluid/operators/controlflow/while_op_helper.h"
 #include "paddle/fluid/operators/ops_extra_info.h"
 #include "paddle/fluid/pir/dialect/operator/interface/op_yaml_info.h"
@@ -604,8 +603,6 @@ void BuildOpFuncList(const platform::Place& place,
         main_program, block.ID(), ops_unique);
     operators::PrepareSafeEagerDeletionOnWhileOpAndWhileGradOp(
         main_program, block.ID(), ops_unique);
-    operators::PrepareSafeEagerDeletionOnRecurrentOpAndRecurrentGradOp(
-        main_program, block.ID(), ops_unique);
   }
 
 #ifdef PADDLE_WITH_DNNL

paddle/fluid/operators/CMakeLists.txt

@@ -83,7 +83,7 @@ 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 lstm_op run_program_op quantize_linear_op
-        recurrent_op save_combine_op sync_batch_norm_op activation_op ${OP_MKL_DEPS} DEPS ${OP_HEADER_DEPS} processgroup_comm_utils)
+        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})
@@ -109,12 +109,6 @@ if (WITH_GPU OR WITH_ROCM)
 endif()
 
 op_library(lstm_op DEPS ${OP_HEADER_DEPS})
-if (WITH_ROCM)
-    op_library(recurrent_op DEPS executor ${OP_HEADER_DEPS})
-else()
-    op_library(recurrent_op DEPS ${OP_HEADER_DEPS})
-endif()
-
 
 set(COMMON_OP_DEPS ${OP_HEADER_DEPS})
 

paddle/fluid/operators/controlflow/CMakeLists.txt

@@ -25,10 +25,6 @@ cc_library(
   pylayer_op_helper
   SRCS pylayer_op_helper.cc
   DEPS op_variant operator pylayer_op)
-cc_library(
-  recurrent_op_helper
-  SRCS recurrent_op_helper.cc
-  DEPS recurrent_op op_variant operator)
 cc_library(
   while_op_helper
   SRCS while_op_helper.cc