aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/layers
diff options
context:
space:
mode:
authorGravatar Akshay Modi <nareshmodi@google.com>2018-06-15 10:09:02 -0700
committerGravatar Akshay Modi <nareshmodi@google.com>2018-06-15 10:09:02 -0700
commita8615a9604773d3e006ddb620f6d62bf7a3aff62 (patch)
treedd5e633669f55aff1e210116cddc9f5f1fd7dcf4 /tensorflow/contrib/layers
parent8212404a47e17a0ad1822e520c990be1cd712e91 (diff)
parent8ad3184c7af54cad42a15afb3e83436bd195d17f (diff)
Merge commit for internal changes
Diffstat (limited to 'tensorflow/contrib/layers')
-rw-r--r--tensorflow/contrib/layers/python/layers/feature_column_ops.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops.py b/tensorflow/contrib/layers/python/layers/feature_column_ops.py
index 06060b99e7..a85cff4f70 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops.py
@@ -683,11 +683,12 @@ def parse_feature_columns_from_sequence_examples(
the serialized proto.
Returns:
- A tuple consisting of:
- context_features: a dict mapping `FeatureColumns` from
- `context_feature_columns` to their parsed `Tensors`/`SparseTensor`s.
- sequence_features: a dict mapping `FeatureColumns` from
- `sequence_feature_columns` to their parsed `Tensors`/`SparseTensor`s.
+ A tuple consisting of (context_features, sequence_features)
+
+ * context_features: a dict mapping `FeatureColumns` from
+ `context_feature_columns` to their parsed `Tensors`/`SparseTensor`s.
+ * sequence_features: a dict mapping `FeatureColumns` from
+ `sequence_feature_columns` to their parsed `Tensors`/`SparseTensor`s.
"""
# Sequence example parsing requires a single (scalar) example.
try: