contiguous support to_static for Value (#61433)

wanghuancoder · web-flow · commit 77205c0a428f · 2024-02-02T10:32:56.000+08:00
* contiguous support to_static for Value
diff --git a/python/paddle/pir/math_op_patch.py b/python/paddle/pir/math_op_patch.py
@@ -151,6 +151,28 @@ def place(self):
             "Value do not have 'place' interface for pir graph mode, try not to use it. None will be returned."
         )
 
+    def contiguous(self):
+        """
+        Value don't have 'contiguous' interface in static graph mode
+        But this interface can greatly facilitate dy2static.
+        So we give a warnning here and return None.
+        """
+        warnings.warn(
+            "Value do not have 'contiguous' interface for static graph mode, try not to use it. self will be returned."
+        )
+        return self
+
+    def is_contiguous(self):
+        """
+        Value don't have 'is_contiguous' interface in static graph mode
+        But this interface can greatly facilitate dy2static.
+        So we give a warnning here and return None.
+        """
+        warnings.warn(
+            "Value do not have 'is_contiguous' interface for static graph mode, try not to use it. True will be returned."
+        )
+        return True
+
     @property
     def _ndim(self):
         """
@@ -577,6 +599,8 @@ def value_hash(self):
         ('cpu', cpu),
         ('cuda', cuda),
         ('place', place),
+        ('contiguous', contiguous),
+        ('is_contiguous', is_contiguous),
         ('item', _item),
         ('dim', dim),
         ('ndimension', ndimension),
diff --git a/test/dygraph_to_static/test_contiguous.py b/test/dygraph_to_static/test_contiguous.py
@@ -15,27 +15,29 @@
 import unittest
 
 import numpy as np
-from dygraph_to_static_utils import enable_to_static_guard
+from dygraph_to_static_utils import (
+    Dy2StTestBase,
+    test_legacy_and_pt_and_pir,
+)
 
 import paddle
 from paddle.jit.api import to_static
 
 
-@to_static
 def func_test_to_static():
-    x = paddle.arange(12, dtype=paddle.float32).reshape([2, 3, 2])
+    x = paddle.arange(12, dtype="float32").reshape([2, 3, 2])
     x = x.transpose([1, 0, 2])
     x = x.contiguous()
     assert x.is_contiguous()
     return x
 
 
-class TestContiguous(unittest.TestCase):
+class TestContiguous(Dy2StTestBase):
+    @test_legacy_and_pt_and_pir
     def test_to_static(self):
-        with enable_to_static_guard(True):
-            static_result = func_test_to_static()
-        with enable_to_static_guard(False):
-            dygraph_result = func_test_to_static()
+        static_func = to_static(func_test_to_static)
+        static_result = static_func()
+        dygraph_result = func_test_to_static()
         np.testing.assert_allclose(
             static_result,
             dygraph_result,
