Merge branch 'python_tool' into 'master'

Refactor image tensor tool

See merge request !881

tools/image/image_to_tensor.py

@@ -3,6 +3,8 @@ import os
 import sys
 import tensorflow as tf
 
+# TODO(liyin): use dataset api and estimator with distributed strategy
+
 FLAGS = None
 
 
@@ -32,10 +34,8 @@ def parse_args():
 
 
 def images_to_tensors(input_files, image_shape, mean_values=None):
-    for i in xrange(len(input_files)):
-        with tf.Session() as sess:
-            with tf.gfile.FastGFile(input_files[i], 'rb') as f:
-                image_data = f.read()
+    with tf.Graph().as_default():
+        image_data = tf.placeholder(tf.string, name='input')
         image_data = tf.image.decode_image(image_data,
                                            channels=image_shape[2])
         if mean_values:
@@ -54,10 +54,18 @@ def images_to_tensors(input_files, image_shape, mean_values=None):
                                               image_shape[:2],
                                               align_corners=False)
 
-                image = sess.run(image_data)
-                output_file = os.path.join(FLAGS.output_dir, os.path.splitext(
-                    os.path.basename(input_files[i]))[0] + '.dat')
-                image.tofile(output_file)
+        with tf.Session() as sess:
+            for i in xrange(len(input_files)):
+                with tf.gfile.FastGFile(input_files[i], 'rb') as f:
+                    src_image = f.read()
+                    dst_image = sess.run(image_data,
+                                         feed_dict={'input:0': src_image})
+                    output_file = os.path.join(FLAGS.output_dir,
+                                               os.path.splitext(
+                                                   os.path.basename(
+                                                       input_files[i]))[
+                                                   0] + '.dat')
+                    dst_image.tofile(output_file)
 
 
 def main(unused_args):

tools/image/tensor_to_image.py

@@ -4,6 +4,8 @@ import sys
 import numpy as np
 import tensorflow as tf
 
+# TODO(liyin): use dataset api and estimator with distributed strategy
+
 FLAGS = None
 
 
@@ -27,22 +29,26 @@ def parse_args():
 
 
 def tensors_to_images(input_files, image_shape):
-    for i in xrange(len(input_files)):
-        with tf.Session() as sess:
-            tensor_data = np.fromfile(input_files[i], dtype=np.float32) \
-                .reshape(image_shape)
+    with tf.Graph().as_default():
+        input = tf.placeholder(tf.float32, shape=image_shape, name='input')
+        output = tf.placeholder(tf.string, name='output_file')
         # use the second channel if it is gray image
         if image_shape[2] == 2:
-                _, tensor_data = tf.split(tensor_data, 2, axis=2)
-            tensor_data = tf.image.convert_image_dtype(tensor_data,
+            _, input = tf.split(input, 2, axis=2)
+        tensor_data = tf.image.convert_image_dtype(input,
                                                    tf.uint8,
                                                    saturate=True)
         image_data = tf.image.encode_jpeg(tensor_data, quality=100)
-            image = sess.run(image_data)
+        writer = tf.write_file(output, image_data, name='output_writer')
+
+        with tf.Session() as sess:
+            for i in xrange(len(input_files)):
+                input_data = np.fromfile(input_files[i], dtype=np.float32) \
+                    .reshape(image_shape)
                 output_file = os.path.join(FLAGS.output_dir, os.path.splitext(
                     os.path.basename(input_files[i]))[0] + '.jpg')
-            writer = tf.write_file(output_file, image)
-            sess.run(writer)
+                sess.run(writer, feed_dict={'input:0': input_data,
+                                            'output_file:0': output_file})
 
 
 def main(unused_args):