[PIR] pir fix some windows case (#67517)

wanghuancoder · web-flow · commit f9ceccef5c89 · 2024-08-20T10:59:14.000+08:00
* pir fix some windows case

* refine
diff --git a/python/paddle/tensor/creation.py b/python/paddle/tensor/creation.py
@@ -69,9 +69,9 @@ def _complex_to_real_dtype(dtype: DTypeLike) -> DTypeLike:
     elif dtype == core.VarDesc.VarType.COMPLEX128:
         return core.VarDesc.VarType.FP64
     elif dtype == paddle.pir.core.DataType.COMPLEX64:
-        return paddle.pir.core.DataType.FP32
+        return paddle.pir.core.DataType.FLOAT32
     elif dtype == paddle.pir.core.DataType.COMPLEX128:
-        return paddle.pir.core.DataType.FP64
+        return paddle.pir.core.DataType.FLOAT64
     else:
         return dtype
 
@@ -81,9 +81,9 @@ def _real_to_complex_dtype(dtype: DTypeLike) -> DTypeLike:
         return core.VarDesc.VarType.COMPLEX64
     elif dtype == core.VarDesc.VarType.FP64:
         return core.VarDesc.VarType.COMPLEX128
-    elif dtype == paddle.pir.core.DataType.FP32:
+    elif dtype == paddle.pir.core.DataType.FLOAT32:
         return paddle.pir.core.DataType.COMPLEX64
-    elif dtype == paddle.pir.core.DataType.FP64:
+    elif dtype == paddle.pir.core.DataType.FLOAT64:
         return paddle.pir.core.DataType.COMPLEX128
     else:
         return dtype
diff --git a/python/paddle/tensor/manipulation.py b/python/paddle/tensor/manipulation.py
@@ -1374,13 +1374,42 @@ def concat(
             input = [t for t in input if t.shape.count(0) == 0]
         return _C_ops.concat(input, axis)
     elif in_pir_mode():
-        if isinstance(input, paddle.pir.Value):
-            assert input.is_dense_tensor_array_type(), (
-                "If the element of concat op is Value, "
-                "dtype of the element must be Tensorarray"
-            )
+        check_type(input, 'input', (list, tuple, paddle.pir.Value), 'concat')
+        if not isinstance(input, paddle.pir.Value):
+            for id, x in enumerate(input):
+                check_variable_and_dtype(
+                    x,
+                    'input[' + str(id) + ']',
+                    [
+                        'bool',
+                        'float16',
+                        'bfloat16',
+                        'float32',
+                        'float64',
+                        'int16',
+                        'int32',
+                        'int64',
+                        'int8',
+                        'unit8',
+                        'uint16',
+                        'complex64',
+                        'complex128',
+                    ],
+                    'concat',
+                )
+                if x.dtype != input[0].dtype:
+                    raise TypeError(
+                        "All the Tensors in the input must have the same data type."
+                    )
+        elif (
+            isinstance(input, paddle.pir.Value)
+            and input.is_dense_tensor_array_type()
+        ):
             out, _ = _C_ops.array_to_tensor(input, axis, False)
             return out
+        else:
+            input = [input]
+
         if not isinstance(input, paddle.pir.Value):
             input = [t for t in input if t.shape.count(0) == 0]
         return _C_ops.concat(input, axis)
diff --git a/test/contrib/test_fp16_utils.py b/test/contrib/test_fp16_utils.py
@@ -15,7 +15,6 @@
 import unittest
 
 import paddle
-from paddle import base
 from paddle.base import core
 from paddle.static.amp import fp16_utils
 
@@ -24,25 +23,27 @@
 
 class AMPTest(unittest.TestCase):
     def test_find_op_index(self):
-        block = base.default_main_program().global_block()
-        op_desc = core.OpDesc()
-        idx = fp16_utils.find_op_index(block.desc, op_desc)
-        assert idx == -1
+        with paddle.pir_utils.OldIrGuard():
+            block = paddle.base.default_main_program().global_block()
+            op_desc = core.OpDesc()
+            idx = fp16_utils.find_op_index(block.desc, op_desc)
+            assert idx == -1
 
     def test_find_true_post_op(self):
-        block = base.default_main_program().global_block()
-
-        var1 = block.create_var(name="X", shape=[3], dtype='float32')
-        var2 = block.create_var(name="Y", shape=[3], dtype='float32')
-        var3 = block.create_var(name="Z", shape=[3], dtype='float32')
-        op1 = block.append_op(
-            type="abs", inputs={"X": [var1]}, outputs={"Out": [var2]}
-        )
-        op2 = block.append_op(
-            type="abs", inputs={"X": [var2]}, outputs={"Out": [var3]}
-        )
-        res = fp16_utils.find_true_post_op(block.ops, op1, "Y")
-        assert res == [op2]
+        with paddle.pir_utils.OldIrGuard():
+            block = paddle.base.default_main_program().global_block()
+
+            var1 = block.create_var(name="X", shape=[3], dtype='float32')
+            var2 = block.create_var(name="Y", shape=[3], dtype='float32')
+            var3 = block.create_var(name="Z", shape=[3], dtype='float32')
+            op1 = block.append_op(
+                type="abs", inputs={"X": [var1]}, outputs={"Out": [var2]}
+            )
+            op2 = block.append_op(
+                type="abs", inputs={"X": [var2]}, outputs={"Out": [var3]}
+            )
+            res = fp16_utils.find_true_post_op(block.ops, op1, "Y")
+            assert res == [op2]
 
 
 if __name__ == '__main__':
diff --git a/test/legacy_test/test_concat_op.py b/test/legacy_test/test_concat_op.py
@@ -23,7 +23,7 @@
 import paddle
 import paddle.distributed as dist
 from paddle import base
-from paddle.base import Program, core, program_guard
+from paddle.base import core
 from paddle.pir_utils import IrGuard, test_with_pir_api
 
 
@@ -559,7 +559,9 @@ def if_enable_cinn(self):
 class TestConcatOpError(unittest.TestCase):
     def test_errors(self):
         paddle.enable_static()
-        with program_guard(Program(), Program()):
+        with paddle.base.program_guard(
+            paddle.base.Program(), paddle.base.Program()
+        ):
             # The input type of concat_op should be list.
 
             x1 = paddle.static.data(shape=[-1, 4], dtype='int32', name='x1')
@@ -600,7 +602,7 @@ class TestConcatAPI(unittest.TestCase):
     @test_with_pir_api
     def test_base_api(self):
         paddle.enable_static()
-        with paddle.static.program_guard(paddle.static.Program()):
+        with paddle.base.program_guard(paddle.base.Program()):
             x_1 = paddle.static.data(
                 shape=[None, 1, 4, 5], dtype='int32', name='x_1'
             )
@@ -639,7 +641,7 @@ def test_base_api(self):
     @test_with_pir_api
     def test_api(self):
         paddle.enable_static()
-        with paddle.static.program_guard(paddle.static.Program()):
+        with paddle.base.program_guard(paddle.base.Program()):
             x_1 = paddle.static.data(
                 shape=[None, 1, 4, 5], dtype='int32', name='x_1'
             )
@@ -697,7 +699,9 @@ def test_imperative(self):
         self.assertEqual((out2.numpy() == np_out2).all(), True)
 
     def test_errors(self):
-        with program_guard(Program(), Program()):
+        with paddle.base.program_guard(
+            paddle.base.Program(), paddle.base.Program()
+        ):
             # The item in input must be Variable.
             x2 = base.create_lod_tensor(
                 np.array([[-1]]), [[1]], base.CPUPlace()
@@ -747,8 +751,8 @@ def setUp(self):
     def set_program(self, use_base_api):
         paddle.enable_static()
         if use_base_api:
-            self.program = paddle.static.Program()
-            with paddle.static.program_guard(self.program):
+            self.program = paddle.base.Program()
+            with paddle.base.program_guard(self.program):
                 input = paddle.assign(self.x)
                 tensor_array = paddle.tensor.create_array(dtype='float32')
                 zero = paddle.tensor.fill_constant(
@@ -760,8 +764,8 @@ def set_program(self, use_base_api):
 
                 self.out_var = paddle.concat(tensor_array, axis=self.axis)
         else:
-            self.program = paddle.static.Program()
-            with paddle.static.program_guard(self.program):
+            self.program = paddle.base.Program()
+            with paddle.base.program_guard(self.program):
                 input = paddle.assign(self.x)
                 tensor_array = paddle.tensor.create_array(
                     dtype='float32'
@@ -960,8 +964,8 @@ class TestConcatOpErrorWithPir(unittest.TestCase):
     @test_with_pir_api
     def test_errors_with_pir(self):
         paddle.enable_static()
-        with paddle.static.program_guard(
-            paddle.static.Program(), paddle.static.Program()
+        with paddle.base.program_guard(
+            paddle.base.Program(), paddle.base.Program()
         ):
             # The type of axis in concat_op should be int or Variable.
             x6 = paddle.static.data(shape=[-1, 4], dtype='float32', name='x6')
@@ -985,8 +989,8 @@ def test_empty_inputs_dygraph(self):
             paddle.concat([])
 
     def test_empty_inputs_static(self):
-        with IrGuard(), paddle.static.program_guard(
-            paddle.static.Program(), paddle.static.Program()
+        with IrGuard(), paddle.base.program_guard(
+            paddle.base.Program(), paddle.base.Program()
         ):
             with self.assertRaisesRegex(ValueError, "but got empty list"):
                 paddle.concat([], axis=0)
