update unittests, test=develop

python/paddle/fluid/executor.py

@@ -1261,6 +1261,11 @@ def _run_program(self, program, feed, fetch_list, feed_var_name,
                 "Executor requires Program as its Parameter. But you passed in %s"
                 % (type(program)))
 
+        if not isinstance(fetch_var_name, str):
+            raise TypeError(
+                "The name of fetch variable requires string as its Parameter. But you passed in %s"
+                % (type(fetch_var_name)))
+
         if use_program_cache:
             cache_key = _get_strong_program_cache_key(program, feed, fetch_list)
             cached_program = self._get_program_cache(cache_key)
@@ -1310,12 +1315,8 @@ def _run_program(self, program, feed, fetch_list, feed_var_name,
             tensor.set(data, self.place)
 
         if not use_program_cache:
-            if type(fetch_var_name) == str:
-                fetch_var_names = [fetch_var_name]
-            else:
-                fetch_var_names = fetch_var_name
             self._default_executor.run(program.desc, scope, 0, True, True,
-                                       fetch_var_names)
+                                       [fetch_var_name])
         else:
             self._default_executor.run_prepared_ctx(ctx, scope, False, False,
                                                     False)

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

@@ -86,14 +86,8 @@ def test(self):
                 self._test_feed_lod_tensor(use_cuda, use_parallel_executor)
 
                 # Test exception message when feeding with error 
-                if six.PY2:
-                    in_shape_tuple = (long(-1), long(3), long(4), long(8))
-                    error_shape_list = [
-                        long(self.data_batch_size), long(3), long(4), long(5)
-                    ]
-                else:
-                    in_shape_tuple = (-1, 3, 4, 8)
-                    error_shape_list = [self.data_batch_size, 3, 4, 5]
+                in_shape_tuple = (-1, 3, 4, 8)
+                error_shape_list = [self.data_batch_size, 3, 4, 5]
 
                 with self.assertRaises(ValueError) as shape_mismatch_err:
                     self._test_feed_data_shape_mismatch(use_cuda,

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

@@ -430,18 +430,7 @@ def test_tensor_str(self):
         paddle.set_printoptions(4, 100, 3)
         a_str = str(a)
 
-        if six.PY2:
-            expected = '''Tensor(shape=[10L, 20L], dtype=float32, place=CPUPlace, stop_gradient=True,
-       [[0.2727, 0.5489, 0.8655, ..., 0.2916, 0.8525, 0.9000],
-        [0.3806, 0.8996, 0.0928, ..., 0.9535, 0.8378, 0.6409],
-        [0.1484, 0.4038, 0.8294, ..., 0.0148, 0.6520, 0.4250],
-        ...,
-        [0.3426, 0.1909, 0.7240, ..., 0.4218, 0.2676, 0.5679],
-        [0.5561, 0.2081, 0.0676, ..., 0.9778, 0.3302, 0.9559],
-        [0.2665, 0.8483, 0.5389, ..., 0.4956, 0.6862, 0.9178]])'''
-
-        else:
-            expected = '''Tensor(shape=[10, 20], dtype=float32, place=CPUPlace, stop_gradient=True,
+        expected = '''Tensor(shape=[10, 20], dtype=float32, place=CPUPlace, stop_gradient=True,
        [[0.2727, 0.5489, 0.8655, ..., 0.2916, 0.8525, 0.9000],
         [0.3806, 0.8996, 0.0928, ..., 0.9535, 0.8378, 0.6409],
         [0.1484, 0.4038, 0.8294, ..., 0.0148, 0.6520, 0.4250],
@@ -458,12 +447,7 @@ def test_tensor_str2(self):
         a = paddle.to_tensor([[1.5111111, 1.0], [0, 0]])
         a_str = str(a)
 
-        if six.PY2:
-            expected = '''Tensor(shape=[2L, 2L], dtype=float32, place=CPUPlace, stop_gradient=True,
-       [[1.5111, 1.    ],
-        [0.    , 0.    ]])'''
-        else:
-            expected = '''Tensor(shape=[2, 2], dtype=float32, place=CPUPlace, stop_gradient=True,
+        expected = '''Tensor(shape=[2, 2], dtype=float32, place=CPUPlace, stop_gradient=True,
        [[1.5111, 1.    ],
         [0.    , 0.    ]])'''
 
@@ -475,12 +459,7 @@ def test_tensor_str3(self):
         a = paddle.to_tensor([[-1.5111111, 1.0], [0, -0.5]])
         a_str = str(a)
 
-        if six.PY2:
-            expected = '''Tensor(shape=[2L, 2L], dtype=float32, place=CPUPlace, stop_gradient=True,
-       [[-1.5111,  1.    ],
-        [ 0.    , -0.5000]])'''
-        else:
-            expected = '''Tensor(shape=[2, 2], dtype=float32, place=CPUPlace, stop_gradient=True,
+        expected = '''Tensor(shape=[2, 2], dtype=float32, place=CPUPlace, stop_gradient=True,
        [[-1.5111,  1.    ],
         [ 0.    , -0.5000]])'''