Skip to content

Clean recurrent config [fluid_ops] #68583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 14, 2024
Merged

Clean recurrent config [fluid_ops] #68583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
237e533
Fix
co63oc Oct 9, 2024
92101c6
Merge branch 'develop' into fix28
co63oc Oct 10, 2024
ee1bed5
Fix
co63oc Oct 11, 2024
01532dd
Merge branch 'develop' into fix28
co63oc Oct 11, 2024
3ed8d81
ci
co63oc Oct 11, 2024
8f824e7
ci
co63oc Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/paddle/base/backward.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions python/paddle/base/framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3152,7 +3152,6 @@ class Operator:
OP_WITHOUT_KERNEL_SET = {
"feed",
"fetch",
"recurrent",
"go",
"conditional_block",
"pylayer",
Expand All @@ -3161,7 +3160,6 @@ class Operator:
"recv",
"listen_and_serv",
"fl_listen_and_serv",
"ncclInit",
"select",
"checkpoint_notify",
"gen_bkcl_id",
Expand All @@ -3171,9 +3169,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",
Expand Down Expand Up @@ -4685,8 +4680,6 @@ def pass_stop_gradient(ins, outs):
"conditional_block_grad",
"pylayer",
"pylayer_grad",
"recurrent",
"recurrent_grad",
"while",
"while_grad",
}
Expand Down
8 changes: 0 additions & 8 deletions python/paddle/distributed/auto_parallel/static/cost/comp_op_cost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 0 additions & 5 deletions python/paddle/distributed/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
1 change: 0 additions & 1 deletion python/paddle/incubate/operators/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@
from .softmax_mask_fuse_upper_triangle import ( # noqa: F401
softmax_mask_fuse_upper_triangle,
)
from .unzip import unzip # noqa: F401
89 changes: 0 additions & 89 deletions python/paddle/incubate/operators/unzip.py
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions test/auto_parallel/test_comp_cost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
ReduceSumOpCost,
Reshape2GradOpCost,
Reshape2OpCost,
SamplingIdOpCost,
ScaleOpCost,
SliceOpCost,
SoftmaxGradOpCost,
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions test/deprecated/ir/inference/program_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ def __repr__(self):
_OP_WITHOUT_KERNEL_SET = {
'feed',
'fetch',
'recurrent',
'go',
'conditional_block',
'static_pylayer',
Expand All @@ -130,7 +129,6 @@ def __repr__(self):
'recv',
'listen_and_serv',
'fl_listen_and_serv',
'ncclInit',
'select',
'checkpoint_notify',
'gen_bkcl_id',
Expand All @@ -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',
Expand Down
5 changes: 0 additions & 5 deletions test/ir/inference/program_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ def __repr__(self):
_OP_WITHOUT_KERNEL_SET = {
'feed',
'fetch',
'recurrent',
'go',
'conditional_block',
'static_pylayer',
Expand All @@ -130,7 +129,6 @@ def __repr__(self):
'recv',
'listen_and_serv',
'fl_listen_and_serv',
'ncclInit',
'select',
'checkpoint_notify',
'gen_bkcl_id',
Expand All @@ -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',
Expand Down