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

[NewIR] No.30 Migrate paddle.matmul into pir #57277

Merged
merged 3 commits into from
Sep 15, 2023
Merged

[NewIR] No.30 Migrate paddle.matmul into pir #57277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5310076
fix
enkilee Sep 13, 2023
a986f17
fix
enkilee Sep 14, 2023
355ba38
fix
enkilee Sep 15, 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: 2 additions & 2 deletions python/paddle/tensor/linalg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

from ..base.data_feeder import check_dtype, check_type, check_variable_and_dtype
from ..common_ops_import import Variable
from ..framework import LayerHelper, in_dynamic_mode
from ..framework import LayerHelper, in_dynamic_mode, in_dynamic_or_pir_mode
from .creation import full
from .manipulation import cast
from .math import _get_reduce_axis
Expand Down Expand Up @@ -225,7 +225,7 @@ def matmul(x, y, transpose_x=False, transpose_y=False, name=None):
[10, 3, 5, 5]

"""
if in_dynamic_mode():
if in_dynamic_or_pir_mode():
return _C_ops.matmul(x, y, transpose_x, transpose_y)
else:
attrs = {
Expand Down
16 changes: 13 additions & 3 deletions test/legacy_test/test_matmul_v2_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ def setUp(self):

def test_check_output(self):
self.check_output(
check_cinn=self.check_cinn if hasattr(self, 'check_cinn') else True
check_cinn=self.check_cinn if hasattr(self, 'check_cinn') else True,
check_new_ir=True,
)

def test_check_grad(self):
Expand All @@ -110,6 +111,7 @@ def test_check_grad(self):
check_cinn=self.check_cinn
if hasattr(self, 'check_cinn')
else True,
check_new_ir=True,
)
else:
self.check_grad(
Expand All @@ -118,6 +120,7 @@ def test_check_grad(self):
check_cinn=self.check_cinn
if hasattr(self, 'check_cinn')
else True,
check_new_ir=True,
)


Expand Down Expand Up @@ -359,6 +362,7 @@ def test_check_output(self):
check_cinn=self.check_cinn
if hasattr(self, 'check_cinn')
else True,
check_new_ir=True,
)

def test_check_grad(self):
Expand All @@ -372,6 +376,7 @@ def test_check_grad(self):
check_cinn=self.check_cinn
if hasattr(self, 'check_cinn')
else True,
check_new_ir=True,
)

cls_name = "{}_{}".format(parent.__name__, "Fp16")
Expand Down Expand Up @@ -431,6 +436,7 @@ def test_check_output(self):
check_cinn=self.check_cinn
if hasattr(self, 'check_cinn')
else True,
check_new_ir=True,
)

def test_check_grad_x(self):
Expand All @@ -447,6 +453,7 @@ def test_check_grad_x(self):
check_cinn=self.check_cinn
if hasattr(self, 'check_cinn')
else True,
check_new_ir=True,
)

def test_check_grad_y(self):
Expand All @@ -463,6 +470,7 @@ def test_check_grad_y(self):
check_cinn=self.check_cinn
if hasattr(self, 'check_cinn')
else True,
check_new_ir=True,
)

def test_check_grad(self):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

可以修改一下TestMatMulV2API 单测，在510行之前加paddle.enable_static();528行之后加paddle.disable_static() 确保运行环境是静态图。新ir测试会影响部分单测环境

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

收到

Expand Down Expand Up @@ -499,6 +507,7 @@ def setUp(self):
self.places.append(base.CUDAPlace(0))

def check_static_result(self, place):
paddle.enable_static()
with base.program_guard(base.Program(), base.Program()):
input_x = paddle.static.data(
name="input_x", shape=[4, 3], dtype="float32"
Expand All @@ -518,6 +527,7 @@ def check_static_result(self, place):
feed={"input_x": x_np, "input_y": y_np},
fetch_list=[result],
)
paddle.disable_static()

def test_static(self):
for place in self.places:
Expand Down Expand Up @@ -735,7 +745,7 @@ def init_input_output(self):
self.out = np.matmul(self.x, self.y)

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


class TestInt32MatMulOpBroadcast(OpTest):
Expand Down Expand Up @@ -787,7 +797,7 @@ def init_input_output(self):
self.out = np.matmul(self.x, self.y)

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


class TestInt64MatMulOpBroadcast(OpTest):
Expand Down