[PIR]Fix tests (#65911)

changeyoung98 · web-flow · commit 605aa6b2231c · 2024-07-12T17:33:31.000+08:00
* refine tests

* fix op benchmark

* fix op benchmark
diff --git a/python/paddle/nn/functional/pooling.py b/python/paddle/nn/functional/pooling.py
@@ -2187,7 +2187,7 @@ def fractional_max_pool2d(
         if output_size[1] is None:
             output_size[1] = in_w
 
-    if in_dygraph_mode():
+    if in_dynamic_or_pir_mode():
         pool_out = _C_ops.fractional_max_pool2d(
             x, output_size, kernel_size, float(random_u), return_mask
         )
@@ -2344,7 +2344,7 @@ def fractional_max_pool3d(
         if output_size[2] is None:
             output_size[2] = in_w
 
-    if in_dygraph_mode():
+    if in_dynamic_or_pir_mode():
         pool_out = _C_ops.fractional_max_pool3d(
             x,
             output_size,
diff --git a/python/paddle/tensor/manipulation.py b/python/paddle/tensor/manipulation.py
@@ -4437,7 +4437,16 @@ def expand_as(x: Tensor, y: Tensor, name: str | None = None) -> Tensor:
             [[1, 2, 3],
              [1, 2, 3]])
     """
-    if in_dynamic_or_pir_mode():
+    if in_dynamic_mode():
+        return _C_ops.expand_as(x, None, y.shape)
+    elif in_pir_mode():
+        if convert_dtype(x.dtype) == 'bool' and not x.stop_gradient:
+            raise ValueError(
+                "When the data type of input 'x' for expand_as is bool, "
+                "you must set its stop_gradient to be False by "
+                "some_var.stop_gradient = True, supporting "
+                "some_var as the input 'x'."
+            )
         return _C_ops.expand_as(x, None, y.shape)
     else:
         check_variable_and_dtype(
diff --git a/test/deprecated/legacy_test/CMakeLists.txt b/test/deprecated/legacy_test/CMakeLists.txt
@@ -205,11 +205,10 @@ if(APPLE)
   endif()
   message(
     WARNING
-      "These tests has been disabled in OSX before being fixed:\n test_fuse_elewise_add_act_pass \n test_detection_map_op \n test_dist_se_resnext_*"
+      "These tests has been disabled in OSX before being fixed:\n test_fuse_elewise_add_act_pass \n test_dist_se_resnext_*"
   )
   # this op is not support on mac
   list(REMOVE_ITEM TEST_OPS test_fusion_seqexpand_concat_fc_op)
-  list(REMOVE_ITEM TEST_OPS test_detection_map_op)
   list(REMOVE_ITEM TEST_OPS test_fuse_elewise_add_act_pass)
 endif()
 if(NOT WITH_MKLML)
diff --git a/test/legacy_test/test_clip_grad_value_.py b/test/legacy_test/test_clip_grad_value_.py
@@ -65,18 +65,7 @@ def TestValueError():
 
         self.assertRaises(ValueError, TestValueError)
 
-        def TestRuntimeErrorStaticMode():
-            paddle.enable_static()
-            input_pd = paddle.to_tensor(
-                np.random.random([1, 2]).astype(np.float32)
-            )
-            input_pd.grad = paddle.to_tensor(
-                np.random.random([1, 2]).astype(np.float32)
-            )
-            clip_grad_value_(input_pd, clip_value=1)
-            paddle.disable_static()
-
-        self.assertRaises(RuntimeError, TestRuntimeErrorStaticMode)
+        # NOTE: delete TestRuntimeErrorStaticMode because pir.Value has no .grad attribute
 
 
 def run_test_equal_np(
diff --git a/test/legacy_test/test_detection.py b/test/legacy_test/test_detection.py
@@ -239,6 +239,9 @@ def test_distribute_fpn_proposals_error(self):
             fpn_rois = paddle.static.data(
                 name='data_error', shape=[10, 4], dtype='int32', lod_level=1
             )
+            rois_num = paddle.static.data(
+                name='rois_num', shape=[None], dtype='int32'
+            )
             self.assertRaises(
                 TypeError,
                 paddle.vision.ops.distribute_fpn_proposals,
@@ -247,6 +250,7 @@ def test_distribute_fpn_proposals_error(self):
                 max_level=5,
                 refer_level=4,
                 refer_scale=224,
+                rois_num=rois_num,
             )
 
     def test_distribute_fpn_proposals_error2(self):
diff --git a/test/legacy_test/test_expand_as_v2_op.py b/test/legacy_test/test_expand_as_v2_op.py
diff --git a/test/legacy_test/test_fractional_max_pool2d_api.py b/test/legacy_test/test_fractional_max_pool2d_api.py
@@ -401,17 +401,17 @@ def test_static_graph(self):
             out_5 = fractional_max_pool(x=x)
 
             exe = paddle.static.Executor(place=place)
-            [res_1, res_2, res_3, res_4, res_5] = exe.run(
+            res = exe.run(
                 base.default_main_program(),
                 feed={"x": self.x_np},
                 fetch_list=[out_1, out_2, out_3, out_4, out_5],
             )
 
-            np.testing.assert_allclose(res_1, self.res_1_np)
-            np.testing.assert_allclose(res_2, self.res_2_np)
-            np.testing.assert_allclose(res_3, self.res_3_np)
-            np.testing.assert_allclose(res_4, self.res_4_np)
-            np.testing.assert_allclose(res_5, self.res_5_np)
+            np.testing.assert_allclose(res[0], self.res_1_np)
+            np.testing.assert_allclose(res[1], self.res_2_np)
+            np.testing.assert_allclose(res[2], self.res_3_np)
+            np.testing.assert_allclose(res[3], self.res_4_np)
+            np.testing.assert_allclose(res[4], self.res_5_np)
 
     def test_dynamic_graph(self):
         for use_cuda in (
diff --git a/test/legacy_test/test_fractional_max_pool3d_api.py b/test/legacy_test/test_fractional_max_pool3d_api.py
@@ -484,17 +484,17 @@ def test_static_graph(self):
             out_5 = fractional_max_pool(x=x)
 
             exe = paddle.static.Executor(place=place)
-            [res_1, res_2, res_3, res_4, res_5] = exe.run(
+            res = exe.run(
                 base.default_main_program(),
                 feed={"x": self.x_np},
                 fetch_list=[out_1, out_2, out_3, out_4, out_5],
             )
 
-            np.testing.assert_allclose(res_1, self.res_1_np)
-            np.testing.assert_allclose(res_2, self.res_2_np)
-            np.testing.assert_allclose(res_3, self.res_3_np)
-            np.testing.assert_allclose(res_4, self.res_4_np)
-            np.testing.assert_allclose(res_5, self.res_5_np)
+            np.testing.assert_allclose(res[0], self.res_1_np)
+            np.testing.assert_allclose(res[1], self.res_2_np)
+            np.testing.assert_allclose(res[2], self.res_3_np)
+            np.testing.assert_allclose(res[3], self.res_4_np)
+            np.testing.assert_allclose(res[4], self.res_5_np)
 
     def test_dynamic_graph(self):
         for use_cuda in (
