[Dy2St] pir dy2st unittest verification - 104

python/paddle/jit/dy2static/function_spec.py

@@ -335,6 +335,14 @@ def _replace_value_with_input_spec(args):
                 input_var.shape, input_var.dtype, input_var.name
             )
             input_var.stop_gradient = stop_gradient
+        elif isinstance(input_var, paddle.pir.Value):
+            stop_gradient = input_var.stop_gradient
+            # TODO(gouzil): change input_var_name to input_var.name
+            input_var_name = input_var.get_defining_op().name() + "_var"
+            input_var = paddle.static.InputSpec(
+                input_var.shape, input_var.dtype, input_var_name
+            )
+            input_var.stop_gradient = stop_gradient
 
         args_with_spec.append(input_var)
     args_with_spec = paddle.utils.pack_sequence_as(args, args_with_spec)

python/paddle/static/input.py

@@ -14,6 +14,8 @@
 
 import os
 
+import numpy as np
+
 import paddle
 from paddle.base import Variable, core
 from paddle.base.data_feeder import check_type
@@ -206,8 +208,9 @@ def __init__(self, shape, dtype='float32', name=None, stop_gradient=False):
         self.shape = self._verify(shape)
         # convert dtype into united represention
         if dtype is not None:
-            if not isinstance(dtype, core.VarDesc.VarType):
+            if isinstance(dtype, (np.dtype, str)):
                 dtype = convert_np_dtype_to_dtype_(dtype)
+
         self.dtype = dtype
         self.name = name
         self.stop_gradient = stop_gradient
@@ -418,7 +421,7 @@ def setitem(x, index, value):
        (3) a[1,:, 3] = v -> setitem(a, (1, slice(None,None,None),3), v)
        (4) a[1, ..., 2]=v -> setitem(a, (1, ..., 2), v)
 
-    3. You can always use TUPLE as index input， even there is only one index.
+    3. You can always use TUPLE as index input, even there is only one index.
        (1) a[Tensor([10,10])]=v -> setitem(a, (Tensor([10,10]),), v)
        (2) a[1] = v -> setitem(a, (1,), v)
     """

test/dygraph_to_static/test_function_spec.py

@@ -17,20 +17,24 @@
 from test_declarative import foo_func
 
 import paddle
+from paddle.framework import in_pir_mode
 from paddle.jit.dy2static.function_spec import FunctionSpec
+from paddle.pir_utils import test_with_pir_api
 from paddle.static import InputSpec
 
 paddle.enable_static()
 
 
 class TestFunctionSpec(unittest.TestCase):
+    @test_with_pir_api
     def test_constructor(self):
         foo_spec = FunctionSpec(foo_func)
         args_name = foo_spec.args_name
         self.assertListEqual(args_name, ['a', 'b', 'c', 'd'])
         self.assertTrue(foo_spec.dygraph_function == foo_func)
         self.assertIsNone(foo_spec.input_spec)
 
+    @test_with_pir_api
     def test_verify_input_spec(self):
         a_spec = InputSpec([None, 10], name='a')
         b_spec = InputSpec([10], name='b')
@@ -42,6 +46,7 @@ def test_verify_input_spec(self):
         foo_spec = FunctionSpec(foo_func, input_spec=[a_spec, b_spec])
         self.assertTrue(len(foo_spec.flat_input_spec) == 2)
 
+    @test_with_pir_api
     def test_unified_args_and_kwargs(self):
         foo_spec = FunctionSpec(foo_func)
         # case 1: foo(10, 20, c=4)
@@ -69,13 +74,13 @@ def test_unified_args_and_kwargs(self):
         with self.assertRaises(ValueError):
             foo_spec.unified_args_and_kwargs([10], {'c': 4})
 
+    @test_with_pir_api
     def test_args_to_input_spec(self):
         a_spec = InputSpec([None, 10], name='a', stop_gradient=True)
         b_spec = InputSpec([10], name='b', stop_gradient=True)
 
         a_tensor = paddle.static.data(name='a_var', shape=[4, 10])
         b_tensor = paddle.static.data(name='b_var', shape=[4, 10])
-        kwargs = {'c': 1, 'd': 2}
 
         # case 1
         foo_spec = FunctionSpec(foo_func, input_spec=[a_spec, b_spec])
@@ -97,8 +102,12 @@ def test_args_to_input_spec(self):
         )
         self.assertTrue(len(input_with_spec) == 2)
         self.assertTrue(input_with_spec[0] == a_spec)  # a
-        self.assertTupleEqual(input_with_spec[1].shape, (4, 10))  # b.shape
-        self.assertEqual(input_with_spec[1].name, 'b_var')  # b.name
+        self.assertTupleEqual(
+            tuple(input_with_spec[1].shape), (4, 10)
+        )  # b.shape
+        if not in_pir_mode():
+            # TODO(gouzil): remove this if when OpResult.name is OK
+            self.assertEqual(input_with_spec[1].name, 'b_var')  # b.name
 
         # case 3
         # assert kwargs is None if set `input_spec`