[API]Support static branch in paddle.to_tensor

python/paddle/fluid/dygraph/dygraph_to_static/basic_api_transformer.py

@@ -129,9 +129,6 @@ def is_to_variable(node):
     if utils.is_dygraph_api(node):
         return api_name.endswith("to_variable")
 
-    if utils.is_paddle_api(node):
-        return api_name.endswith("to_tensor")
-
     return False
 
 

python/paddle/fluid/dygraph/dygraph_to_static/partial_program.py

@@ -556,6 +556,7 @@ def create_out(var_id):
                 var_base = core.eager.Tensor(var_desc.dtype(), var_desc.shape(),
                                              var_desc.name(), var_desc.type(),
                                              False)
+            var_base.stop_gradient = var.stop_gradient
             out_varbase_map[var_desc.name()] = var_base
             return var_base
 

python/paddle/fluid/tests/unittests/dygraph_to_static/test_convert_call_generator.py

@@ -29,7 +29,7 @@
 
 def dyfunc_generator():
     for i in range(100):
-        yield paddle.to_tensor([i] * 10)
+        yield paddle.fluid.dygraph.to_variable([i] * 10)
 
 
 def main_func():

python/paddle/fluid/tests/unittests/dygraph_to_static/test_tensor_shape.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# to_tensor api will create 1 less op now, this test was changed
+
 from __future__ import print_function
 
 import numpy
@@ -300,7 +302,7 @@ def init_test_func(self):
         self.dygraph_func = dyfunc_tensor_shape_2
 
     def _set_expected_op_num(self):
-        self.expected_op_num = 2
+        self.expected_op_num = 1
         self.expected_shape_op_num = 0
         self.expected_slice_op_num = 0
 
@@ -349,7 +351,7 @@ def init_test_func(self):
         self.dygraph_func = dyfunc_tuple_shape_1
 
     def _set_expected_op_num(self):
-        self.expected_op_num = 5
+        self.expected_op_num = 4
         self.expected_shape_op_num = 1
         self.expected_slice_op_num = 2
 
@@ -364,7 +366,7 @@ def init_test_func(self):
         self.dygraph_func = dyfunc_tuple_shape_2
 
     def _set_expected_op_num(self):
-        self.expected_op_num = 5
+        self.expected_op_num = 4
         self.expected_shape_op_num = 1
         self.expected_slice_op_num = 1
 
@@ -377,7 +379,7 @@ def init_test_func(self):
         self.dygraph_func = dyfunc_tuple_shape_3
 
     def _set_expected_op_num(self):
-        self.expected_op_num = 5
+        self.expected_op_num = 4
         self.expected_shape_op_num = 1
         self.expected_slice_op_num = 2
 
@@ -390,7 +392,7 @@ def init_test_func(self):
         self.dygraph_func = dyfunc_paddle_shape_api
 
     def _set_expected_op_num(self):
-        self.expected_op_num = 6
+        self.expected_op_num = 5
         self.expected_shape_op_num = 2
         self.expected_slice_op_num = 2
 
@@ -492,7 +494,7 @@ def init_test_func(self):
         self.dygraph_func = dyfunc_with_while_4
 
     def _set_expected_op_num(self):
-        self.expected_op_num = 5
+        self.expected_op_num = 4
         self.expected_shape_op_num = 0
         self.expected_slice_op_num = 0
 
@@ -556,7 +558,7 @@ def _set_test_func(self):
         self.dygraph_func = dyfunc_tuple_shape_1
 
     def _set_expected_op_num(self):
-        self.expected_op_num = 5
+        self.expected_op_num = 4
         self.expected_shape_op_num = 1
         self.expected_slice_op_num = 1
 
@@ -604,7 +606,7 @@ def init_test_func(self):
         self.dygraph_func = dyfunc_change_shape_after_assign
 
     def _set_expected_op_num(self):
-        self.expected_op_num = 6
+        self.expected_op_num = 5
         self.expected_shape_op_num = 1
         self.expected_slice_op_num = 1
 

python/paddle/fluid/tests/unittests/dygraph_to_static/test_to_tensor.py

@@ -0,0 +1,124 @@
+#   Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import print_function
+
+import numpy
+import paddle
+import unittest
+import os
+import tempfile
+import paddle.inference as paddle_infer
+from paddle.fluid.framework import program_guard, Program
+import numpy as np
+from paddle.fluid import core
+
+
+def case0(x):
+    a = paddle.to_tensor([1.0, 2.0, 3.0], dtype="int64")
+
+    return a
+
+
+def case1(x):
+    paddle.set_default_dtype("float64")
+    a = paddle.to_tensor([1.0, 2.0, 3.0], stop_gradient=False)
+
+    return a
+
+
+def case2(x):
+    if core.is_compiled_with_cuda():
+        place = paddle.CUDAPlace(0)
+    else:
+        place = paddle.CPUPlace()
+    a = paddle.to_tensor([1.0, 2.0, 3.0],
+                         place=place,
+                         dtype="int64",
+                         stop_gradient=False)
+
+    return a
+
+
+def case3(x):
+    paddle.set_default_dtype("float64")
+    if core.is_compiled_with_cuda():
+        place = paddle.CUDAPlace(0)
+    else:
+        place = paddle.CPUPlace()
+    a = paddle.to_tensor([1.0, 2.0, 3.0], place=place)
+
+    return a
+
+
+class TestToTensorReturnVal(unittest.TestCase):
+
+    def test_to_tensor_badreturn(self):
+        paddle.disable_static()
+        x = paddle.to_tensor([3])
+
+        a = paddle.jit.to_static(case0)(x)
+        b = case0(x)
+        self.assertTrue(a.dtype == b.dtype)
+        self.assertTrue(a.stop_gradient == b.stop_gradient)
+        self.assertTrue(a.place._equals(b.place))
+
+        a = paddle.jit.to_static(case1)(x)
+        b = case1(x)
+        self.assertTrue(a.dtype == b.dtype)
+        self.assertTrue(a.stop_gradient == b.stop_gradient)
+        self.assertTrue(a.place._equals(b.place))
+
+        a = paddle.jit.to_static(case2)(x)
+        b = case2(x)
+        self.assertTrue(a.dtype == b.dtype)
+        self.assertTrue(a.stop_gradient == b.stop_gradient)
+        self.assertTrue(a.place._equals(b.place))
+
+        a = paddle.jit.to_static(case3)(x)
+        b = case3(x)
+        self.assertTrue(a.dtype == b.dtype)
+        self.assertTrue(a.stop_gradient == b.stop_gradient)
+        self.assertTrue(a.place._equals(b.place))
+
+
+class TestStatic(unittest.TestCase):
+
+    def test_static(self):
+        paddle.enable_static()
+        main_prog = Program()
+        starup_prog = Program()
+        with program_guard(main_prog, starup_prog):
+            if core.is_compiled_with_cuda():
+                place = paddle.CUDAPlace(0)
+            else:
+                place = paddle.CPUPlace()
+
+            x = paddle.to_tensor(paddle.randn([5, 2]),
+                                 dtype='float64',
+                                 stop_gradient=False,
+                                 place=place)
+
+            out = paddle.static.nn.fc(x, 1)
+
+            sgd = paddle.optimizer.SGD()
+            sgd.minimize(paddle.mean(out))
+
+            exe = paddle.static.Executor()
+            exe.run(starup_prog)
+            res = exe.run(fetch_list=[x, out])
+
+
+if __name__ == '__main__':
+    unittest.main()