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 API adaptor No.170、176】Migrate prior_box/reciprocal into pir #59042

Merged
merged 6 commits into from
Nov 17, 2023
Merged

【PIR API adaptor No.170、176】Migrate prior_box/reciprocal into pir #59042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1232bc
Migrate prior_box/reciprocal into pir
ccsuzzh Nov 15, 2023
ff8a118
fix
ccsuzzh Nov 15, 2023
c60102d
fix
ccsuzzh Nov 15, 2023
ea055f1
fix bug
ccsuzzh Nov 15, 2023
7732887
Merge branch 'PaddlePaddle:develop' into prior_box
ccsuzzh Nov 16, 2023
cf5c029
fix codestyle
ccsuzzh Nov 16, 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/ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from .. import _C_ops
from ..base.data_feeder import check_variable_and_dtype
from ..framework import LayerHelper, in_dynamic_mode, in_dynamic_or_pir_mode
from ..framework import LayerHelper, in_dynamic_or_pir_mode
from .layer_function_generator import (
add_sample_code,
generate_activation_fn,
Expand Down Expand Up @@ -792,7 +792,7 @@ def reciprocal(x, name=None):
Tensor(shape=[4], dtype=float32, place=Place(cpu), stop_gradient=True,
[-2.50000000, -5. , 10. , 3.33333325])
"""
if in_dynamic_mode():
if in_dynamic_or_pir_mode():
return _C_ops.reciprocal(x)
else:
check_variable_and_dtype(
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/vision/ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ def _is_list_or_tuple_(data):
max_sizes = [max_sizes]
cur_max_sizes = max_sizes

if in_dygraph_mode():
if in_dynamic_or_pir_mode():
step_w, step_h = steps
if max_sizes is None:
max_sizes = []
Expand Down
8 changes: 4 additions & 4 deletions test/legacy_test/test_activation_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3383,10 +3383,10 @@ def setUp(self):
def test_check_grad(self):
if self.dtype == np.float16:
return
self.check_grad(['X'], 'Out', max_relative_error=0.01)
self.check_grad(['X'], 'Out', max_relative_error=0.01, check_pir=True)

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


class TestReciprocal_ZeroDim(TestReciprocal):
Expand Down Expand Up @@ -4876,7 +4876,7 @@ def test_check_grad(self):
create_test_act_fp16_class(TestSoftRelu, check_dygraph=False)
create_test_act_fp16_class(TestELU)
create_test_act_fp16_class(TestCELU)
create_test_act_fp16_class(TestReciprocal)
create_test_act_fp16_class(TestReciprocal, check_pir=True)
create_test_act_fp16_class(TestLog, check_prim=True, check_pir=True)
if core.is_compiled_with_rocm():
create_test_act_fp16_class(TestLog2, check_pir=True)
Expand Down Expand Up @@ -5031,7 +5031,7 @@ def test_check_grad(self):
create_test_act_bf16_class(TestSoftRelu, check_dygraph=False)
create_test_act_bf16_class(TestELU)
create_test_act_bf16_class(TestCELU)
create_test_act_bf16_class(TestReciprocal)
create_test_act_bf16_class(TestReciprocal, check_pir=True)
create_test_act_bf16_class(TestLog, check_prim=True, check_pir=True)
if core.is_compiled_with_rocm():
create_test_act_bf16_class(TestLog2, check_pir=True)
Expand Down
4 changes: 3 additions & 1 deletion test/legacy_test/test_prior_box_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from op_test import OpTest

import paddle
from paddle.pir_utils import test_with_pir_api


def python_prior_box(
Expand Down Expand Up @@ -76,7 +77,7 @@ def set_data(self):
self.outputs = {'Boxes': self.out_boxes, 'Variances': self.out_var}

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

def setUp(self):
self.op_type = "prior_box"
Expand Down Expand Up @@ -231,6 +232,7 @@ def setUp(self):
self.image_np = np.random.rand(2, 10, 40, 40).astype('float32')
self.min_sizes = [2.0, 4.0]

@test_with_pir_api
def test_dygraph_with_static(self):
paddle.enable_static()
input = paddle.static.data(
Expand Down