Skip to content

GitLab

"git@developer.sourcefind.cn:wangsen/mineru.git" did not exist on "44a2dc3750d9811a455ae5ad0effb4b3f98c8f62"
Commit da62bb0b authored by Toby Boyd's avatar Toby Boyd Committed by GitHub
Browse files

Merge pull request #2284 from tfboyd/single_cmd_download 

Download and create TFRecords with single command.
parents aae631cc df399534
Show whitespace changes
Inline Side-by-side
Showing with 118 additions and 105 deletions
tutorials/image/cifar10_estimator/README.md
View file @ da62bb0b
...@@ -2,7 +2,9 @@ CIFAR-10 is a common benchmark in machine learning for image recognition. ...@@ -2,7 +2,9 @@ CIFAR-10 is a common benchmark in machine learning for image recognition.
http://www.cs.toronto.edu/~kriz/cifar.html http://www.cs.toronto.edu/~kriz/cifar.html
Code in this directory focuses on how to use TensorFlow Estimators to train and evaluate a CIFAR-10 ResNet model on: Code in this directory focuses on how to use TensorFlow Estimators to train and
evaluate a CIFAR-10 ResNet model on:
* A single host with one CPU; * A single host with one CPU;
* A single host with multiple GPUs; * A single host with multiple GPUs;
* Multiple hosts with CPU or multiple GPUs; * Multiple hosts with CPU or multiple GPUs;
...@@ -11,97 +13,82 @@ Before trying to run the model we highly encourage you to read all the README. ...@@ -11,97 +13,82 @@ Before trying to run the model we highly encourage you to read all the README.
## Prerequisite ## Prerequisite
1. Install TensorFlow version 1.2.1 or later with GPU support. 1. [Install](https://www.tensorflow.org/install/) TensorFlow version 1.2.1 or
You can see how to do it [here](https://www.tensorflow.org/install/). later.
2. Download the CIFAR-10 dataset.
```shell
curl -o cifar-10-python.tar.gz https://www.cs.toronto.edu/~kriz/cifar-10-python.tar.gz
tar xzf cifar-10-python.tar.gz
```
After running the commands above, you should see the following files in the folder where the data was downloaded.
``` shell
ls -R cifar-10-batches-py
```
The output should be:
```
batches.meta data_batch_1 data_batch_2 data_batch_3
data_batch_4 data_batch_5 readme.html test_batch
```
3. Generate TFRecord files. 2. Download the CIFAR-10 dataset and generate TFRecord files using the provided
This will generate a tf record for the training and test data available at the input_dir. script. The script and associated command below will download the CIFAR-10
You can see more details in `generate_cifar10_tf_records.py` dataset and then generate a TFRecord for the training, validation, and
evaluation datasets.
```shell ```shell
python generate_cifar10_tfrecords.py --input-dir=${PWD}/cifar-10-batches-py \ python generate_cifar10_tfrecords.py --data-dir=${PWD}/cifar-10-data
--output-dir=${PWD}/cifar-10-batches-py
``` ```
After running the command above, you should see the following new files in the output_dir. After running the command above, you should see the following files in the
--data-dir (```ls -R cifar-10-data```):
``` shell * train.tfrecords
ls -R cifar-10-batches-py * validation.tfrecords
``` * eval.tfrecords
```
train.tfrecords validation.tfrecords eval.tfrecords
```
## How to run on local mode ## Training on a single machine with GPUs or CPU
Run the model on CPU only. After training, it runs the evaluation. Run the training on CPU only. After training, it runs the evaluation.
``` ```
python cifar10_main.py --data-dir=${PWD}/cifar-10-batches-py \ python cifar10_main.py --data-dir=${PWD}/cifar-10-data \
--job-dir=/tmp/cifar10 \ --job-dir=/tmp/cifar10 \
--num-gpus=0 \ --num-gpus=0 \
--train-steps=1000 --train-steps=1000
``` ```
Run the model on 2 GPUs using CPU as parameter server. After training, it runs the evaluation. Run the model on 2 GPUs using CPU as parameter server. After training, it runs
the evaluation.
``` ```
python cifar10_main.py --data-dir=${PWD}/cifar-10-batches-py \ python cifar10_main.py --data-dir=${PWD}/cifar-10-data \
--job-dir=/tmp/cifar10 \ --job-dir=/tmp/cifar10 \
--num-gpus=2 \ --num-gpus=2 \
--train-steps=1000 --train-steps=1000
``` ```
Run the model on 2 GPUs using GPU as parameter server. Run the model on 2 GPUs using GPU as parameter server.
It will run an experiment, which for local setting basically means it will run stop training It will run an experiment, which for local setting basically means it will run
stop training
a couple of times to perform evaluation. a couple of times to perform evaluation.
``` ```
python cifar10_main.py --data-dir=${PWD}/cifar-10-batches-bin \ python cifar10_main.py --data-dir=${PWD}/cifar-10-data \
--job-dir=/tmp/cifar10 \ --job-dir=/tmp/cifar10 \
--variable-strategy GPU \ --variable-strategy GPU \
--num-gpus=2 \ --num-gpus=2 \
``` ```
There are more command line flags to play with; run `python cifar10_main.py --help` for details. There are more command line flags to play with; run
`python cifar10_main.py --help` for details.
## How to run on distributed mode ## Run distributed training
### (Optional) Running on Google Cloud Machine Learning Engine ### (Optional) Running on Google Cloud Machine Learning Engine
This example can be run on Google Cloud Machine Learning Engine (ML Engine), which will configure the environment and take care of running workers, parameters servers, and masters in a fault tolerant way. This example can be run on Google Cloud Machine Learning Engine (ML Engine),
which will configure the environment and take care of running workers,
parameters servers, and masters in a fault tolerant way.
To install the command line tool, and set up a project and billing, see the quickstart [here](https://cloud.google.com/ml-engine/docs/quickstarts/command-line). To install the command line tool, and set up a project and billing, see the
quickstart [here](https://cloud.google.com/ml-engine/docs/quickstarts/command-line).
You'll also need a Google Cloud Storage bucket for the data. If you followed the instructions above, you can just run: You'll also need a Google Cloud Storage bucket for the data. If you followed the
instructions above, you can just run:
``` ```
MY_BUCKET=gs://<my-bucket-name> MY_BUCKET=gs://<my-bucket-name>
gsutil cp -r ${PWD}/cifar-10-batches-py $MY_BUCKET/ gsutil cp -r ${PWD}/cifar-10-data $MY_BUCKET/
``` ```
Then run the following command from the `tutorials/image` directory of this repository (the parent directory of this README): Then run the following command from the `tutorials/image` directory of this
repository (the parent directory of this README):
``` ```
gcloud ml-engine jobs submit training cifarmultigpu \ gcloud ml-engine jobs submit training cifarmultigpu \
...@@ -111,7 +98,7 @@ gcloud ml-engine jobs submit training cifarmultigpu \ ...@@ -111,7 +98,7 @@ gcloud ml-engine jobs submit training cifarmultigpu \
--package-path cifar10_estimator/ \ --package-path cifar10_estimator/ \
--module-name cifar10_estimator.cifar10_main \ --module-name cifar10_estimator.cifar10_main \
-- \ -- \
--data-dir=$MY_BUCKET/cifar-10-batches-py \ --data-dir=$MY_BUCKET/cifar-10-data \
--num-gpus=4 \ --num-gpus=4 \
--train-steps=1000 --train-steps=1000
``` ```
...@@ -119,10 +106,13 @@ gcloud ml-engine jobs submit training cifarmultigpu \ ...@@ -119,10 +106,13 @@ gcloud ml-engine jobs submit training cifarmultigpu \
### Set TF_CONFIG ### Set TF_CONFIG
Considering that you already have multiple hosts configured, all you need is a `TF_CONFIG` Considering that you already have multiple hosts configured, all you need is a
environment variable on each host. You can set up the hosts manually or check [tensorflow/ecosystem](https://github.com/tensorflow/ecosystem) for instructions about how to set up a Cluster. `TF_CONFIG` environment variable on each host. You can set up the hosts manually
or check [tensorflow/ecosystem](https://github.com/tensorflow/ecosystem) for
instructions about how to set up a Cluster.
The `TF_CONFIG` will be used by the `RunConfig` to know the existing hosts and their task: `master`, `ps` or `worker`. The `TF_CONFIG` will be used by the `RunConfig` to know the existing hosts and
their task: `master`, `ps` or `worker`.
Here's an example of `TF_CONFIG`. Here's an example of `TF_CONFIG`.
...@@ -141,21 +131,26 @@ TF_CONFIG = json.dumps( ...@@ -141,21 +131,26 @@ TF_CONFIG = json.dumps(
*Cluster* *Cluster*
A cluster spec, which is basically a dictionary that describes all of the tasks in the cluster. More about it [here](https://www.tensorflow.org/deploy/distributed). A cluster spec, which is basically a dictionary that describes all of the tasks
in the cluster. More about it [here](https://www.tensorflow.org/deploy/distributed).
In this cluster spec we are defining a cluster with 1 master, 1 ps and 1 worker. In this cluster spec we are defining a cluster with 1 master, 1 ps and 1 worker.
* `ps`: saves the parameters among all workers. All workers can read/write/update the parameters for model via ps. * `ps`: saves the parameters among all workers. All workers can
As some models are extremely large the parameters are shared among the ps (each ps stores a subset). read/write/update the parameters for model via ps. As some models are
extremely large the parameters are shared among the ps (each ps stores a
subset).
* `worker`: does the training. * `worker`: does the training.
* `master`: basically a special worker, it does training, but also restores and saves checkpoints and do evaluation. * `master`: basically a special worker, it does training, but also restores and
saves checkpoints and do evaluation.
*Task* *Task*
The Task defines what is the role of the current node, for this example the node is the master on index 0 The Task defines what is the role of the current node, for this example the node
on the cluster spec, the task will be different for each node. An example of the `TF_CONFIG` for a worker would be: is the master on index 0 on the cluster spec, the task will be different for
each node. An example of the `TF_CONFIG` for a worker would be:
```python ```python
cluster = {'master': ['master-ip:8000'], cluster = {'master': ['master-ip:8000'],
...@@ -172,26 +167,29 @@ TF_CONFIG = json.dumps( ...@@ -172,26 +167,29 @@ TF_CONFIG = json.dumps(
*Model_dir* *Model_dir*
This is the path where the master will save the checkpoints, graph and TensorBoard files. This is the path where the master will save the checkpoints, graph and
For a multi host environment you may want to use a Distributed File System, Google Storage and DFS are supported. TensorBoard files. For a multi host environment you may want to use a
Distributed File System, Google Storage and DFS are supported.
*Environment* *Environment*
By the default environment is *local*, for a distributed setting we need to change it to *cloud*. By the default environment is *local*, for a distributed setting we need to
change it to *cloud*.
### Running script ### Running script
Once you have a `TF_CONFIG` configured properly on each host you're ready to run on distributed settings. Once you have a `TF_CONFIG` configured properly on each host you're ready to run
on distributed settings.
#### Master #### Master
Run this on master: Run this on master:
Runs an Experiment in sync mode on 4 GPUs using CPU as parameter server for 40000 steps. Runs an Experiment in sync mode on 4 GPUs using CPU as parameter server for
It will run evaluation a couple of times during training. 40000 steps. It will run evaluation a couple of times during training. The
The num_workers arugument is used only to update the learning rate correctly. num_workers arugument is used only to update the learning rate correctly. Make
Make sure the model_dir is the same as defined on the TF_CONFIG. sure the model_dir is the same as defined on the TF_CONFIG.
```shell ```shell
python cifar10_main.py --data-dir=gs://path/cifar-10-batches-py \ python cifar10_main.py --data-dir=gs://path/cifar-10-data \
--job-dir=gs://path/model_dir/ \ --job-dir=gs://path/model_dir/ \
--num-gpus=4 \ --num-gpus=4 \
--train-steps=40000 \ --train-steps=40000 \
...@@ -327,12 +325,12 @@ INFO:tensorflow:Saving dict for global step 1: accuracy = 0.0994, global_step = ...@@ -327,12 +325,12 @@ INFO:tensorflow:Saving dict for global step 1: accuracy = 0.0994, global_step =
#### Worker #### Worker
Run this on worker: Run this on worker:
Runs an Experiment in sync mode on 4 GPUs using CPU as parameter server for 40000 steps. Runs an Experiment in sync mode on 4 GPUs using CPU as parameter server for
It will run evaluation a couple of times during training. 40000 steps. It will run evaluation a couple of times during training. Make sure
Make sure the model_dir is the same as defined on the TF_CONFIG. the model_dir is the same as defined on the TF_CONFIG.
```shell ```shell
python cifar10_main.py --data-dir=gs://path/cifar-10-batches-py \ python cifar10_main.py --data-dir=gs://path/cifar-10-data \
--job-dir=gs://path/model_dir/ \ --job-dir=gs://path/model_dir/ \
--num-gpus=4 \ --num-gpus=4 \
--train-steps=40000 \ --train-steps=40000 \
...@@ -469,13 +467,17 @@ allow_soft_placement: true ...@@ -469,13 +467,17 @@ allow_soft_placement: true
## Visualizing results with TensorFlow ## Visualizing results with TensorFlow
When using Estimators you can also visualize your data in TensorBoard, with no changes in your code. You can use TensorBoard to visualize your TensorFlow graph, plot quantitative metrics about the execution of your graph, and show additional data like images that pass through it. When using Estimators you can also visualize your data in TensorBoard, with no
changes in your code. You can use TensorBoard to visualize your TensorFlow
graph, plot quantitative metrics about the execution of your graph, and show
additional data like images that pass through it.
You'll see something similar to this if you "point" TensorBoard to the `model_dir` you used to train or evaluate your model. You'll see something similar to this if you "point" TensorBoard to the
`model_dir` you used to train or evaluate your model.
Check TensorBoard during training or after it. Check TensorBoard during training or after it. Just point TensorBoard to the
Just point TensorBoard to the model_dir you chose on the previous step model_dir you chose on the previous step by default the model_dir is
by default the model_dir is "sentiment_analysis_output" "sentiment_analysis_output"
```shell ```shell
tensorboard --log-dir="sentiment_analysis_output" tensorboard --log-dir="sentiment_analysis_output"
...@@ -483,7 +485,8 @@ tensorboard --log-dir="sentiment_analysis_output" ...@@ -483,7 +485,8 @@ tensorboard --log-dir="sentiment_analysis_output"
## Warnings ## Warnings
When runninng `cifar10_main.py` with `--sync` argument you may see an error similar to: When runninng `cifar10_main.py` with `--sync` argument you may see an error
similar to:
```python ```python
File "cifar10_main.py", line 538, in <module> File "cifar10_main.py", line 538, in <module>
......
tutorials/image/cifar10_estimator/cifar10_utils.py
View file @ da62bb0b
...@@ -4,7 +4,6 @@ import six ...@@ -4,7 +4,6 @@ import six
import tensorflow as tf import tensorflow as tf
from tensorflow.python.platform import tf_logging as logging from tensorflow.python.platform import tf_logging as logging
from tensorflow.core.framework import node_def_pb2 from tensorflow.core.framework import node_def_pb2
from tensorflow.python.framework import device as pydev from tensorflow.python.framework import device as pydev
from tensorflow.python.training import basic_session_run_hooks from tensorflow.python.training import basic_session_run_hooks
......
tutorials/image/cifar10_estimator/generate_cifar10_tfrecords.py
View file @ da62bb0b
...@@ -12,10 +12,11 @@ ...@@ -12,10 +12,11 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# ============================================================================== # ==============================================================================
"""Read CIFAR-10 data from pickled numpy arrays and write TFExamples. """Read CIFAR-10 data from pickled numpy arrays and writes TFRecords.
Generates TFRecord files from the python version of the CIFAR-10 dataset Generates tf.train.Example protos and writes them to TFRecord files from the
downloaded from https://www.cs.toronto.edu/~kriz/cifar.html. python version of the CIFAR-10 dataset downloaded from
https://www.cs.toronto.edu/~kriz/cifar.html.
""" """
from __future__ import absolute_import from __future__ import absolute_import
...@@ -26,8 +27,22 @@ import argparse ...@@ -26,8 +27,22 @@ import argparse
import cPickle import cPickle
import os import os
import tarfile
from six.moves import xrange # pylint: disable=redefined-builtin
import tensorflow as tf import tensorflow as tf
CIFAR_FILENAME = 'cifar-10-python.tar.gz'
CIFAR_DOWNLOAD_URL = 'https://www.cs.toronto.edu/~kriz/' + CIFAR_FILENAME
CIFAR_LOCAL_FOLDER = 'cifar-10-batches-py'
def download_and_extract(data_dir):
# download CIFAR-10 if not already downloaded.
tf.contrib.learn.datasets.base.maybe_download(CIFAR_FILENAME, data_dir,
CIFAR_DOWNLOAD_URL)
tarfile.open(os.path.join(data_dir, CIFAR_FILENAME),
'r:gz').extractall(data_dir)
def _int64_feature(value): def _int64_feature(value):
return tf.train.Feature(int64_list=tf.train.Int64List(value=[value])) return tf.train.Feature(int64_list=tf.train.Int64List(value=[value]))
...@@ -53,31 +68,36 @@ def read_pickle_from_file(filename): ...@@ -53,31 +68,36 @@ def read_pickle_from_file(filename):
def convert_to_tfrecord(input_files, output_file): def convert_to_tfrecord(input_files, output_file):
"""Converts a file to tfrecords.""" """Converts a file to TFRecords."""
print('Generating %s' % output_file) print('Generating %s' % output_file)
with tf.python_io.TFRecordWriter(output_file) as record_writer: with tf.python_io.TFRecordWriter(output_file) as record_writer:
for input_file in input_files: for input_file in input_files:
data_dict = read_pickle_from_file(input_file) data_dict = read_pickle_from_file(input_file)
data = data_dict['data'] data = data_dict['data']
labels = data_dict['labels'] labels = data_dict['labels']
num_entries_in_batch = len(labels) num_entries_in_batch = len(labels)
for i in range(num_entries_in_batch): for i in range(num_entries_in_batch):
example = tf.train.Example( example = tf.train.Example(features=tf.train.Features(
features=tf.train.Features(feature={ feature={
'image': _bytes_feature(data[i].tobytes()), 'image': _bytes_feature(data[i].tobytes()),
'label': _int64_feature(labels[i]) 'label': _int64_feature(labels[i])
})) }))
record_writer.write(example.SerializeToString()) record_writer.write(example.SerializeToString())
def main(input_dir, output_dir): def main(data_dir):
print('Download from {} and extract.'.format(CIFAR_DOWNLOAD_URL))
download_and_extract(data_dir)
file_names = _get_file_names() file_names = _get_file_names()
input_dir = os.path.join(data_dir, CIFAR_LOCAL_FOLDER)
for mode, files in file_names.items(): for mode, files in file_names.items():
input_files = [ input_files = [os.path.join(input_dir, f) for f in files]
os.path.join(input_dir, f) for f in files] output_file = os.path.join(data_dir, mode + '.tfrecords')
output_file = os.path.join(output_dir, mode + '.tfrecords') try:
# Convert to Examples and write the result to TFRecords. os.remove(output_file)
except OSError:
pass
# Convert to tf.train.Example and write the to TFRecords.
convert_to_tfrecord(input_files, output_file) convert_to_tfrecord(input_files, output_file)
print('Done!') print('Done!')
...@@ -85,19 +105,10 @@ def main(input_dir, output_dir): ...@@ -85,19 +105,10 @@ def main(input_dir, output_dir):
if __name__ == '__main__': if __name__ == '__main__':
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument( parser.add_argument(
'--input-dir', '--data-dir',
type=str, type=str,
default='', default='',
help='Directory where CIFAR10 data is located.' help='Directory to download and extract CIFAR-10 to.')
)
parser.add_argument(
'--output-dir',
type=str,
default='',
help="""\
Directory where TFRecords will be saved.The TFRecords will have the same
name as the CIFAR10 inputs + .tfrecords.\
"""
)
args = parser.parse_args() args = parser.parse_args()
main(args.input_dir, args.output_dir) main(args.data_dir)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment