[Cherry-pick 2.5][Zero-Dim] paddle.static.data, squeeze, unbind, unstack, gather_nd and einsum support 0D

paddle/phi/infermeta/unary.cc

@@ -3761,6 +3761,9 @@ void SqueezeInferMeta(const MetaTensor& x,
   if (!config.is_runtime && axes.FromTensor()) {
     // compile time infershape, set all elements to -1.
     int output_size = x.dims().size() - axes.GetData().size();
+    if (x.dims().size() == 0 && output_size == -1) {
+      output_size = 0;
+    }
     std::vector<int64_t> vec_out_dims(output_size, -1);
     out->set_dims(phi::make_ddim(vec_out_dims));
   } else {

python/paddle/fluid/executor.py

@@ -580,7 +580,7 @@ def _as_lodtensor(data, place, dtype=None):
             else dtype
         )
         if np.isscalar(data):
-            data = np.array([data]).astype(dtype)
+            data = np.array(data).astype(dtype)
         elif isinstance(data, (list, tuple)):
             data = np.array(data)
             if data.dtype == np.object_:

python/paddle/fluid/tests/unittests/test_compare_op.py

@@ -96,7 +96,7 @@ def test_api_float(self):
                 paddle.enable_static()
                 with program_guard(Program(), Program()):
                     x = paddle.static.data(name='x', shape=[4], dtype='int64')
-                    y = paddle.static.data(name='y', shape=[1], dtype='int64')
+                    y = paddle.static.data(name='y', shape=[], dtype='int64')
                     op = eval("paddle.%s" % (self.op_type))
                     out = op(x, y)
                     exe = fluid.Executor(self.place)

python/paddle/fluid/tests/unittests/test_data.py

@@ -31,6 +31,13 @@ def test_dtype(self):
             x3 = paddle.static.data(name="x3", shape=[2, 25])
             self.assertEqual(x3.dtype, core.VarDesc.VarType.FP64)
 
+    def test_0D(self):
+        with program_guard(Program(), Program()):
+            x1 = paddle.static.data(name="x1_0D", shape=[])
+            self.assertEqual(x1.dtype, core.VarDesc.VarType.FP32)
+            x2 = paddle.static.data(name="x2_0D", shape=(), dtype="bool")
+            self.assertEqual(x2.dtype, core.VarDesc.VarType.BOOL)
+
     def test_error(self):
         with program_guard(Program(), Program()):
 

python/paddle/fluid/tests/unittests/test_deg2rad.py

@@ -66,7 +66,7 @@ def test_dygraph(self):
 class TestDeg2radAPI2(TestDeg2radAPI):
     # Test input data type is int
     def setUp(self):
-        self.x_np = 180
+        self.x_np = [180]
         self.x_shape = [1]
         self.out_np = np.pi
         self.x_dtype = 'int64'

python/paddle/fluid/tests/unittests/test_executor_feed_non_tensor.py

@@ -22,7 +22,7 @@
 
 class TestExecutor(unittest.TestCase):
     def net(self):
-        lr = paddle.static.data(name="lr", shape=[1], dtype='float32')
+        lr = paddle.static.data(name="lr", shape=[], dtype='float32')
         x = paddle.static.data(name="x", shape=[None, 1], dtype='float32')
         y = paddle.static.data(name="y", shape=[None, 1], dtype='float32')
         y_predict = paddle.static.nn.fc(x, size=1)

python/paddle/fluid/tests/unittests/test_gcd.py

@@ -25,8 +25,8 @@
 
 class TestGcdAPI(unittest.TestCase):
     def setUp(self):
-        self.x_np = 12
-        self.y_np = 20
+        self.x_np = [12]
+        self.y_np = [20]
         self.x_shape = [1]
         self.y_shape = [1]
 
@@ -81,14 +81,14 @@ class TestGcdAPI3(TestGcdAPI):
     def setUp(self):
         self.x_np = 0
         self.y_np = 20
-        self.x_shape = [1]
-        self.y_shape = [1]
+        self.x_shape = []
+        self.y_shape = []
 
 
 class TestGcdAPI4(TestGcdAPI):
     def setUp(self):
-        self.x_np = 0
-        self.y_np = 0
+        self.x_np = [0]
+        self.y_np = [0]
         self.x_shape = [1]
         self.y_shape = [1]
 
@@ -97,5 +97,5 @@ class TestGcdAPI5(TestGcdAPI):
     def setUp(self):
         self.x_np = 12
         self.y_np = -20
-        self.x_shape = [1]
-        self.y_shape = [1]
+        self.x_shape = []
+        self.y_shape = []

python/paddle/fluid/tests/unittests/test_lcm.py

@@ -27,8 +27,8 @@ class TestLcmAPI(unittest.TestCase):
     def setUp(self):
         self.x_np = 12
         self.y_np = 20
-        self.x_shape = [1]
-        self.y_shape = [1]
+        self.x_shape = []
+        self.y_shape = []
 
     def test_static_graph(self):
         startup_program = fluid.Program()
@@ -81,14 +81,14 @@ class TestLcmAPI3(TestLcmAPI):
     def setUp(self):
         self.x_np = 0
         self.y_np = 20
-        self.x_shape = [1]
-        self.y_shape = [1]
+        self.x_shape = []
+        self.y_shape = []
 
 
 class TestLcmAPI4(TestLcmAPI):
     def setUp(self):
-        self.x_np = 0
-        self.y_np = 0
+        self.x_np = [0]
+        self.y_np = [0]
         self.x_shape = [1]
         self.y_shape = [1]
 
@@ -97,5 +97,5 @@ class TestLcmAPI5(TestLcmAPI):
     def setUp(self):
         self.x_np = 12
         self.y_np = -20
-        self.x_shape = [1]
-        self.y_shape = [1]
+        self.x_shape = []
+        self.y_shape = []

python/paddle/fluid/tests/unittests/test_put_along_axis_op.py

@@ -141,7 +141,7 @@ def setUp(self):
         self.place = [paddle.CPUPlace()]
         self.axis = 0
         self.value_np = 99.0
-        self.value_shape = [1]
+        self.value_shape = []
         self.x_feed = copy.deepcopy(self.x_np)
         if core.is_compiled_with_cuda():
             self.place.append(paddle.CUDAPlace(0))
@@ -240,7 +240,7 @@ def setUp(self):
         self.place = [paddle.CPUPlace()]
         self.axis = 0
         self.value_np = 99.0
-        self.value_shape = [1]
+        self.value_shape = []
         self.x_feed = copy.deepcopy(self.x_np)
         if core.is_compiled_with_cuda():
             self.place.append(paddle.CUDAPlace(0))
@@ -258,7 +258,7 @@ def setUp(self):
         self.place = [paddle.CPUPlace()]
         self.axis = 0
         self.value_np = 99.0
-        self.value_shape = [1]
+        self.value_shape = []
         self.x_feed = copy.deepcopy(self.x_np)
         if core.is_compiled_with_cuda():
             self.place.append(paddle.CUDAPlace(0))

python/paddle/fluid/tests/unittests/test_rad2deg.py

@@ -65,7 +65,7 @@ def test_dygraph(self):
 
 class TestRad2degAPI2(TestRad2degAPI):
     def setUp(self):
-        self.x_np = np.pi / 2
+        self.x_np = [np.pi / 2]
         self.x_shape = [1]
         self.out_np = 90
         self.x_dtype = 'float32'
@@ -83,7 +83,7 @@ def test_dygraph(self):
 class TestRad2degAPI3(TestRad2degAPI):
     # Test input data type is int
     def setUp(self):
-        self.x_np = 1
+        self.x_np = [1]
         self.x_shape = [1]
         self.out_np = 180 / np.pi
         self.x_dtype = 'int64'

python/paddle/fluid/tests/unittests/test_trapezoid.py

@@ -83,7 +83,7 @@ def test_static(self):
                     )
                 if self.dx is not None:
                     dx = paddle.static.data(
-                        name="dx", shape=[1], dtype='float32'
+                        name="dx", shape=[], dtype='float32'
                     )
 
                 exe = paddle.static.Executor(place)

python/paddle/fluid/tests/unittests/test_unbind_op.py

@@ -29,7 +29,7 @@ def test_unbind(self):
         x_1 = paddle.static.data(shape=[2, 3], dtype='float32', name='x_1')
         [out_0, out_1] = tensor.unbind(input=x_1, axis=0)
         input_1 = np.random.random([2, 3]).astype("float32")
-        axis = paddle.static.data(shape=[1], dtype='int32', name='axis')
+        axis = paddle.static.data(shape=[], dtype='int32', name='axis')
         exe = fluid.Executor(place=fluid.CPUPlace())
 
         [res_1, res_2] = exe.run(
@@ -87,7 +87,7 @@ def test_layers_unbind(self):
         x_1 = paddle.static.data(shape=[2, 3], dtype='float32', name='x_1')
         [out_0, out_1] = paddle.unbind(input=x_1, axis=0)
         input_1 = np.random.random([2, 3]).astype("float32")
-        axis = paddle.static.data(shape=[1], dtype='int32', name='axis')
+        axis = paddle.static.data(shape=[], dtype='int32', name='axis')
         exe = fluid.Executor(place=fluid.CPUPlace())
 
         [res_1, res_2] = exe.run(