Skip to content
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

Jump to bottom

[PIR] No.43 Migrate paddle.where into pir #57667

Merged
merged 4 commits into from
Sep 25, 2023
Merged

[PIR] No.43 Migrate paddle.where into pir #57667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
346aa08
update where in new ir
longranger2 Sep 23, 2023
6426d20
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
0x45f Sep 25, 2023
f38bcb5
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
0x45f Sep 25, 2023
3233a5a
Add where grad vjp
0x45f Sep 25, 2023
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: 2 additions & 0 deletions paddle/fluid/pir/dialect/op_generator/vjp_interface_gen_op_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@


vjp_interface_declare_gen_op_list = [
'where',
"tanh",
"mean",
"divide",
Expand Down Expand Up @@ -66,6 +67,7 @@
'triu',
]
vjp_interface_implementation_gen_op_list = [
'where',
"tanh",
"mean",
"divide",
Expand Down
2 changes: 2 additions & 0 deletions paddle/fluid/primitive/codegen/gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@


VJPS = [
'where_grad',
'tril_grad',
'triu_grad',
'tanh_grad',
Expand Down Expand Up @@ -100,6 +101,7 @@
VJP_COMPS = PRIM_VJP + CUSTOM_VJP

BACKENDS = [
'where_grad',
'tril_grad',
'triu_grad',
'add_n',
Expand Down
3 changes: 2 additions & 1 deletion python/paddle/tensor/search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
convert_np_dtype_to_dtype_,
core,
in_dynamic_mode,
in_dynamic_or_pir_mode,
)

# from ..base.layers import has_inf #DEFINE_ALIAS
Expand Down Expand Up @@ -686,7 +687,7 @@ def where(condition, x=None, y=None, name=None):
broadcast_condition = paddle.add(cast_cond, broadcast_zeros)
broadcast_condition = paddle.cast(broadcast_condition, 'bool')

if in_dynamic_mode():
if in_dynamic_or_pir_mode():
return _C_ops.where(broadcast_condition, broadcast_x, broadcast_y)
else:
check_variable_and_dtype(condition, 'condition', ['bool'], 'where')
Expand Down
11 changes: 8 additions & 3 deletions test/legacy_test/test_where_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ def setUp(self):
self.outputs = {'Out': np.where(self.cond, self.x, self.y)}

def test_check_output(self):
self.check_output(check_cinn=self.check_cinn)
self.check_output(check_cinn=self.check_cinn, check_new_ir=True)

def test_check_grad(self):
self.check_grad(['X', 'Y'], 'Out', check_cinn=self.check_cinn)
self.check_grad(
['X', 'Y'], 'Out', check_cinn=self.check_cinn, check_new_ir=True
)

def init_config(self):
self.x = np.random.uniform((-3), 5, 100).astype('float64')
Expand Down Expand Up @@ -82,7 +84,9 @@ def setUp(self):

def test_check_output(self):
place = core.CUDAPlace(0)
self.check_output_with_place(place, check_cinn=self.check_cinn)
self.check_output_with_place(
place, check_cinn=self.check_cinn, check_new_ir=True
)

def test_check_grad(self):
place = core.CUDAPlace(0)
Expand All @@ -92,6 +96,7 @@ def test_check_grad(self):
'Out',
numeric_grad_delta=0.05,
check_cinn=self.check_cinn,
check_new_ir=True,
)

def init_config(self):
Expand Down