[PIR Unittest] fix pir uts (test_sigmoid_cross_entropy_with_logits_op.py,test_signal.py,test_stride.py) (#67389)

ooooo-create · web-flow · commit 0880ac084fcd · 2024-08-14T11:12:23.000+08:00
* fix 3 pir uts

* fix camke setting
diff --git a/python/paddle/nn/functional/loss.py b/python/paddle/nn/functional/loss.py
@@ -22,7 +22,7 @@
 from paddle.static.nn.control_flow import Assert
 from paddle.utils import deprecated
 
-from ...base.data_feeder import check_variable_and_dtype
+from ...base.data_feeder import check_type, check_variable_and_dtype
 from ...base.framework import (
     _current_expected_place,
     core,
@@ -842,6 +842,19 @@ def binary_cross_entropy_with_logits(
         )
 
     if in_dynamic_or_pir_mode():
+        if in_pir_mode():
+            check_type(
+                logit,
+                'logit',
+                paddle.pir.Value,
+                'binary_cross_entropy_with_logits',
+            )
+            check_type(
+                label,
+                'label',
+                paddle.pir.Value,
+                'binary_cross_entropy_with_logits',
+            )
         one = _C_ops.full(
             [1],
             1.0,
diff --git a/python/paddle/signal.py b/python/paddle/signal.py
@@ -17,7 +17,11 @@
 
 import paddle
 from paddle import _C_ops
-from paddle.framework import in_dynamic_mode
+from paddle.framework import (
+    in_dynamic_mode,
+    in_dynamic_or_pir_mode,
+    in_pir_mode,
+)
 
 from .base.data_feeder import check_variable_and_dtype
 from .base.layer_helper import LayerHelper
@@ -137,6 +141,8 @@ def frame(
                 f'but got ({frame_length}) > ({x.shape[axis]}).'
             )
         return _C_ops.frame(x, frame_length, hop_length, axis)
+    elif in_pir_mode():
+        return _C_ops.frame(x, frame_length, hop_length, axis)
     else:
         op_type = 'frame'
         check_variable_and_dtype(
@@ -242,7 +248,7 @@ def overlap_add(
 
     op_type = 'overlap_add'
 
-    if in_dynamic_mode():
+    if in_dynamic_or_pir_mode():
         out = _C_ops.overlap_add(x, hop_length, axis)
     else:
         check_variable_and_dtype(
diff --git a/python/paddle/tensor/manipulation.py b/python/paddle/tensor/manipulation.py
@@ -6887,7 +6887,9 @@ def view(
     if isinstance(shape_or_dtype, (list, tuple)):
         return _C_ops.view_shape(x, shape_or_dtype)
     else:
-        if not isinstance(shape_or_dtype, core.VarDesc.VarType):
+        if not isinstance(
+            shape_or_dtype, (core.VarDesc.VarType, core.DataType)
+        ):
             shape_or_dtype = convert_np_dtype_to_dtype_(shape_or_dtype)
         return _C_ops.view_dtype(x, shape_or_dtype)
 
diff --git a/test/deprecated/legacy_test/CMakeLists.txt b/test/deprecated/legacy_test/CMakeLists.txt
@@ -456,7 +456,6 @@ if((NOT WITH_GPU)
   list(REMOVE_ITEM TEST_OPS "test_dist_mnist_batch_merge")
 endif()
 
-list(REMOVE_ITEM TEST_OPS "test_stride")
 list(REMOVE_ITEM TEST_OPS "test_graph_reindex")
 if(WITH_COVERAGE)
   list(REMOVE_ITEM TEST_OPS test_cuda_graphed_layer)
@@ -631,8 +630,6 @@ endif()
 set_tests_properties(test_imperative_selected_rows_to_lod_tensor
                      PROPERTIES TIMEOUT 200)
 set_tests_properties(test_argsort_op_deprecated PROPERTIES TIMEOUT 120)
-set_tests_properties(test_sigmoid_cross_entropy_with_logits_op
-                     PROPERTIES TIMEOUT 120)
 set_tests_properties(test_sgd_op_deprecated PROPERTIES TIMEOUT 250)
 set_tests_properties(test_generator_dataloader_deprecated PROPERTIES TIMEOUT
                                                                      120)
@@ -744,9 +741,6 @@ set_tests_properties(
 set_tests_properties(test_layer_norm_op_deprecated_static_build
                      PROPERTIES TIMEOUT 1500)
 
-py_test_modules(test_stride MODULES test_stride ENVS
-                FLAGS_use_stride_kernel=true)
-
 set_pir_tests_properties()
 
 set_tests_properties(test_apply_pass_to_program_deprecated PROPERTIES TIMEOUT
diff --git a/test/legacy_test/CMakeLists.txt b/test/legacy_test/CMakeLists.txt
@@ -533,6 +533,7 @@ if((NOT WITH_GPU)
   list(REMOVE_ITEM TEST_OPS "test_dist_mnist_batch_merge")
 endif()
 
+list(REMOVE_ITEM TEST_OPS "test_stride")
 list(REMOVE_ITEM TEST_OPS "test_graph_reindex")
 if(WITH_COVERAGE)
   list(REMOVE_ITEM TEST_OPS test_weight_decay)
@@ -1178,6 +1179,8 @@ if((WITH_ROCM OR WITH_GPU) AND NOT WIN32)
 endif()
 
 set_tests_properties(test_bicubic_interp_v2_op PROPERTIES TIMEOUT 120)
+py_test_modules(test_stride MODULES test_stride ENVS
+                FLAGS_use_stride_kernel=true)
 
 set_pir_tests_properties()
 
@@ -1232,6 +1235,8 @@ set_tests_properties(test_data_norm_op PROPERTIES LABELS "RUN_TYPE=DIST")
 set_tests_properties(test_deformable_conv_op PROPERTIES TIMEOUT 200)
 set_tests_properties(test_regularizer PROPERTIES TIMEOUT 150)
 set_tests_properties(test_regularizer_api PROPERTIES TIMEOUT 150)
+set_tests_properties(test_sigmoid_cross_entropy_with_logits_op
+                     PROPERTIES TIMEOUT 120)
 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 60)
diff --git a/test/legacy_test/test_sigmoid_cross_entropy_with_logits_op.py b/test/legacy_test/test_sigmoid_cross_entropy_with_logits_op.py
@@ -21,6 +21,7 @@
 
 import paddle
 from paddle import base
+from paddle.pir_utils import test_with_pir_api
 
 
 def loss_wrapper(
@@ -336,6 +337,7 @@ def test_check_grad(self):
 
 
 class TestSigmoidCrossEntropyWithLogitsOpError(unittest.TestCase):
+    @test_with_pir_api
     def test_errors(self):
         with paddle.static.program_guard(
             paddle.static.Program(), paddle.static.Program()
diff --git a/test/legacy_test/test_signal.py b/test/legacy_test/test_signal.py
@@ -22,6 +22,7 @@
 from numpy.lib.stride_tricks import as_strided
 
 import paddle
+from paddle.pir_utils import test_with_pir_api
 
 paddle.set_default_dtype('float64')
 
@@ -694,6 +695,7 @@ def test_frame(self):
         ('test_3d_input2', rand_x(3, np.float64, shape=[4, 2, 150]), 50, 15, -1),
     ])  # fmt: skip
 class TestFrameStatic(unittest.TestCase):
+    @test_with_pir_api
     def test_frame_static(self):
         paddle.enable_static()
         mp, sp = paddle.static.Program(), paddle.static.Program()
@@ -776,6 +778,7 @@ def test_overlap_add(self):
         ('test_4d_input2', rand_x(4, np.float64, shape=[3, 5, 12, 8]), 5, -1),
     ])  # fmt: skip
 class TestOverlapAddStatic(unittest.TestCase):
+    @test_with_pir_api
     def test_overlap_add_static(self):
         paddle.enable_static()
         mp, sp = paddle.static.Program(), paddle.static.Program()
diff --git a/test/legacy_test/test_stride.py b/test/legacy_test/test_stride.py
@@ -759,7 +759,8 @@ def func():
             y = paddle.transpose(x, perm=[1, 0, 2])
             x.add_(x)
 
-        self.assertRaises(ValueError, func)
+        if not paddle.framework.use_pir_api():
+            self.assertRaises(ValueError, func)
 
     def test_no_error(self):
         @paddle.jit.to_static(full_graph=True)
