Merge pull request #116 from schani/encoding-fixes

Encoding fixes
tensorflow · Jul 7, 2017 · fbb6f9a · fbb6f9a
2 parents d877e69 + 1d73633
commit fbb6f9a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/tensor2tensor/data_generators/generator_utils.py b/tensor2tensor/data_generators/generator_utils.py
@@ -46,10 +46,13 @@ def to_example(dictionary):
     elif isinstance(v[0], float):
       features[k] = tf.train.Feature(float_list=tf.train.FloatList(value=v))
     elif isinstance(v[0], six.string_types):
+      v = [bytes(x, 'utf-8') for x in v]
+      features[k] = tf.train.Feature(bytes_list=tf.train.BytesList(value=v))
+    elif isinstance(v[0], bytes):
       features[k] = tf.train.Feature(bytes_list=tf.train.BytesList(value=v))
     else:
-      raise ValueError("Value is neither an int nor a float; v: %s type: %s" %
-                       (str(v[0]), str(type(v[0]))))
+      raise ValueError("Value for %s is neither an int nor a float; v: %s type: %s" %
+                       (k, str(v[0]), str(type(v[0]))))
   return tf.train.Example(features=tf.train.Features(feature=features))
 
 

diff --git a/tensor2tensor/data_generators/image.py b/tensor2tensor/data_generators/image.py
@@ -68,7 +68,7 @@ def image_generator(images, labels):
         yield {
             "image/encoded": [enc_string],
             "image/format": ["png"],
-            "image/class/label": [label],
+            "image/class/label": [int(label)],
             "image/height": [height],
             "image/width": [width]
         }