Merge pull request #4748 from ricoms/master

update module to tensorflow 1.9.0

Author: tfboyd

tutorials/image/cifar10_estimator/README.md

@@ -13,7 +13,7 @@ Before trying to run the model we highly encourage you to read all the README.
 
 ## Prerequisite
 
-1. [Install](https://www.tensorflow.org/install/) TensorFlow version 1.2.1 or
+1. [Install](https://www.tensorflow.org/install/) TensorFlow version 1.9.0 or
 later.
 
 2. Download the CIFAR-10 dataset and generate TFRecord files using the provided

tutorials/image/cifar10_estimator/cifar10.py

@@ -71,11 +71,11 @@ def make_batch(self, batch_size):
     """Read the images and labels from 'filenames'."""
     filenames = self.get_filenames()
     # Repeat infinitely.
-    dataset = tf.contrib.data.TFRecordDataset(filenames).repeat()
+    dataset = tf.data.TFRecordDataset(filenames).repeat()
 
     # Parse records.
     dataset = dataset.map(
-        self.parser, num_threads=batch_size, output_buffer_size=2 * batch_size)
+        self.parser, num_parallel_calls=batch_size)
 
     # Potentially shuffle records.
     if self.subset == 'train':