From f95b935d89c589269ec78888e32fcfa46851f20d Mon Sep 17 00:00:00 2001 From: SigureMo Date: Tue, 14 May 2024 17:44:42 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90Fix=20PIR=20Unittest=20No.533?= =?UTF-8?q?=E3=80=81543-544=E3=80=91Fix=203=20ut=20in=20PIR=20mode=20(`tes?= =?UTF-8?q?t=5Fpow`,=20`test=5Frandn=5Fop`,=20`test=5Ftranspose=5Fop`)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- python/paddle/tensor/math.py | 5 ++--- python/paddle/tensor/random.py | 6 +++++- test/deprecated/legacy_test/CMakeLists.txt | 2 -- test/legacy_test/CMakeLists.txt | 2 ++ test/{deprecated => }/legacy_test/test_pow.py | 0 test/{deprecated => }/legacy_test/test_randn_op.py | 1 + test/{deprecated => }/legacy_test/test_transpose_op.py | 0 7 files changed, 10 insertions(+), 6 deletions(-) rename test/{deprecated => }/legacy_test/test_pow.py (100%) rename test/{deprecated => }/legacy_test/test_randn_op.py (99%) rename test/{deprecated => }/legacy_test/test_transpose_op.py (100%) diff --git a/python/paddle/tensor/math.py b/python/paddle/tensor/math.py index 7c595cb52fa76b..d02a8d3c96b811 100644 --- a/python/paddle/tensor/math.py +++ b/python/paddle/tensor/math.py @@ -527,8 +527,7 @@ def pow(x, y, name=None): return _C_ops.elementwise_pow(x, y) else: raise TypeError( - 'y must be scalar , Tensor(in dygraph mode), Value(in pir mode) but received: %s ' - % (y.dtype) + f"y must be scalar, Tensor(in dygraph mode), Value(in pir mode) but received: {type(y)}" ) else: # in static graph mode @@ -548,7 +547,7 @@ def pow(x, y, name=None): return _elementwise_op(LayerHelper('elementwise_pow', **locals())) else: raise TypeError( - 'y must be scalar or tensor type, but received: %s ' % (type(y)) + f"y must be scalar or tensor type, but received: {type(y)}" ) diff --git a/python/paddle/tensor/random.py b/python/paddle/tensor/random.py index 8c0af43f718cc9..50e835470c97b1 100644 --- a/python/paddle/tensor/random.py +++ b/python/paddle/tensor/random.py @@ -483,7 +483,11 @@ def gaussian(shape, mean=0.0, std=1.0, seed=0, dtype=None, name=None): dtype = convert_np_dtype_to_dtype_(dtype) if in_dynamic_or_pir_mode(): - shape = paddle.utils.convert_shape_to_list(shape) + if in_dynamic_mode(): + shape = paddle.utils.convert_shape_to_list(shape) + elif in_pir_mode() and paddle.utils._contain_var(shape): + shape = paddle.utils.get_int_tensor_list(shape) + place = _current_expected_place() return _C_ops.gaussian( shape, float(mean), float(std), seed, dtype, place diff --git a/test/deprecated/legacy_test/CMakeLists.txt b/test/deprecated/legacy_test/CMakeLists.txt index 4968e979a137ad..65c575a18ca2c2 100644 --- a/test/deprecated/legacy_test/CMakeLists.txt +++ b/test/deprecated/legacy_test/CMakeLists.txt @@ -724,7 +724,6 @@ set_tests_properties(test_conv_nn_grad PROPERTIES TIMEOUT 220) set_tests_properties(test_program_prune_backward PROPERTIES TIMEOUT 120) set_tests_properties(test_imperative_optimizer_v2 PROPERTIES TIMEOUT 250) set_tests_properties(test_pool2d_op PROPERTIES TIMEOUT 120) -set_tests_properties(test_transpose_op PROPERTIES TIMEOUT 120) set_tests_properties(test_bilinear_interp_op PROPERTIES TIMEOUT 120) set_tests_properties(test_decoupled_py_reader PROPERTIES TIMEOUT 120) set_tests_properties(test_fuse_bn_act_pass PROPERTIES TIMEOUT 120) @@ -774,7 +773,6 @@ set(TEST_CINN_OPS test_gather_nd_op test_squeeze2_op test_elementwise_pow_op - test_transpose_op test_reshape_op test_unsqueeze2_op test_meshgrid_op diff --git a/test/legacy_test/CMakeLists.txt b/test/legacy_test/CMakeLists.txt index 767775eb17db41..7b495ce07b8747 100644 --- a/test/legacy_test/CMakeLists.txt +++ b/test/legacy_test/CMakeLists.txt @@ -811,6 +811,7 @@ if(NOT WITH_COVERAGE) set_tests_properties(test_weight_decay PROPERTIES TIMEOUT 120) endif() set_tests_properties(test_pow_op PROPERTIES TIMEOUT 60) +set_tests_properties(test_transpose_op PROPERTIES TIMEOUT 120) set_tests_properties(test_paddlescience PROPERTIES TIMEOUT 120) set_tests_properties(test_imperative_save_load_v2 PROPERTIES TIMEOUT 120) set_tests_properties(test_conv2d_transpose_op PROPERTIES TIMEOUT 120) @@ -945,6 +946,7 @@ set(TEST_CINN_OPS test_sum_op test_elementwise_min_op test_take_along_axis_op + test_transpose_op test_strided_slice_op test_pad_op) diff --git a/test/deprecated/legacy_test/test_pow.py b/test/legacy_test/test_pow.py similarity index 100% rename from test/deprecated/legacy_test/test_pow.py rename to test/legacy_test/test_pow.py diff --git a/test/deprecated/legacy_test/test_randn_op.py b/test/legacy_test/test_randn_op.py similarity index 99% rename from test/deprecated/legacy_test/test_randn_op.py rename to test/legacy_test/test_randn_op.py index 6bc3f48bc3faa6..dd6fd59411f26d 100644 --- a/test/deprecated/legacy_test/test_randn_op.py +++ b/test/legacy_test/test_randn_op.py @@ -90,4 +90,5 @@ def test_error(self): if __name__ == "__main__": + paddle.enable_static() unittest.main() diff --git a/test/deprecated/legacy_test/test_transpose_op.py b/test/legacy_test/test_transpose_op.py similarity index 100% rename from test/deprecated/legacy_test/test_transpose_op.py rename to test/legacy_test/test_transpose_op.py From 62c4170ece3b480b8fd5edeae38b26becd9d13fc Mon Sep 17 00:00:00 2001 From: SigureMo Date: Tue, 14 May 2024 17:52:47 +0000 Subject: [PATCH 2/3] add flatten2_op --- test/{deprecated => }/legacy_test/test_flatten2_op.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/{deprecated => }/legacy_test/test_flatten2_op.py (100%) diff --git a/test/deprecated/legacy_test/test_flatten2_op.py b/test/legacy_test/test_flatten2_op.py similarity index 100% rename from test/deprecated/legacy_test/test_flatten2_op.py rename to test/legacy_test/test_flatten2_op.py From e98dd041722873c66e52adc055305e610b2e4bdc Mon Sep 17 00:00:00 2001 From: SigureMo Date: Tue, 14 May 2024 18:00:37 +0000 Subject: [PATCH 3/3] move test_einsum_op --- test/deprecated/legacy_test/CMakeLists.txt | 1 - test/legacy_test/CMakeLists.txt | 1 + test/{deprecated => }/legacy_test/test_einsum_op.py | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename test/{deprecated => }/legacy_test/test_einsum_op.py (100%) diff --git a/test/deprecated/legacy_test/CMakeLists.txt b/test/deprecated/legacy_test/CMakeLists.txt index 65c575a18ca2c2..12bda5217c5879 100644 --- a/test/deprecated/legacy_test/CMakeLists.txt +++ b/test/deprecated/legacy_test/CMakeLists.txt @@ -708,7 +708,6 @@ set_tests_properties(test_imperative_ptb_rnn_sorted_gradient PROPERTIES TIMEOUT set_tests_properties(test_crop_tensor_op PROPERTIES TIMEOUT 120) set_tests_properties(test_imperative_ptb_rnn PROPERTIES TIMEOUT 120) set_tests_properties(test_svd_op PROPERTIES TIMEOUT 80) -set_tests_properties(test_einsum_op PROPERTIES TIMEOUT 120) set_tests_properties(test_qr_op PROPERTIES TIMEOUT 60) set_tests_properties(test_trilinear_interp_v2_op PROPERTIES TIMEOUT 120) set_tests_properties(test_masked_select_op PROPERTIES TIMEOUT 120) diff --git a/test/legacy_test/CMakeLists.txt b/test/legacy_test/CMakeLists.txt index 7b495ce07b8747..8ff2c0c13f9402 100644 --- a/test/legacy_test/CMakeLists.txt +++ b/test/legacy_test/CMakeLists.txt @@ -812,6 +812,7 @@ if(NOT WITH_COVERAGE) endif() set_tests_properties(test_pow_op PROPERTIES TIMEOUT 60) set_tests_properties(test_transpose_op PROPERTIES TIMEOUT 120) +set_tests_properties(test_einsum_op PROPERTIES TIMEOUT 120) set_tests_properties(test_paddlescience PROPERTIES TIMEOUT 120) set_tests_properties(test_imperative_save_load_v2 PROPERTIES TIMEOUT 120) set_tests_properties(test_conv2d_transpose_op PROPERTIES TIMEOUT 120) diff --git a/test/deprecated/legacy_test/test_einsum_op.py b/test/legacy_test/test_einsum_op.py similarity index 100% rename from test/deprecated/legacy_test/test_einsum_op.py rename to test/legacy_test/test_einsum_op.py