diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2016-10-14 15:41:38 -0800 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2016-10-14 16:48:42 -0700 |
| commit | 20c02ffe0e6b8af4902487f852e15daa16caa523 (patch) | |
| tree | bd2b821e5021f714bf5db3a92bbb269ea715002d /tensorflow/tools/benchmark | |
| parent | 5c1821be018d4a626efd0a9cee7844aaa8c69366 (diff) | |
Modify tensorflow command line flag parsing:
- Allow help text to be specified for each flag
- Add a flag "--help" to print the help text
- Rename ParseFlags to Flags::Parse(); new routine Flags::Usage() returns a
usage message.
- Change uses to new format
In some cases reorder with InitMain(), which should be called after flag parsing.
Change: 136212902
Diffstat (limited to 'tensorflow/tools/benchmark')
| -rw-r--r-- | tensorflow/tools/benchmark/benchmark_model.cc | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/tensorflow/tools/benchmark/benchmark_model.cc b/tensorflow/tools/benchmark/benchmark_model.cc index 5d824df6cf..3279967aaa 100644 --- a/tensorflow/tools/benchmark/benchmark_model.cc +++ b/tensorflow/tools/benchmark/benchmark_model.cc @@ -173,29 +173,30 @@ int Main(int argc, char** argv) { string output_prefix = ""; bool show_sizes = false; - const bool parse_result = ParseFlags( - &argc, argv, { - Flag("graph", &graph), // - Flag("input_layer", &input_layer), // - Flag("input_layer_shape", &input_layer_shape), // - Flag("input_layer_type", &input_layer_type), // - Flag("output_layer", &output_layer), // - Flag("num_runs", &num_runs), // - Flag("run_delay", &run_delay), // - Flag("num_threads", &num_threads), // - Flag("benchmark_name", &benchmark_name), // - Flag("output_prefix", &output_prefix), // - Flag("show_sizes", &show_sizes), // - }); + std::vector<Flag> flag_list = { + Flag("graph", &graph, "graph file name"), + Flag("input_layer", &input_layer, "input layer name"), + Flag("input_layer_shape", &input_layer_shape, "input layer shape"), + Flag("input_layer_type", &input_layer_type, "input layer type"), + Flag("output_layer", &output_layer, "output layer name"), + Flag("num_runs", &num_runs, "number of runs"), + Flag("run_delay", &run_delay, "delay between runs in seconds"), + Flag("num_threads", &num_threads, "number of threads"), + Flag("benchmark_name", &benchmark_name, "benchmark name"), + Flag("output_prefix", &output_prefix, "benchmark output prefix"), + Flag("show_sizes", &show_sizes, "whether to show sizes"), + }; + string usage = Flags::Usage(argv[0], flag_list); + const bool parse_result = Flags::Parse(&argc, argv, flag_list); if (!parse_result) { - LOG(ERROR) << "Error parsing command-line flags."; + LOG(ERROR) << usage; return -1; } ::tensorflow::port::InitMain(argv[0], &argc, &argv); if (argc > 1) { - LOG(ERROR) << "Unknown argument " << argv[1]; + LOG(ERROR) << "Unknown argument " << argv[1] << "\n" << usage; return -1; } |