From 2691de18994a27f0d1bdc237b9b124874c2176fb Mon Sep 17 00:00:00 2001
From: Huihuang Zheng <zhhsplendid@gmail.com>
Date: Tue, 8 Oct 2019 11:48:38 +0800
Subject: [PATCH] [cherry pick] Add lod_level parameter to paddle.fluid.data
 #20065 (#20095)

* Add lod_level parameter to paddle.fluid.data

* Add "optional" in API doc for optional parameters
---
 paddle/fluid/API.spec       |  2 +-
 python/paddle/fluid/data.py | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/paddle/fluid/API.spec b/paddle/fluid/API.spec
index 5d7427784f0..fd72e1751d8 100644
--- a/paddle/fluid/API.spec
+++ b/paddle/fluid/API.spec
@@ -567,7 +567,7 @@ paddle.fluid.contrib.BasicLSTMUnit.sublayers (ArgSpec(args=['self', 'include_sub
 paddle.fluid.contrib.BasicLSTMUnit.train (ArgSpec(args=['self'], varargs=None, keywords=None, defaults=None), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
 paddle.fluid.contrib.basic_lstm (ArgSpec(args=['input', 'init_hidden', 'init_cell', 'hidden_size', 'num_layers', 'sequence_length', 'dropout_prob', 'bidirectional', 'batch_first', 'param_attr', 'bias_attr', 'gate_activation', 'activation', 'forget_bias', 'dtype', 'name'], varargs=None, keywords=None, defaults=(1, None, 0.0, False, True, None, None, None, None, 1.0, 'float32', 'basic_lstm')), ('document', 'fe4d0c3c55a162b8cfe10b05fabb7ce4'))
 paddle.fluid.contrib.ctr_metric_bundle (ArgSpec(args=['input', 'label'], varargs=None, keywords=None, defaults=None), ('document', 'b68d12366896c41065fc3738393da2aa'))
-paddle.fluid.data (ArgSpec(args=['name', 'shape', 'dtype'], varargs=None, keywords=None, defaults=('float32',)), ('document', '4b62e32530615a11b00e2ee52a53488a'))
+paddle.fluid.data (ArgSpec(args=['name', 'shape', 'dtype', 'lod_level'], varargs=None, keywords=None, defaults=('float32', 0)), ('document', '28ee6b35836449f44ce53467f0616137'))
 paddle.fluid.dygraph.Layer ('paddle.fluid.dygraph.layers.Layer', ('document', 'a889d5affd734ede273e94d4257163ab'))
 paddle.fluid.dygraph.Layer.__init__ (ArgSpec(args=['self', 'name_scope', 'dtype'], varargs=None, keywords=None, defaults=(VarType.FP32,)), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
 paddle.fluid.dygraph.Layer.add_parameter (ArgSpec(args=['self', 'name', 'parameter'], varargs=None, keywords=None, defaults=None), ('document', 'f35ab374c7d5165c3daf3bd64a5a2ec1'))
diff --git a/python/paddle/fluid/data.py b/python/paddle/fluid/data.py
index 549c2e80e50..b90a681ed8e 100644
--- a/python/paddle/fluid/data.py
+++ b/python/paddle/fluid/data.py
@@ -20,7 +20,7 @@ from .layer_helper import LayerHelper
 __all__ = ['data']
 
 
-def data(name, shape, dtype='float32'):
+def data(name, shape, dtype='float32', lod_level=0):
     """
     **Data Layer**
 
@@ -42,8 +42,12 @@ def data(name, shape, dtype='float32'):
        name (str): The name/alias of the variable, see :ref:`api_guide_Name`
            for more details.
        shape (list|tuple): List|Tuple of integers declaring the shape.
-       dtype (np.dtype|VarType|str): The type of the data. Supported dtype:
-           bool, float16, float32, float64, int8, int16, int32, int64, uint8.
+       dtype (np.dtype|VarType|str, optional): The type of the data. Supported
+           dtype: bool, float16, float32, float64, int8, int16, int32, int64,
+           uint8. Default: float32
+       lod_level (int, optional): The LoD level of the LoDTensor. Usually users
+           don't have to set this value. For more details about when and how to
+           use LoD level, see :ref:`user_guide_lod_tensor` . Default: 0
 
     Returns:
         Variable: The global variable that gives access to the data.
@@ -88,6 +92,6 @@ def data(name, shape, dtype='float32'):
         dtype=dtype,
         type=core.VarDesc.VarType.LOD_TENSOR,
         stop_gradient=True,
-        lod_level=0,
+        lod_level=lod_level,
         is_data=True,
         need_check_feed=True)
-- 
GitLab