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.46 Migrate paddle.nn.functional.pad into pir #57348

Merged
merged 13 commits into from
Sep 26, 2023
Merged

[PIR] No.46 Migrate paddle.nn.functional.pad into pir #57348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0840c3f
[PIR] Migrate paddle.nn.functional.pad into pir
BeingGod Sep 14, 2023
a88c44d
Merge commit 'b29e2f7f98a2185acd48b038ca74eed3d8f67fc2' into pir_pad
BeingGod Sep 14, 2023
ea00ea0
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
0x45f Sep 22, 2023
5d2eced
Fix name error
0x45f Sep 22, 2023
999364e
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
0x45f Sep 22, 2023
4a1eef8
Fix UTs error
0x45f Sep 22, 2023
10d18c5
Fix check prim
0x45f Sep 22, 2023
6e4b4e0
Format code
0x45f Sep 22, 2023
b3a04bf
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
0x45f Sep 22, 2023
24f4437
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
0x45f Sep 25, 2023
af1c336
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
0x45f Sep 25, 2023
5f61523
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
0x45f Sep 25, 2023
d847ffa
Revert code
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
4 changes: 4 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 @@ -61,6 +61,8 @@
'stack',
'poisson',
'gumbel_softmax',
'pad',
'pad3d',
'squeeze',
'unsqueeze',
'tril',
Expand Down Expand Up @@ -104,6 +106,8 @@
'stack',
'poisson',
'gumbel_softmax',
'pad',
'pad3d',
'squeeze',
'unsqueeze',
'tril',
Expand Down
6 changes: 3 additions & 3 deletions python/paddle/nn/functional/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1658,7 +1658,7 @@ def pad(x, pad, mode='constant', value=0.0, data_format="NCHW", name=None):
paddings = pad
pad_value = value

if in_dynamic_mode():
if in_dynamic_or_pir_mode():
out = _C_ops.pad(x, paddings, float(pad_value))
return out

Expand Down Expand Up @@ -1712,7 +1712,7 @@ def pad(x, pad, mode='constant', value=0.0, data_format="NCHW", name=None):

unsqueezed_dim = []

if isinstance(pad, Variable):
if isinstance(pad, (Variable, pir.OpResult)):
if data_format in ["NCL", "NCHW", "NCDHW"]:
data_format = "NCDHW"
if x_dim == 3:
Expand Down Expand Up @@ -1756,7 +1756,7 @@ def pad(x, pad, mode='constant', value=0.0, data_format="NCHW", name=None):
unsqueezed_dim = [1]
x = unsqueeze(x, axis=unsqueezed_dim)

if in_dynamic_mode():
if in_dynamic_or_pir_mode():
if isinstance(pad, Variable):
pad = pad.tolist()
out = _C_ops.pad3d(x, pad, mode, value, data_format)
Expand Down
14 changes: 8 additions & 6 deletions test/legacy_test/test_pad3d_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ def setUp(self):
self.outputs['Out'] = convert_float_to_uint16(self.outputs['Out'])

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

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

def get_dtype(self):
return np.float64
Expand Down Expand Up @@ -214,10 +214,12 @@ def get_dtype(self):
return np.float16

def test_check_output(self):
self.check_output(atol=1e-3)
self.check_output(atol=1e-3, check_new_ir=True)

def test_check_grad_normal(self):
self.check_grad(['X'], 'Out', max_relative_error=1.5e-3)
self.check_grad(
['X'], 'Out', max_relative_error=1.5e-3, check_new_ir=True
)

cls_name = "{}_{}".format(parent.__name__, "FP16OP")
TestPad3dFp16.__name__ = cls_name
Expand Down Expand Up @@ -251,12 +253,12 @@ def get_dtype(self):

def test_check_output(self):
place = core.CUDAPlace(0)
self.check_output_with_place(place, atol=1e-2)
self.check_output_with_place(place, atol=1e-2, check_new_ir=True)

def test_check_grad_normal(self):
place = core.CUDAPlace(0)
self.check_grad_with_place(
place, ['X'], 'Out', max_relative_error=1e-2
place, ['X'], 'Out', max_relative_error=1e-2, check_new_ir=True
)

cls_name = "{}_{}".format(parent.__name__, "BF16OP")
Expand Down
12 changes: 7 additions & 5 deletions test/legacy_test/test_pad_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ def get_dtype(self):
return np.float64

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

def test_check_grad_normal(self):
self.check_grad(['X'], 'Out', check_prim=True)
self.check_grad(['X'], 'Out', check_prim=True, check_new_ir=True)

def initTestCase(self):
self.shape = (16, 16)
Expand Down Expand Up @@ -101,7 +101,7 @@ def get_dtype(self):
return np.float16

def test_check_grad_normal(self):
self.check_grad(['X'], 'Out', check_prim=True)
self.check_grad(['X'], 'Out', check_prim=True, check_new_ir=True)

cls_name = "{}_{}".format(parent.__name__, "Fp16")
TestPadFp16.__name__ = cls_name
Expand Down Expand Up @@ -253,11 +253,13 @@ def initTestCase(self):

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

def test_check_grad(self):
place = core.CUDAPlace(0)
self.check_grad_with_place(place, ['X'], 'Out', check_prim=True)
self.check_grad_with_place(
place, ['X'], 'Out', check_prim=True, check_new_ir=True
)


if __name__ == '__main__':
Expand Down