Merge branch 'master' into fix-five-undefined-names

tutorials/image/cifar10/cifar10_input.py

@@ -157,6 +157,7 @@ def distorted_inputs(data_dir, batch_size):
   # Create a queue that produces the filenames to read.
   filename_queue = tf.train.string_input_producer(filenames)
 
+  with tf.name_scope('data_augmentation'):
     # Read examples from files in the filename queue.
     read_input = read_cifar10(filename_queue)
     reshaped_image = tf.cast(read_input.uint8image, tf.float32)
@@ -226,6 +227,7 @@ def inputs(eval_data, data_dir, batch_size):
     if not tf.gfile.Exists(f):
       raise ValueError('Failed to find file: ' + f)
 
+  with tf.name_scope('input'):
     # Create a queue that produces the filenames to read.
     filename_queue = tf.train.string_input_producer(filenames)