aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/lookup
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <gardener@tensorflow.org>2017-06-26 13:48:16 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2017-06-26 13:51:52 -0700
commitb13e96e21c1229a905a623111dd89d2bd0cba53b (patch)
treed60c94e4a87554943931c438f9885c9a48556ce9 /tensorflow/contrib/lookup
parentb91b5baab23cfb8d9da269166070511c28eeaf84 (diff)
Automated g4 rollback of changelist 160183498
PiperOrigin-RevId: 160189134
Diffstat (limited to 'tensorflow/contrib/lookup')
-rw-r--r--tensorflow/contrib/lookup/lookup_ops.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tensorflow/contrib/lookup/lookup_ops.py b/tensorflow/contrib/lookup/lookup_ops.py
index f53f38f3cf..ce8518267f 100644
--- a/tensorflow/contrib/lookup/lookup_ops.py
+++ b/tensorflow/contrib/lookup/lookup_ops.py
@@ -260,7 +260,11 @@ def index_to_string(tensor, mapping, default_value="UNK", name=None):
For example:
```python
+<<<<<<< HEAD
mapping_string = tf.constant(["emerson", "lake", "palmer"])
+=======
+ mapping_string = tf.constant(["emerson", "lake", "palmer")
+>>>>>>> 338a7ead4475d6b97b420d6d1c56ff66815e3e7b
indices = tf.constant([1, 5], tf.int64)
values = tf.contrib.lookup.index_to_string(
indices, mapping=mapping_string, default_value="UNKNOWN")