From 0c261ad60733ceda85798729e2820a83d98cb72a Mon Sep 17 00:00:00 2001 From: ccsuzzh <1719571694@qq.com> Date: Tue, 7 Nov 2023 15:53:04 +0800 Subject: [PATCH 1/3] Migrate paddle.logical_or/logical_xor/logical_not into pir --- python/paddle/tensor/logic.py | 6 +++--- test/legacy_test/test_logical_op.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/python/paddle/tensor/logic.py b/python/paddle/tensor/logic.py index 7e29f89a9de173..ec9f0fa67644aa 100755 --- a/python/paddle/tensor/logic.py +++ b/python/paddle/tensor/logic.py @@ -201,7 +201,7 @@ def logical_or(x, y, out=None, name=None): [[True , True ], [True , False]]) """ - if in_dynamic_mode(): + if in_dynamic_or_pir_mode(): return _C_ops.logical_or(x, y) return _logical_op( op_name="logical_or", x=x, y=y, name=name, out=out, binary_op=True @@ -262,7 +262,7 @@ def logical_xor(x, y, out=None, name=None): [[False, True ], [True , False]]) """ - if in_dynamic_mode(): + if in_dynamic_or_pir_mode(): return _C_ops.logical_xor(x, y) return _logical_op( @@ -322,7 +322,7 @@ def logical_not(x, out=None, name=None): Tensor(shape=[4], dtype=bool, place=Place(cpu), stop_gradient=True, [False, True , False, True ]) """ - if in_dynamic_mode(): + if in_dynamic_or_pir_mode(): return _C_ops.logical_not(x) return _logical_op( op_name="logical_not", x=x, y=None, name=name, out=out, binary_op=False diff --git a/test/legacy_test/test_logical_op.py b/test/legacy_test/test_logical_op.py index 81dec36e2f698e..5bbaa4d63403e7 100755 --- a/test/legacy_test/test_logical_op.py +++ b/test/legacy_test/test_logical_op.py @@ -19,6 +19,7 @@ import paddle from paddle.framework import in_dynamic_mode +from paddle.pir_utils import test_with_pir_api from paddle.static import Executor, Program, program_guard SUPPORTED_DTYPES = [ @@ -67,7 +68,7 @@ } -# @test_with_pir_api +@test_with_pir_api def run_static(x_np, y_np, op_str, use_gpu=False, binary_op=True): paddle.enable_static() startup_program = Program() From 2bb6f039c6831dbf5591ad230eb26661d28e3c2a Mon Sep 17 00:00:00 2001 From: ccsuzzh <1719571694@qq.com> Date: Wed, 8 Nov 2023 16:49:31 +0800 Subject: [PATCH 2/3] fix bug --- test/legacy_test/test_logical_op.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/legacy_test/test_logical_op.py b/test/legacy_test/test_logical_op.py index 5bbaa4d63403e7..4a289dd75382b8 100755 --- a/test/legacy_test/test_logical_op.py +++ b/test/legacy_test/test_logical_op.py @@ -20,7 +20,6 @@ import paddle from paddle.framework import in_dynamic_mode from paddle.pir_utils import test_with_pir_api -from paddle.static import Executor, Program, program_guard SUPPORTED_DTYPES = [ bool, @@ -71,13 +70,13 @@ @test_with_pir_api def run_static(x_np, y_np, op_str, use_gpu=False, binary_op=True): paddle.enable_static() - startup_program = Program() - main_program = Program() + startup_program = paddle.static.Program() + main_program = paddle.static.Program() place = paddle.CPUPlace() if use_gpu and paddle.is_compiled_with_cuda(): place = paddle.CUDAPlace(0) - exe = Executor(place) - with program_guard(main_program, startup_program): + exe = paddle.static.Executor(place) + with paddle.static.program_guard(main_program, startup_program): x = paddle.static.data(name='x', shape=x_np.shape, dtype=x_np.dtype) op = getattr(paddle, op_str) feed_list = {'x': x_np} From d7f088b8cb6f61411718d6175d89167358864f08 Mon Sep 17 00:00:00 2001 From: ccsuzzh <1719571694@qq.com> Date: Thu, 9 Nov 2023 20:12:52 +0800 Subject: [PATCH 3/3] fix bug --- test/legacy_test/test_logical_op.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/legacy_test/test_logical_op.py b/test/legacy_test/test_logical_op.py index 4a289dd75382b8..6c4dda65984eb4 100755 --- a/test/legacy_test/test_logical_op.py +++ b/test/legacy_test/test_logical_op.py @@ -67,7 +67,6 @@ } -@test_with_pir_api def run_static(x_np, y_np, op_str, use_gpu=False, binary_op=True): paddle.enable_static() startup_program = paddle.static.Program() @@ -135,6 +134,7 @@ def np_data_generator(np_shape, dtype, *args, **kwargs): return np.random.normal(0, 1, np_shape).astype(dtype) +@test_with_pir_api def test(unit_test, use_gpu=False, test_error=False): for op_data in TEST_META_OP_DATA: meta_data = dict(op_data)