fix error in PIR slice (#60259)

zoooo0820 · web-flow · commit c475cd665119 · 2023-12-25T17:36:57.000+08:00
* fix error in PIR slice, still has probrolem

* fix ut
diff --git a/python/paddle/utils/layers_utils.py b/python/paddle/utils/layers_utils.py
@@ -380,10 +380,10 @@ def _is_symmetric_padding(padding, data_dim):
 
 def _contain_var(list_or_tuple):
     """
-    Check whether list or tuple contains variable / OpResult.
+    Check whether list or tuple contains variable / OpResult / Value.
     """
     for item in list_or_tuple:
-        if isinstance(item, (Variable, paddle.pir.OpResult)):
+        if isinstance(item, (Variable, paddle.pir.OpResult, paddle.pir.Value)):
             return True
     return False
 
@@ -394,7 +394,7 @@ def get_int_tensor_list(ele_list, place=None, default_dtype='int64'):
 
     int_tensor_list = []
     for ele in ele_list:
-        if isinstance(ele, paddle.pir.OpResult):
+        if isinstance(ele, (paddle.pir.OpResult, paddle.pir.Value)):
             ele.stop_gradient = True
             if convert_dtype(ele.dtype) != default_dtype:
                 ele = paddle.cast(x=ele, dtype=default_dtype)
@@ -466,13 +466,13 @@ def _get_shape_tensor(list_shape):
 
 def _convert_to_tensor_list(old_list, dtype="int32"):
     """
-    Converts all elements of a list to Variable / OpResult.
+    Converts all elements of a list to Variable / OpResult / Value.
     """
     from paddle.tensor import fill_constant
 
     new_list_tensor = []
     for ele in old_list:
-        if isinstance(ele, (Variable, paddle.pir.OpResult)):
+        if isinstance(ele, (Variable, paddle.pir.OpResult, paddle.pir.Value)):
             ele.stop_gradient = True
             new_list_tensor.append(ele)
         else:
diff --git a/test/legacy_test/test_while_loop_op.py b/test/legacy_test/test_while_loop_op.py
@@ -704,7 +704,7 @@ def value_error_body_returns_with_mutable_list():
 
 class TestApiWhileLoopSliceInBody(unittest.TestCase):
     @compare_legacy_with_pt
-    # @test_with_pir_api (need to fix slice bug in pir)
+    @test_with_pir_api
     def test_var_slice(self):
         def cond(z, i):
             return i + 1 <= x_shape[0]
@@ -716,7 +716,8 @@ def body(z, i):
 
         main_program = paddle.static.Program()
         startup_program = paddle.static.Program()
-        with program_guard(main_program, startup_program):
+
+        with paddle.static.program_guard(main_program, startup_program):
             x = paddle.static.data(name='x', shape=[-1, 5], dtype='int32')
             z = paddle.tensor.fill_constant([], 'int32', 0)
             x_shape = paddle.shape(x)
