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

【PIR API adaptor No.28】Migrate paddle.vision.ops.box_coder into pir #59616

Merged
merged 4 commits into from
Dec 6, 2023
Merged

【PIR API adaptor No.28】Migrate paddle.vision.ops.box_coder into pir #59616

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
d317a10
update
ooooo-create Dec 2, 2023
353d0d9
fix
ooooo-create Dec 2, 2023
12ee159
update
ooooo-create Dec 2, 2023
e444353
fix
ooooo-create Dec 4, 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
5 changes: 3 additions & 2 deletions python/paddle/vision/ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import numpy as np

import paddle
from paddle import _C_ops, _legacy_C_ops
from paddle.tensor.math import _add_with_axis
from paddle.utils import convert_to_list
Expand Down Expand Up @@ -674,8 +675,8 @@ def box_coder(
... box_normalized=False)
...
"""
if in_dygraph_mode():
if isinstance(prior_box_var, core.eager.Tensor):
if in_dynamic_or_pir_mode():
if isinstance(prior_box_var, (core.eager.Tensor, paddle.pir.Value)):
output_box = _C_ops.box_coder(
prior_box,
prior_box_var,
Expand Down
11 changes: 7 additions & 4 deletions test/legacy_test/test_box_coder_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from op_test import OpTest

import paddle
from paddle.pir_utils import test_with_pir_api


def box_decoder(t_box, p_box, pb_v, output_box, norm, axis=0):
Expand Down Expand Up @@ -109,7 +110,7 @@ def batch_box_coder(p_box, pb_v, t_box, lod, code_type, norm, axis=0):

class TestBoxCoderOp(OpTest):
def test_check_output(self):
self.check_output()
self.check_output(check_pir=True)

def setUp(self):
self.op_type = "box_coder"
Expand Down Expand Up @@ -142,7 +143,7 @@ def setUp(self):

class TestBoxCoderOpWithoutBoxVar(OpTest):
def test_check_output(self):
self.check_output()
self.check_output(check_pir=True)

def setUp(self):
self.python_api = paddle.vision.ops.box_coder
Expand Down Expand Up @@ -207,7 +208,7 @@ def setUp(self):

class TestBoxCoderOpWithAxis(OpTest):
def test_check_output(self):
self.check_output()
self.check_output(check_pir=True)

def setUp(self):
self.python_api = paddle.vision.ops.box_coder
Expand Down Expand Up @@ -286,7 +287,7 @@ def wrapper_box_coder(

class TestBoxCoderOpWithVariance(OpTest):
def test_check_output(self):
self.check_output()
self.check_output(check_pir=True)

def setUp(self):
self.op_type = "box_coder"
Expand Down Expand Up @@ -370,6 +371,7 @@ def setUp(self):
self.prior_box_var_np = np.random.random((80, 4)).astype('float32')
self.target_box_np = np.random.random((20, 80, 4)).astype('float32')

@test_with_pir_api
def test_dygraph_with_static(self):
paddle.enable_static()
exe = paddle.static.Executor()
Expand Down Expand Up @@ -428,6 +430,7 @@ def setUp(self):
self.prior_box_np = np.random.random((80, 4)).astype('float32')
self.target_box_np = np.random.random((20, 80, 4)).astype('float32')

@test_with_pir_api
def test_support_tuple(self):
paddle.enable_static()
exe = paddle.static.Executor()
Expand Down