[PIR]Fix some pir uts (#65795)

0x45f · web-flow · commit 7d0dee330252 · 2024-07-09T14:09:06.000+08:00
diff --git a/python/paddle/tensor/manipulation.py b/python/paddle/tensor/manipulation.py
@@ -4161,12 +4161,12 @@ def scatter_nd_add(
             >>> print(output.shape)
             [3, 5, 9, 10]
     """
+    if x.dtype != updates.dtype:
+        raise ValueError("x and updates must have same data type.")
+
     if in_dynamic_or_pir_mode():
         return _C_ops.scatter_nd_add(x, index, updates)
     else:
-        if x.dtype != updates.dtype:
-            raise ValueError("x and updates must have same data type.")
-
         helper = LayerHelper('scatter_nd_add', **locals())
         dtype = helper.input_dtype(input_param_name='x')
         output = helper.create_variable_for_type_inference(dtype)
diff --git a/test/deprecated/legacy_test/CMakeLists.txt b/test/deprecated/legacy_test/CMakeLists.txt
@@ -662,7 +662,6 @@ set_tests_properties(test_sigmoid_cross_entropy_with_logits_op
 set_tests_properties(test_sgd_op_deprecated PROPERTIES TIMEOUT 250)
 set_tests_properties(test_generator_dataloader_deprecated PROPERTIES TIMEOUT
                                                                      120)
-set_tests_properties(test_reduce_op PROPERTIES TIMEOUT 500)
 set_tests_properties(test_program_prune_backward_deprecated PROPERTIES TIMEOUT
                                                                        120)
 set_tests_properties(test_decoupled_py_reader_deprecated PROPERTIES TIMEOUT 120)
@@ -694,15 +693,13 @@ set_tests_properties(test_inplace_addto_strategy_deprecated PROPERTIES TIMEOUT
 
 set(TEST_CINN_OPS
     test_softmax_op
-    test_reduce_op
     test_slice_op
     test_slice_op_deprecated
     test_gather_nd_op
     test_scale_op
     test_layer_norm_op_deprecated
     test_where_op
     test_arg_min_max_op
-    test_scatter_nd_op
     test_instance_norm_op
     test_instance_norm_op_deprecated
     test_cumsum_op
@@ -737,7 +734,6 @@ set(STATIC_BUILD_TESTS
     test_momentum_op
     test_momentum_op_deprecated
     test_nce_deprecated
-    test_reduce_op
     test_sparse_conv_op
     test_sparse_norm_op
     test_tensor_array_to_tensor
@@ -784,13 +780,12 @@ set_tests_properties(
 )
 set_tests_properties(test_layer_norm_op_deprecated_static_build
                      PROPERTIES TIMEOUT 1500)
-set_tests_properties(test_reduce_op_static_build PROPERTIES TIMEOUT 500)
+
 py_test_modules(test_stride MODULES test_stride ENVS
                 FLAGS_use_stride_kernel=true)
 
 set_tests_properties(test_linalg_matrix_exp PROPERTIES TIMEOUT 120)
 set_pir_tests_properties()
 
-set_tests_properties(test_reduce_as_op PROPERTIES TIMEOUT 30)
 set_tests_properties(test_attribute_var_deprecated PROPERTIES TIMEOUT 100)
 set_tests_properties(test_inference_api_deprecated PROPERTIES TIMEOUT 100)
diff --git a/test/legacy_test/CMakeLists.txt b/test/legacy_test/CMakeLists.txt
@@ -973,6 +973,8 @@ endif()
 
 set(TEST_CINN_OPS
     test_assign_op
+    test_reduce_op
+    test_scatter_nd_op
     test_layer_norm_op
     test_atan2_op
     test_cast_op
@@ -1043,6 +1045,7 @@ set_tests_properties(
 # These UTs are to temporarily test static build for standalone_executor, will be removed after static build is enabled by default.
 set(STATIC_BUILD_TESTS
     test_adagrad_op
+    test_reduce_op
     test_adamw_op
     test_bincount_op
     test_batch_norm_op
@@ -1204,3 +1207,6 @@ set_tests_properties(test_regularizer PROPERTIES TIMEOUT 150)
 set_tests_properties(test_regularizer_api PROPERTIES TIMEOUT 150)
 set_tests_properties(test_sgd_op PROPERTIES TIMEOUT 250)
 set_tests_properties(test_squeeze2_op_rename PROPERTIES TIMEOUT 120)
+set_tests_properties(test_reduce_as_op PROPERTIES TIMEOUT 30)
+set_tests_properties(test_reduce_op PROPERTIES TIMEOUT 500)
+set_tests_properties(test_reduce_op_static_build PROPERTIES TIMEOUT 500)
diff --git a/test/legacy_test/test_reduce_as_op.py b/test/legacy_test/test_reduce_as_op.py
@@ -16,6 +16,7 @@
 
 import numpy as np
 from op_test import OpTest
+from utils import dygraph_guard
 
 import paddle
 from paddle.static import InputSpec
@@ -211,10 +212,11 @@ def base_net(self, flag=None):
         return res
 
     def test_all_dynamic(self):
-        res_ref = self.base_net()
-        res = self.base_net("static")
-        for ref, actual in zip(res_ref, res):
-            np.testing.assert_allclose(ref, actual, rtol=self.tol)
+        with dygraph_guard():
+            res_ref = self.base_net()
+            res = self.base_net("static")
+            for ref, actual in zip(res_ref, res):
+                np.testing.assert_allclose(ref, actual, rtol=self.tol)
 
 
 if __name__ == "__main__":
diff --git a/test/legacy_test/test_reduce_op.py b/test/legacy_test/test_reduce_op.py
@@ -21,7 +21,7 @@
 import paddle
 from paddle import base
 from paddle.base import core
-from paddle.base.framework import convert_np_dtype_to_dtype_, in_pir_mode
+from paddle.base.framework import in_pir_mode
 from paddle.pir_utils import test_with_pir_api
 
 
@@ -1579,8 +1579,8 @@ def setUp(self):
         self.attrs = {'reduce_all': True}
         self.attrs.update(
             {
-                'in_dtype': int(convert_np_dtype_to_dtype_(np.float32)),
-                'out_dtype': int(convert_np_dtype_to_dtype_(np.float64)),
+                'in_dtype': paddle.float32,
+                'out_dtype': paddle.float64,
             }
         )
         self.if_enable_cinn()
@@ -1606,8 +1606,8 @@ def setUp(self):
         self.attrs = {'dim': [1]}
         self.attrs.update(
             {
-                'in_dtype': int(convert_np_dtype_to_dtype_(np.float32)),
-                'out_dtype': int(convert_np_dtype_to_dtype_(np.float64)),
+                'in_dtype': paddle.float32,
+                'out_dtype': paddle.float64,
             }
         )
         # cinn op_mapper not support in_dtype/out_dtype attr
@@ -1631,8 +1631,8 @@ def setUp(self):
         self.attrs = {'dim': [1], 'keep_dim': True}
         self.attrs.update(
             {
-                'in_dtype': int(convert_np_dtype_to_dtype_(np.float32)),
-                'out_dtype': int(convert_np_dtype_to_dtype_(np.float64)),
+                'in_dtype': paddle.float32,
+                'out_dtype': paddle.float64,
             }
         )
         # cinn op_mapper not support in_dtype/out_dtype attr
diff --git a/test/legacy_test/test_rnn_cell_api.py b/test/legacy_test/test_rnn_cell_api.py
@@ -17,15 +17,17 @@
 
 import numpy as np
 
-sys.path.append("../../rnn")
+from paddle.base.layer_helper_base import LayerHelperBase
+
+sys.path.append("../rnn")
 from rnn_numpy import (
     LSTMCell,
     rnn as numpy_rnn,
 )
 
 import paddle
 from paddle import base
-from paddle.base import core, framework
+from paddle.base import core
 from paddle.base.executor import Executor
 from paddle.base.framework import Program, program_guard
 from paddle.nn.layer.rnn import rnn as dynamic_rnn
@@ -146,14 +148,15 @@ def setUp(self):
 
     def test_run(self):
         numpy_cell = LSTMCell(self.input_size, self.hidden_size)
+        LayerHelperBase.set_default_dtype("float64")
         dynamic_cell = paddle.nn.LSTMCell(self.input_size, self.hidden_size)
 
         if core.is_compiled_with_cuda():
             place = core.CUDAPlace(0)
         else:
             place = core.CPUPlace()
         exe = Executor(place)
-        exe.run(framework.default_startup_program())
+        exe.run(paddle.static.default_startup_program())
 
         state = numpy_cell.parameters
         for k, v in dynamic_cell.named_parameters():
diff --git a/test/legacy_test/test_rnn_op.py b/test/legacy_test/test_rnn_op.py
diff --git a/test/legacy_test/test_scatter_nd_op.py b/test/legacy_test/test_scatter_nd_op.py
diff --git a/test/legacy_test/test_seed_op.py b/test/legacy_test/test_seed_op.py

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`import paddle`
`22`	`22`	`from paddle import base`
`23`	`23`	`from paddle.base import core`
`24`		`-from paddle.base.framework import convert_np_dtype_to_dtype_, in_pir_mode`
	`24`	`+from paddle.base.framework import in_pir_mode`
`25`	`25`	`from paddle.pir_utils import test_with_pir_api`
`26`	`26`
`27`	`27`
`@@ -1579,8 +1579,8 @@ def setUp(self):`
`1579`	`1579`	`self.attrs = {'reduce_all': True}`
`1580`	`1580`	`self.attrs.update(`
`1581`	`1581`	`{`
`1582`		`- 'in_dtype': int(convert_np_dtype_to_dtype_(np.float32)),`
`1583`		`- 'out_dtype': int(convert_np_dtype_to_dtype_(np.float64)),`
	`1582`	`+ 'in_dtype': paddle.float32,`
	`1583`	`+ 'out_dtype': paddle.float64,`
`1584`	`1584`	`}`
`1585`	`1585`	`)`
`1586`	`1586`	`self.if_enable_cinn()`
`@@ -1606,8 +1606,8 @@ def setUp(self):`
`1606`	`1606`	`self.attrs = {'dim': [1]}`
`1607`	`1607`	`self.attrs.update(`
`1608`	`1608`	`{`
`1609`		`- 'in_dtype': int(convert_np_dtype_to_dtype_(np.float32)),`
`1610`		`- 'out_dtype': int(convert_np_dtype_to_dtype_(np.float64)),`
	`1609`	`+ 'in_dtype': paddle.float32,`
	`1610`	`+ 'out_dtype': paddle.float64,`
`1611`	`1611`	`}`
`1612`	`1612`	`)`
`1613`	`1613`	`# cinn op_mapper not support in_dtype/out_dtype attr`
`@@ -1631,8 +1631,8 @@ def setUp(self):`
`1631`	`1631`	`self.attrs = {'dim': [1], 'keep_dim': True}`
`1632`	`1632`	`self.attrs.update(`
`1633`	`1633`	`{`
`1634`		`- 'in_dtype': int(convert_np_dtype_to_dtype_(np.float32)),`
`1635`		`- 'out_dtype': int(convert_np_dtype_to_dtype_(np.float64)),`
	`1634`	`+ 'in_dtype': paddle.float32,`
	`1635`	`+ 'out_dtype': paddle.float64,`
`1636`	`1636`	`}`
`1637`	`1637`	`)`
`1638`	`1638`	`# cinn op_mapper not support in_dtype/out_dtype attr`