Clean recurrent config [fluid_ops] (#68583)

co63oc · web-flow · commit 9180d644235d · 2024-10-14T09:29:30.000+08:00
* Fix

* Fix

* ci

* ci
diff --git a/python/paddle/base/backward.py b/python/paddle/base/backward.py
@@ -1252,7 +1252,7 @@ def _get_sub_block_path(
 
     Args:
         sub_block(Block): The sub-block in which to get op path.
-        sub_block_op_desc: The op desc of the sub-block op such as 'while', 'conditional_block' and 'recurrent'.
+        sub_block_op_desc: The op desc of the sub-block op such as 'while', 'conditional_block'.
         no_grad_set(set): The set of no grad var name. no_grad_set will be changed.
         op_path_dict(dict): op_path_dict will be changed.
             key(int) block index
diff --git a/python/paddle/base/framework.py b/python/paddle/base/framework.py
@@ -3154,7 +3154,6 @@ class Operator:
     OP_WITHOUT_KERNEL_SET = {
         "feed",
         "fetch",
-        "recurrent",
         "go",
         "conditional_block",
         "pylayer",
@@ -3163,7 +3162,6 @@ class Operator:
         "recv",
         "listen_and_serv",
         "fl_listen_and_serv",
-        "ncclInit",
         "select",
         "checkpoint_notify",
         "gen_bkcl_id",
@@ -3173,9 +3171,6 @@ class Operator:
         "c_comm_init",
         "c_sync_calc_stream",
         "c_sync_comm_stream",
-        "queue_generator",
-        "dequeue",
-        "enqueue",
         "heter_listen_and_serv",
         "c_wait_comm",
         "c_wait_compute",
@@ -4687,8 +4682,6 @@ def pass_stop_gradient(ins, outs):
                 "conditional_block_grad",
                 "pylayer",
                 "pylayer_grad",
-                "recurrent",
-                "recurrent_grad",
                 "while",
                 "while_grad",
             }
diff --git a/python/paddle/distributed/auto_parallel/static/cost/comp_op_cost.py b/python/paddle/distributed/auto_parallel/static/cost/comp_op_cost.py
@@ -455,14 +455,6 @@ def __init__(self, op=None, op_desc=None, cluster=None, rank=None):
         super().__init__(op=op, op_desc=op_desc, cluster=cluster, rank=rank)
 
 
-@register_op_cost
-class SamplingIdOpCost(CompOpCost):
-    OP_TYPE = "sampling_id"
-
-    def __init__(self, op=None, op_desc=None, cluster=None, rank=None):
-        super().__init__(op=op, op_desc=op_desc, cluster=cluster, rank=rank)
-
-
 @register_op_cost
 class ScaleOpCost(CompOpCost):
     OP_TYPE = "scale"
diff --git a/python/paddle/distributed/io.py b/python/paddle/distributed/io.py
@@ -100,11 +100,6 @@ def __load_persistable_vars(executor, dirname, need_load_vars):
                     attrs={'file_path': os.path.join(dirname, origin_var.name)},
                 )
 
-        load_block.append_op(
-            type='delete_var',
-            inputs={'X': need_delete_vars},
-        )
-
         executor.run(load_prog)
 
     if not isinstance(main_program, Program):
diff --git a/python/paddle/incubate/operators/__init__.py b/python/paddle/incubate/operators/__init__.py
@@ -21,4 +21,3 @@
 from .softmax_mask_fuse_upper_triangle import (  # noqa: F401
     softmax_mask_fuse_upper_triangle,
 )
-from .unzip import unzip  # noqa: F401
diff --git a/python/paddle/incubate/operators/unzip.py b/python/paddle/incubate/operators/unzip.py
diff --git a/test/auto_parallel/test_comp_cost.py b/test/auto_parallel/test_comp_cost.py
@@ -69,7 +69,6 @@
     ReduceSumOpCost,
     Reshape2GradOpCost,
     Reshape2OpCost,
-    SamplingIdOpCost,
     ScaleOpCost,
     SliceOpCost,
     SoftmaxGradOpCost,
@@ -335,11 +334,6 @@ def test_comp_cost(self):
         self.assertTrue(op_cost.time >= 0)
         self.assertTrue(op_cost.memory >= 0)
 
-        op_cost = SamplingIdOpCost(cluster=cluster)
-        self.assertTrue(op_cost.flops >= 0)
-        self.assertTrue(op_cost.time >= 0)
-        self.assertTrue(op_cost.memory >= 0)
-
         op_cost = ScaleOpCost(cluster=cluster)
         self.assertTrue(op_cost.flops >= 0)
         self.assertTrue(op_cost.time >= 0)
diff --git a/test/deprecated/ir/inference/program_config.py b/test/deprecated/ir/inference/program_config.py
@@ -121,7 +121,6 @@ def __repr__(self):
 _OP_WITHOUT_KERNEL_SET = {
     'feed',
     'fetch',
-    'recurrent',
     'go',
     'conditional_block',
     'static_pylayer',
@@ -130,7 +129,6 @@ def __repr__(self):
     'recv',
     'listen_and_serv',
     'fl_listen_and_serv',
-    'ncclInit',
     'select',
     'checkpoint_notify',
     'gen_bkcl_id',
@@ -140,9 +138,6 @@ def __repr__(self):
     'c_comm_init',
     'c_sync_calc_stream',
     'c_sync_comm_stream',
-    'queue_generator',
-    'dequeue',
-    'enqueue',
     'heter_listen_and_serv',
     'c_wait_comm',
     'c_wait_compute',
diff --git a/test/ir/inference/program_config.py b/test/ir/inference/program_config.py
@@ -121,7 +121,6 @@ def __repr__(self):
 _OP_WITHOUT_KERNEL_SET = {
     'feed',
     'fetch',
-    'recurrent',
     'go',
     'conditional_block',
     'static_pylayer',
@@ -130,7 +129,6 @@ def __repr__(self):
     'recv',
     'listen_and_serv',
     'fl_listen_and_serv',
-    'ncclInit',
     'select',
     'checkpoint_notify',
     'gen_bkcl_id',
@@ -140,9 +138,6 @@ def __repr__(self):
     'c_comm_init',
     'c_sync_calc_stream',
     'c_sync_comm_stream',
-    'queue_generator',
-    'dequeue',
-    'enqueue',
     'heter_listen_and_serv',
     'c_wait_comm',
     'c_wait_compute',

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,3 @@`
`21`	`21`	`from .softmax_mask_fuse_upper_triangle import ( # noqa: F401`
`22`	`22`	`softmax_mask_fuse_upper_triangle,`
`23`	`23`	`)`
`24`		`-from .unzip import unzip # noqa: F401`