From 3f34171073e566d2fb27888f67d75161f3e964f8 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Thu, 17 May 2018 07:34:24 -0700 Subject: [PATCH] Drop some old dump_graphviz options PiperOrigin-RevId: 196989899 --- tensorflow/contrib/lite/toco/dump_graphviz.cc | 51 ++-------------------- .../contrib/lite/toco/model_cmdline_flags.cc | 10 ----- .../contrib/lite/toco/toco_graphviz_dump_options.h | 2 - 3 files changed, 3 insertions(+), 60 deletions(-) diff --git a/tensorflow/contrib/lite/toco/dump_graphviz.cc b/tensorflow/contrib/lite/toco/dump_graphviz.cc index 166ead9..6e59272 100644 --- a/tensorflow/contrib/lite/toco/dump_graphviz.cc +++ b/tensorflow/contrib/lite/toco/dump_graphviz.cc @@ -91,10 +91,7 @@ Color GetColorForArray(const Model& model, const string& array_name) { // We use gray colors for them because they are the majority // of arrays so we want to highlight other arrays instead of them. // First, we use a bolder gray for input/output arrays: - const auto& dump_options = *GraphVizDumpOptions::singleton(); - if (IsInputArray(model, array_name) || - array_name == dump_options.graphviz_first_array || - array_name == dump_options.graphviz_last_array) { + if (IsInputArray(model, array_name)) { return Color(0x9E, 0x9E, 0x9E); } if (IsOutputArray(model, array_name)) { @@ -287,47 +284,6 @@ NodeProperties GetPropertiesForOperator(const Operator& op) { return node_properties; } -std::vector OperatorsToDump(const Model& model) { - const auto& dump_options = *GraphVizDumpOptions::singleton(); - bool first_specified = !dump_options.graphviz_first_array.empty(); - bool last_specified = !dump_options.graphviz_last_array.empty(); - CHECK_EQ(first_specified, last_specified); - std::vector ops_to_dump; - if (last_specified) { - // Return only the part of the graph between graphviz_first_array - // and graphviz_last_array. - CHECK(model.HasArray(dump_options.graphviz_first_array)); - CHECK(model.HasArray(dump_options.graphviz_last_array)); - std::unordered_set arrays_already_produced; - std::vector arrays_to_produce; - arrays_to_produce.push_back(dump_options.graphviz_last_array); - while (!arrays_to_produce.empty()) { - const string array = arrays_to_produce.back(); - arrays_to_produce.pop_back(); - CHECK(!arrays_already_produced.count(array)); - arrays_already_produced.insert(array); - const Operator* op = GetOpWithOutput(model, array); - if (!op) { - continue; - } - ops_to_dump.push_back(op); - for (const string& input : op->inputs) { - if (arrays_already_produced.count(input) || - input == dump_options.graphviz_first_array) { - continue; - } - arrays_to_produce.push_back(input); - } - } - } else { - // Return the whole graph. - for (const auto& op : model.operators) { - ops_to_dump.push_back(op.get()); - } - } - return ops_to_dump; -} - } // namespace void DumpGraphviz(const Model& model, string* output_file_contents) { @@ -348,10 +304,9 @@ void DumpGraphviz(const Model& model, string* output_file_contents) { constexpr char kRNNBackEdgeFormat[] = "\t \"%s\" -> \"%s\" [color=\"#0F9D58\"];\n"; - std::vector ops_to_dump = OperatorsToDump(model); std::set already_added_arrays; - for (int op_index = 0; op_index < ops_to_dump.size(); op_index++) { - const Operator& op = *ops_to_dump[op_index]; + for (int op_index = 0; op_index < model.operators.size(); op_index++) { + const Operator& op = *model.operators[op_index]; // Add node for operator. auto op_properties = GetPropertiesForOperator(op); string operator_id = StringF("op%05d", op_index); diff --git a/tensorflow/contrib/lite/toco/model_cmdline_flags.cc b/tensorflow/contrib/lite/toco/model_cmdline_flags.cc index 7bbeab7..f875c85 100644 --- a/tensorflow/contrib/lite/toco/model_cmdline_flags.cc +++ b/tensorflow/contrib/lite/toco/model_cmdline_flags.cc @@ -124,14 +124,6 @@ bool ParseModelFlagsFromCommandLineFlags( parsed_flags.model_checks.default_value(), "A list of model checks to be applied to verify the form of the " "model. Applied after the graph transformations after import."), - Flag("graphviz_first_array", parsed_flags.graphviz_first_array.bind(), - parsed_flags.graphviz_first_array.default_value(), - "If set, defines the start of the sub-graph to be dumped to " - "GraphViz."), - Flag( - "graphviz_last_array", parsed_flags.graphviz_last_array.bind(), - parsed_flags.graphviz_last_array.default_value(), - "If set, defines the end of the sub-graph to be dumped to GraphViz."), Flag("dump_graphviz", parsed_flags.dump_graphviz.bind(), parsed_flags.dump_graphviz.default_value(), "Dump graphviz during LogDump call. If string is non-empty then " @@ -180,8 +172,6 @@ bool ParseModelFlagsFromCommandLineFlags( if (!tensorflow::Flags::Parse(argc, argv, flags)) return false; } auto& dump_options = *GraphVizDumpOptions::singleton(); - dump_options.graphviz_first_array = parsed_flags.graphviz_first_array.value(); - dump_options.graphviz_last_array = parsed_flags.graphviz_last_array.value(); dump_options.dump_graphviz_video = parsed_flags.dump_graphviz_video.value(); dump_options.dump_graphviz = parsed_flags.dump_graphviz.value(); diff --git a/tensorflow/contrib/lite/toco/toco_graphviz_dump_options.h b/tensorflow/contrib/lite/toco/toco_graphviz_dump_options.h index d6c3ba6..7cdd55e 100644 --- a/tensorflow/contrib/lite/toco/toco_graphviz_dump_options.h +++ b/tensorflow/contrib/lite/toco/toco_graphviz_dump_options.h @@ -21,8 +21,6 @@ namespace toco { // Global data for determining whether to output graph viz format from toco. struct GraphVizDumpOptions { - std::string graphviz_first_array; - std::string graphviz_last_array; std::string dump_graphviz; bool dump_graphviz_video = false; -- 2.7.4