Skip to content

【PIR API adaptor No.148】outer #58927

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
0x45f merged 2 commits into from
Nov 15, 2023
Merged

【PIR API adaptor No.148】outer #58927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55946b6
pir fit for outer
cocoshe Nov 11, 2023
e3dab02
reset check dtype
cocoshe Nov 13, 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: 1 addition & 1 deletion python/paddle/tensor/math.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2552,7 +2552,7 @@ def outer(x, y, name=None):
nx = x.reshape((-1, 1))
ny = y.reshape((1, -1))

if in_dynamic_mode():
if in_dynamic_or_pir_mode():
return _C_ops.matmul(nx, ny, False, False)
else:

Expand Down
17 changes: 12 additions & 5 deletions test/legacy_test/test_outer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
import numpy as np

import paddle
from paddle.static import Program, program_guard
from paddle.pir_utils import test_with_pir_api


class TestMultiplyApi(unittest.TestCase):
def _run_static_graph_case(self, x_data, y_data):
with program_guard(Program(), Program()):
with paddle.static.program_guard(
paddle.static.Program(), paddle.static.Program()
):
paddle.enable_static()
x = paddle.static.data(
name='x', shape=x_data.shape, dtype=x_data.dtype
Expand Down Expand Up @@ -53,7 +55,8 @@ def _run_dynamic_graph_case(self, x_data, y_data):
res = paddle.outer(x, y)
return res.numpy()

def test_multiply(self):
@test_with_pir_api
def test_multiply_static(self):
np.random.seed(7)

# test static computation graph: 3-d array
Expand Down Expand Up @@ -86,6 +89,7 @@ def test_multiply(self):
res = self._run_static_graph_case(x_data, y_data)
np.testing.assert_allclose(res, np.outer(x_data, y_data), rtol=1e-05)

def test_multiply_dynamic(self):
# test dynamic computation graph: 3-d array
x_data = np.random.rand(5, 10, 10).astype(np.float64)
y_data = np.random.rand(2, 10).astype(np.float64)
Expand Down Expand Up @@ -138,14 +142,17 @@ def test_multiply(self):


class TestMultiplyError(unittest.TestCase):
def test_errors(self):
def test_errors_static(self):
# test static computation graph: dtype can not be int8
paddle.enable_static()
with program_guard(Program(), Program()):
with paddle.static.program_guard(
paddle.static.Program(), paddle.static.Program()
):
x = paddle.static.data(name='x', shape=[100], dtype=np.int8)
y = paddle.static.data(name='y', shape=[100], dtype=np.int8)
self.assertRaises(TypeError, paddle.outer, x, y)

def test_errors_dynamic(self):
np.random.seed(7)

# test dynamic computation graph: dtype must be Tensor type
Expand Down