diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2017-06-26 13:05:22 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2017-06-26 13:11:07 -0700 |
| commit | b91b5baab23cfb8d9da269166070511c28eeaf84 (patch) | |
| tree | dec2080db06aabcd472ff534cecc4f915977c046 /tensorflow/contrib/lookup | |
| parent | 0a6d5cda495010559a1de3e2c2d2a22672f517a6 (diff) | |
Merge changes from github followup.
PiperOrigin-RevId: 160183498
Diffstat (limited to 'tensorflow/contrib/lookup')
| -rw-r--r-- | tensorflow/contrib/lookup/lookup_ops.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tensorflow/contrib/lookup/lookup_ops.py b/tensorflow/contrib/lookup/lookup_ops.py index ce8518267f..f53f38f3cf 100644 --- a/tensorflow/contrib/lookup/lookup_ops.py +++ b/tensorflow/contrib/lookup/lookup_ops.py @@ -260,11 +260,7 @@ 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") |