diff options
-rw-r--r-- | WORKSPACE | 412 | ||||
-rw-r--r-- | tensorflow/core/BUILD | 1 | ||||
-rw-r--r-- | tensorflow/core/util/command_line_flags.cc (renamed from tensorflow/examples/label_image/command_line_flags.cc) | 7 | ||||
-rw-r--r-- | tensorflow/core/util/command_line_flags.h (renamed from tensorflow/examples/label_image/command_line_flags.h) | 30 | ||||
-rw-r--r-- | tensorflow/core/util/command_line_flags_test.cc (renamed from tensorflow/examples/label_image/command_line_flags_test.cc) | 5 | ||||
-rw-r--r-- | tensorflow/examples/label_image/BUILD | 26 | ||||
-rw-r--r-- | tensorflow/examples/label_image/main.cc | 27 | ||||
-rw-r--r-- | tensorflow/tensorboard/BUILD | 144 | ||||
-rw-r--r-- | tensorflow/tensorboard/bower.json | 14 |
9 files changed, 331 insertions, 335 deletions
@@ -71,143 +71,150 @@ bind( # TENSORBOARD_BOWER_AUTOGENERATED_BELOW_THIS_LINE_DO_NOT_EDIT new_git_repository( - name = "iron_form_element_behavior", + name = "accessibility_developer_tools", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-form-element-behavior.git", - tag = "v1.0.6", + remote = "https://github.com/GoogleChrome/accessibility-developer-tools.git", + tag = "v2.10.0", ) new_git_repository( - name = "iron_menu_behavior", + name = "async", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-menu-behavior.git", - tag = "v1.0.7", + remote = "https://github.com/caolan/async.git", + tag = "v1.5.2", ) new_git_repository( - name = "paper_toggle_button", + name = "chai", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-toggle-button.git", - tag = "v1.0.11", + remote = "https://github.com/chaijs/chai.git", + tag = "2.3.0", ) new_git_repository( - name = "iron_a11y_keys_behavior", + name = "d3", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-a11y-keys-behavior.git", - tag = "v1.1.1", + remote = "https://github.com/mbostock/d3.git", + tag = "v3.5.6", ) new_git_repository( - name = "iron_range_behavior", + name = "dagre", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-range-behavior.git", - tag = "v1.0.4", + remote = "https://github.com/cpettitt/dagre.git", + tag = "v0.7.4", ) new_git_repository( - name = "paper_radio_group", + name = "es6_promise", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-radio-group.git", - tag = "v1.0.6", + remote = "https://github.com/components/es6-promise.git", + tag = "v3.0.2", ) new_git_repository( - name = "chai", + name = "font_roboto", build_file = "bower.BUILD", - remote = "https://github.com/chaijs/chai.git", - tag = "2.3.0", + remote = "https://github.com/PolymerElements/font-roboto.git", + tag = "v1.0.1", ) new_git_repository( - name = "iron_fit_behavior", + name = "graphlib", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-fit-behavior.git", - tag = "v1.0.5", + remote = "https://github.com/cpettitt/graphlib.git", + tag = "v1.0.7", ) new_git_repository( - name = "paper_menu", + name = "hydrolysis", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-menu.git", + remote = "https://github.com/Polymer/hydrolysis.git", + tag = "v1.22.0", +) + +new_git_repository( + name = "iron_a11y_keys_behavior", + build_file = "bower.BUILD", + remote = "https://github.com/PolymerElements/iron-a11y-keys-behavior.git", tag = "v1.1.1", ) new_git_repository( - name = "iron_behaviors", + name = "iron_ajax", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-behaviors.git", - tag = "v1.0.10", + remote = "https://github.com/PolymerElements/iron-ajax.git", + tag = "v1.0.7", ) new_git_repository( - name = "hydrolysis", + name = "iron_autogrow_textarea", build_file = "bower.BUILD", - remote = "https://github.com/Polymer/hydrolysis.git", - tag = "v1.22.0", + remote = "https://github.com/PolymerElements/iron-autogrow-textarea.git", + tag = "v1.0.10", ) new_git_repository( - name = "graphlib", + name = "iron_behaviors", build_file = "bower.BUILD", - remote = "https://github.com/cpettitt/graphlib.git", - tag = "v1.0.7", + remote = "https://github.com/PolymerElements/iron-behaviors.git", + tag = "v1.0.10", ) new_git_repository( - name = "webcomponentsjs", + name = "iron_checked_element_behavior", build_file = "bower.BUILD", - remote = "https://github.com/Polymer/webcomponentsjs.git", - tag = "v0.7.20", + remote = "https://github.com/PolymerElements/iron-checked-element-behavior.git", + tag = "v1.0.4", ) new_git_repository( - name = "accessibility_developer_tools", + name = "iron_collapse", build_file = "bower.BUILD", - remote = "https://github.com/GoogleChrome/accessibility-developer-tools.git", - tag = "v2.10.0", + remote = "https://github.com/PolymerElements/iron-collapse.git", + tag = "v1.0.4", ) new_git_repository( - name = "paper_styles", + name = "iron_component_page", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-styles.git", - tag = "v1.0.12", + remote = "https://github.com/PolymerElements/iron-component-page.git", + tag = "v1.1.4", ) new_git_repository( - name = "paper_item", + name = "iron_doc_viewer", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-item.git", - tag = "v1.0.5", + remote = "https://github.com/PolymerElements/iron-doc-viewer.git", + tag = "v1.0.12", ) new_git_repository( - name = "paper_toolbar", + name = "iron_dropdown", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-toolbar.git", - tag = "v1.0.4", + remote = "https://github.com/polymerelements/iron-dropdown.git", + tag = "v1.1.0", ) new_git_repository( - name = "iron_overlay_behavior", + name = "iron_fit_behavior", build_file = "bower.BUILD", - remote = "https://github.com/polymerelements/iron-overlay-behavior.git", - tag = "v1.2.0", + remote = "https://github.com/PolymerElements/iron-fit-behavior.git", + tag = "v1.0.5", ) new_git_repository( - name = "paper_input", + name = "iron_flex_layout", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-input.git", - tag = "v1.0.16", + remote = "https://github.com/polymerelements/iron-flex-layout.git", + tag = "v1.2.2", ) new_git_repository( - name = "iron_component_page", + name = "iron_form_element_behavior", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-component-page.git", - tag = "v1.1.4", + remote = "https://github.com/PolymerElements/iron-form-element-behavior.git", + tag = "v1.0.6", ) new_git_repository( @@ -218,20 +225,27 @@ new_git_repository( ) new_git_repository( - name = "iron_selector", + name = "iron_icons", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-selector.git", - tag = "v1.0.7", + remote = "https://github.com/PolymerElements/iron-icons.git", + tag = "v1.1.3", ) new_git_repository( - name = "paper_behaviors", + name = "iron_iconset_svg", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-behaviors.git", + remote = "https://github.com/polymerelements/iron-iconset-svg.git", tag = "v1.0.9", ) new_git_repository( + name = "iron_input", + build_file = "bower.BUILD", + remote = "https://github.com/PolymerElements/iron-input.git", + tag = "1.0.8", +) + +new_git_repository( name = "iron_list", build_file = "bower.BUILD", remote = "https://github.com/PolymerElements/iron-list.git", @@ -239,290 +253,276 @@ new_git_repository( ) new_git_repository( - name = "dagre", + name = "iron_menu_behavior", build_file = "bower.BUILD", - remote = "https://github.com/cpettitt/dagre.git", - tag = "v0.7.4", + remote = "https://github.com/PolymerElements/iron-menu-behavior.git", + tag = "v1.1.0", ) new_git_repository( - name = "paper_slider", + name = "iron_meta", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-slider.git", - tag = "v1.0.7", + remote = "https://github.com/polymerelements/iron-meta.git", + tag = "v1.1.1", ) new_git_repository( - name = "iron_input", + name = "iron_overlay_behavior", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-input.git", - tag = "1.0.8", + remote = "https://github.com/polymerelements/iron-overlay-behavior.git", + tag = "v1.2.0", ) new_git_repository( - name = "iron_resizable_behavior", + name = "iron_range_behavior", build_file = "bower.BUILD", - remote = "https://github.com/polymerelements/iron-resizable-behavior.git", - tag = "v1.0.2", + remote = "https://github.com/PolymerElements/iron-range-behavior.git", + tag = "v1.0.4", ) new_git_repository( - name = "sinonjs", + name = "iron_resizable_behavior", build_file = "bower.BUILD", - remote = "https://github.com/blittle/sinon.js.git", - tag = "v1.17.1", + remote = "https://github.com/polymerelements/iron-resizable-behavior.git", + tag = "v1.0.2", ) new_git_repository( - name = "async", + name = "iron_selector", build_file = "bower.BUILD", - remote = "https://github.com/caolan/async.git", - tag = "v1.5.2", + remote = "https://github.com/PolymerElements/iron-selector.git", + tag = "v1.0.7", ) new_git_repository( - name = "mocha", + name = "iron_validatable_behavior", build_file = "bower.BUILD", - remote = "https://github.com/mochajs/mocha.git", - tag = "v2.4.5", + remote = "https://github.com/PolymerElements/iron-validatable-behavior.git", + tag = "v1.0.5", ) new_git_repository( - name = "test_fixture", + name = "lodash", build_file = "bower.BUILD", - remote = "https://github.com/polymerelements/test-fixture.git", - tag = "v1.1.0", + remote = "https://github.com/lodash/lodash.git", + tag = "3.10.1", ) new_git_repository( - name = "iron_dropdown", + name = "marked", build_file = "bower.BUILD", - remote = "https://github.com/polymerelements/iron-dropdown.git", - tag = "v1.1.0", + remote = "https://github.com/chjj/marked.git", + tag = "v0.3.5", ) new_git_repository( - name = "paper_tabs", + name = "marked_element", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-tabs.git", - tag = "v1.0.10", + remote = "https://github.com/PolymerElements/marked-element.git", + tag = "v1.1.3", ) new_git_repository( - name = "paper_checkbox", + name = "mocha", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-checkbox.git", - tag = "v1.0.13", + remote = "https://github.com/mochajs/mocha.git", + tag = "v2.4.5", ) new_git_repository( - name = "web_component_tester", + name = "neon_animation", build_file = "bower.BUILD", - remote = "https://github.com/Polymer/web-component-tester.git", - tag = "v4.1.0", + remote = "https://github.com/polymerelements/neon-animation.git", + tag = "v1.1.0", ) new_git_repository( - name = "paper_menu_button", + name = "paper_behaviors", build_file = "bower.BUILD", - remote = "https://github.com/polymerelements/paper-menu-button.git", - tag = "v1.0.4", + remote = "https://github.com/PolymerElements/paper-behaviors.git", + tag = "v1.0.9", ) new_git_repository( - name = "plottable", + name = "paper_button", build_file = "bower.BUILD", - remote = "https://github.com/palantir/plottable.git", - tag = "v1.16.2", + remote = "https://github.com/PolymerElements/paper-button.git", + tag = "v1.0.8", ) new_git_repository( - name = "iron_collapse", + name = "paper_checkbox", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-collapse.git", - tag = "v1.0.4", + remote = "https://github.com/PolymerElements/paper-checkbox.git", + tag = "v1.0.13", ) new_git_repository( - name = "paper_ripple", + name = "paper_dropdown_menu", build_file = "bower.BUILD", - remote = "https://github.com/polymerelements/paper-ripple.git", + remote = "https://github.com/PolymerElements/paper-dropdown-menu.git", tag = "v1.0.5", ) new_git_repository( - name = "iron_validatable_behavior", + name = "paper_header_panel", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-validatable-behavior.git", + remote = "https://github.com/PolymerElements/paper-header-panel.git", tag = "v1.0.5", ) new_git_repository( - name = "paper_material", + name = "paper_icon_button", build_file = "bower.BUILD", - remote = "https://github.com/polymerelements/paper-material.git", - tag = "v1.0.6", + remote = "https://github.com/PolymerElements/paper-icon-button.git", + tag = "v1.0.5", ) new_git_repository( - name = "paper_progress", + name = "paper_input", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-progress.git", - tag = "v1.0.7", + remote = "https://github.com/PolymerElements/paper-input.git", + tag = "v1.0.16", ) new_git_repository( - name = "prism", + name = "paper_item", build_file = "bower.BUILD", - remote = "https://github.com/LeaVerou/prism.git", - tag = "v1.3.0", + remote = "https://github.com/PolymerElements/paper-item.git", + tag = "v1.0.5", ) new_git_repository( - name = "marked_element", + name = "paper_material", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/marked-element.git", - tag = "v1.1.2", + remote = "https://github.com/polymerelements/paper-material.git", + tag = "v1.0.6", ) new_git_repository( - name = "d3", + name = "paper_menu", build_file = "bower.BUILD", - remote = "https://github.com/mbostock/d3.git", - tag = "v3.5.6", + remote = "https://github.com/PolymerElements/paper-menu.git", + tag = "v1.1.1", ) new_git_repository( - name = "neon_animation", + name = "paper_menu_button", build_file = "bower.BUILD", - remote = "https://github.com/polymerelements/neon-animation.git", - tag = "v1.1.0", + remote = "https://github.com/polymerelements/paper-menu-button.git", + tag = "v1.0.4", ) new_git_repository( - name = "iron_icons", + name = "paper_progress", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-icons.git", - tag = "v1.1.2", + remote = "https://github.com/PolymerElements/paper-progress.git", + tag = "v1.0.7", ) new_git_repository( - name = "prism_element", + name = "paper_radio_button", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/prism-element.git", - tag = "v1.0.3", + remote = "https://github.com/PolymerElements/paper-radio-button.git", + tag = "v1.0.10", ) new_git_repository( - name = "iron_ajax", + name = "paper_radio_group", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-ajax.git", - tag = "v1.0.7", + remote = "https://github.com/PolymerElements/paper-radio-group.git", + tag = "v1.0.6", ) new_git_repository( - name = "paper_icon_button", + name = "paper_ripple", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-icon-button.git", + remote = "https://github.com/polymerelements/paper-ripple.git", tag = "v1.0.5", ) new_git_repository( - name = "sinon_chai", + name = "paper_slider", build_file = "bower.BUILD", - remote = "https://github.com/domenic/sinon-chai.git", - tag = "2.8.0", + remote = "https://github.com/PolymerElements/paper-slider.git", + tag = "v1.0.7", ) new_git_repository( - name = "iron_doc_viewer", + name = "paper_styles", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-doc-viewer.git", + remote = "https://github.com/PolymerElements/paper-styles.git", tag = "v1.0.12", ) new_git_repository( - name = "svg_typewriter", - build_file = "bower.BUILD", - remote = "https://github.com/palantir/svg-typewriter.git", - tag = "v0.3.0", -) - -new_git_repository( - name = "es6_promise", - build_file = "bower.BUILD", - remote = "https://github.com/components/es6-promise.git", - tag = "v3.0.2", -) - -new_git_repository( - name = "marked", + name = "paper_tabs", build_file = "bower.BUILD", - remote = "https://github.com/chjj/marked.git", - tag = "v0.3.5", + remote = "https://github.com/PolymerElements/paper-tabs.git", + tag = "v1.0.10", ) new_git_repository( - name = "paper_button", + name = "paper_toggle_button", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-button.git", - tag = "v1.0.8", + remote = "https://github.com/PolymerElements/paper-toggle-button.git", + tag = "v1.0.11", ) new_git_repository( - name = "iron_meta", + name = "paper_toolbar", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-meta.git", - tag = "v1.1.1", + remote = "https://github.com/PolymerElements/paper-toolbar.git", + tag = "v1.0.4", ) new_git_repository( - name = "iron_checked_element_behavior", + name = "plottable", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-checked-element-behavior.git", - tag = "v1.0.4", + remote = "https://github.com/palantir/plottable.git", + tag = "v1.16.2", ) new_git_repository( - name = "paper_radio_button", + name = "polymer", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-radio-button.git", - tag = "v1.0.10", + remote = "https://github.com/Polymer/polymer.git", + tag = "v1.1.5", ) new_git_repository( - name = "web_animations_js", + name = "prism", build_file = "bower.BUILD", - remote = "https://github.com/web-animations/web-animations-js.git", - tag = "2.1.3", + remote = "https://github.com/LeaVerou/prism.git", + tag = "v1.4.1", ) new_git_repository( - name = "iron_flex_layout", + name = "prism_element", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-flex-layout.git", - tag = "v1.2.2", + remote = "https://github.com/PolymerElements/prism-element.git", + tag = "v1.0.3", ) new_git_repository( - name = "iron_autogrow_textarea", + name = "promise_polyfill", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/iron-autogrow-textarea.git", - tag = "v1.0.10", + remote = "https://github.com/polymerlabs/promise-polyfill.git", + tag = "v1.0.0", ) new_git_repository( - name = "lodash", + name = "sinon_chai", build_file = "bower.BUILD", - remote = "https://github.com/lodash/lodash.git", - tag = "3.10.1", + remote = "https://github.com/domenic/sinon-chai.git", + tag = "2.8.0", ) new_git_repository( - name = "promise_polyfill", + name = "sinonjs", build_file = "bower.BUILD", - remote = "https://github.com/polymerlabs/promise-polyfill.git", - tag = "v1.0.0", + remote = "https://github.com/blittle/sinon.js.git", + tag = "v1.17.1", ) new_git_repository( @@ -533,36 +533,36 @@ new_git_repository( ) new_git_repository( - name = "font_roboto", + name = "svg_typewriter", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/font-roboto.git", - tag = "v1.0.1", + remote = "https://github.com/palantir/svg-typewriter.git", + tag = "v0.3.0", ) new_git_repository( - name = "paper_dropdown_menu", + name = "test_fixture", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-dropdown-menu.git", - tag = "v1.0.5", + remote = "https://github.com/polymerelements/test-fixture.git", + tag = "v1.1.0", ) new_git_repository( - name = "iron_iconset_svg", + name = "web_animations_js", build_file = "bower.BUILD", - remote = "https://github.com/polymerelements/iron-iconset-svg.git", - tag = "v1.0.9", + remote = "https://github.com/web-animations/web-animations-js.git", + tag = "2.1.3", ) new_git_repository( - name = "polymer", + name = "web_component_tester", build_file = "bower.BUILD", - remote = "https://github.com/Polymer/polymer.git", - tag = "v1.1.5", + remote = "https://github.com/Polymer/web-component-tester.git", + tag = "v4.2.0", ) new_git_repository( - name = "paper_header_panel", + name = "webcomponentsjs", build_file = "bower.BUILD", - remote = "https://github.com/PolymerElements/paper-header-panel.git", - tag = "v1.0.5", + remote = "https://github.com/Polymer/webcomponentsjs.git", + tag = "v0.7.20", ) diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD index 11788ebd3f..50577f6713 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD @@ -837,6 +837,7 @@ tf_cuda_library( "framework/tensor_reference.h", "framework/tracking_allocator.h", # only needed for tests "framework/unique_tensor_references.h", + "util/command_line_flags.h", "util/tensor_slice_set.h", "util/tensor_slice_util.h", ], diff --git a/tensorflow/examples/label_image/command_line_flags.cc b/tensorflow/core/util/command_line_flags.cc index 9806ccb624..d55fd568dd 100644 --- a/tensorflow/examples/label_image/command_line_flags.cc +++ b/tensorflow/core/util/command_line_flags.cc @@ -13,12 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/examples/label_image/command_line_flags.h" +#include "tensorflow/core/util/command_line_flags.h" #include "tensorflow/core/lib/core/stringpiece.h" #include "tensorflow/core/platform/logging.h" -using tensorflow::string; - +namespace tensorflow { namespace { bool ParseStringFlag(tensorflow::StringPiece arg, tensorflow::StringPiece flag, @@ -133,3 +132,5 @@ bool ParseFlags(int* argc, char** argv, const std::vector<Flag>& flag_list) { *argc = unknown_flags.size() + 1; return result; } + +} // namespace tensorflow diff --git a/tensorflow/examples/label_image/command_line_flags.h b/tensorflow/core/util/command_line_flags.h index dcc8f3fdde..124756cdde 100644 --- a/tensorflow/examples/label_image/command_line_flags.h +++ b/tensorflow/core/util/command_line_flags.h @@ -13,15 +13,19 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_EXAMPLES_LABEL_IMAGE_COMMAND_LINE_FLAGS_H -#define TENSORFLOW_EXAMPLES_LABEL_IMAGE_COMMAND_LINE_FLAGS_H +#ifndef THIRD_PARTY_TENSORFLOW_CORE_UTIL_COMMAND_LINE_FLAGS_H +#define THIRD_PARTY_TENSORFLOW_CORE_UTIL_COMMAND_LINE_FLAGS_H #include <vector> #include "tensorflow/core/platform/types.h" +namespace tensorflow { + +// N.B. This library is for INTERNAL use only. +// // This is a simple command-line argument parsing module to help us handle -// example parameters. The recommended way of using it is with local variables -// and an initializer list of Flag objects, for example: +// parameters for C++ binaries. The recommended way of using it is with local +// variables and an initializer list of Flag objects, for example: // // int some_int = 10; // bool some_switch = false; @@ -38,22 +42,28 @@ limitations under the License. // The result indicates if there were any errors parsing the values that were // passed to the command-line switches. For example, --some_int=foo would return // false because the argument is expected to be an integer. +// +// NOTE: Unlike gflags-style libraries, this library is intended to be +// used in the `main()` function of your binary. It does not handle +// flag definitions that are scattered around the source code. class Flag { public: - Flag(const char* name, tensorflow::int32* dst1); + Flag(const char* name, int32* dst1); Flag(const char* name, bool* dst); - Flag(const char* name, tensorflow::string* dst); + Flag(const char* name, string* dst); - bool Parse(tensorflow::string arg, bool* value_parsing_ok) const; + bool Parse(string arg, bool* value_parsing_ok) const; private: - tensorflow::string name_; + string name_; enum { TYPE_INT, TYPE_BOOL, TYPE_STRING } type_; int* int_value_; bool* bool_value_; - tensorflow::string* string_value_; + string* string_value_; }; bool ParseFlags(int* argc, char** argv, const std::vector<Flag>& flag_list); -#endif // TENSORFLOW_EXAMPLES_LABEL_IMAGE_COMMAND_LINE_FLAGS_H +} // namespace tensorflow + +#endif // THIRD_PARTY_TENSORFLOW_CORE_UTIL_COMMAND_LINE_FLAGS_H diff --git a/tensorflow/examples/label_image/command_line_flags_test.cc b/tensorflow/core/util/command_line_flags_test.cc index 870e95288a..00dde42a2f 100644 --- a/tensorflow/examples/label_image/command_line_flags_test.cc +++ b/tensorflow/core/util/command_line_flags_test.cc @@ -13,9 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/examples/label_image/command_line_flags.h" +#include "tensorflow/core/util/command_line_flags.h" #include "tensorflow/core/platform/test.h" +namespace tensorflow { namespace { // The returned array is only valid for the lifetime of the input vector. // We're using const casting because we need to pass in an argv-style array of @@ -77,3 +78,5 @@ TEST(CommandLineFlagsTest, BadBoolValue) { EXPECT_EQ(false, some_switch); EXPECT_EQ(argc, 1); } + +} // namespace tensorflow diff --git a/tensorflow/examples/label_image/BUILD b/tensorflow/examples/label_image/BUILD index 33577ea787..facc61ae13 100644 --- a/tensorflow/examples/label_image/BUILD +++ b/tensorflow/examples/label_image/BUILD @@ -7,17 +7,6 @@ licenses(["notice"]) # Apache 2.0 exports_files(["LICENSE"]) -cc_library( - name = "command_line_flags", - srcs = [ - "command_line_flags.cc", - "command_line_flags.h", - ], - deps = [ - "//tensorflow/core:tensorflow", - ], -) - cc_binary( name = "label_image", srcs = [ @@ -25,25 +14,12 @@ cc_binary( ], linkopts = ["-lm"], deps = [ - ":command_line_flags", "//tensorflow/cc:cc_ops", + "//tensorflow/core:framework_internal", "//tensorflow/core:tensorflow", ], ) -cc_test( - name = "command_line_flags_test", - srcs = [ - "command_line_flags_test.cc", - ], - deps = [ - ":command_line_flags", - "//tensorflow/core:tensorflow", - "//tensorflow/core:test_main", - "//tensorflow/core/platform/default/build_config:gtest", - ], -) - filegroup( name = "all_files", srcs = glob( diff --git a/tensorflow/examples/label_image/main.cc b/tensorflow/examples/label_image/main.cc index 78fd1dd860..25461d9f00 100644 --- a/tensorflow/examples/label_image/main.cc +++ b/tensorflow/examples/label_image/main.cc @@ -49,9 +49,10 @@ limitations under the License. #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/types.h" #include "tensorflow/core/public/session.h" -#include "tensorflow/examples/label_image/command_line_flags.h" +#include "tensorflow/core/util/command_line_flags.h" // These are all common classes it's handy to reference with no namespace. +using tensorflow::Flag; using tensorflow::Tensor; using tensorflow::Status; using tensorflow::string; @@ -248,18 +249,18 @@ int main(int argc, char* argv[]) { string output_layer = "softmax"; bool self_test = false; string root_dir = ""; - const bool parse_result = - ParseFlags(&argc, argv, {Flag("image", &image), // - Flag("graph", &graph), // - Flag("labels", &labels), // - Flag("input_width", &input_width), // - Flag("input_height", &input_height), // - Flag("input_mean", &input_mean), // - Flag("input_std", &input_std), // - Flag("input_layer", &input_layer), // - Flag("output_layer", &output_layer), // - Flag("self_test", &self_test), // - Flag("root_dir", &root_dir)}); + const bool parse_result = tensorflow::ParseFlags( + &argc, argv, {Flag("image", &image), // + Flag("graph", &graph), // + Flag("labels", &labels), // + Flag("input_width", &input_width), // + Flag("input_height", &input_height), // + Flag("input_mean", &input_mean), // + Flag("input_std", &input_std), // + Flag("input_layer", &input_layer), // + Flag("output_layer", &output_layer), // + Flag("self_test", &self_test), // + Flag("root_dir", &root_dir)}); if (!parse_result) { LOG(ERROR) << "Error parsing command-line flags."; return -1; diff --git a/tensorflow/tensorboard/BUILD b/tensorflow/tensorboard/BUILD index def870e728..75a0c09c6d 100644 --- a/tensorflow/tensorboard/BUILD +++ b/tensorflow/tensorboard/BUILD @@ -1,76 +1,80 @@ -# Description: -# TensorBoard, a dashboard for investigating TensorFlow +# AUTOGENERATED FILE by tensorboard_bower_dependency_sync.py -package(default_visibility = ["//tensorflow:internal"]) +package(default_visibility = ["//visibility:public"]) filegroup( - name = "tensorboard_frontend", + name = "bower", srcs = [ - "dist/index.html", - "dist/tf-tensorboard.html", - "//tensorflow/tensorboard/bower:bower", - "TAG", - ] + glob(["lib/**/*"]), -) - -py_library( - name = "tensorboard_handler", - srcs = ["backend/tensorboard_handler.py"], - srcs_version = "PY2AND3", - deps = [ - ":float_wrapper", - "//tensorflow/python:platform", - "//tensorflow/python:summary", - "//tensorflow/python:util", - ], -) - -py_test( - name = "tensorboard_handler_test", - size = "small", - srcs = ["backend/tensorboard_handler_test.py"], - srcs_version = "PY2AND3", - deps = [ - ":tensorboard_handler", - "//tensorflow/python:platform_test", - ], -) - -py_library( - name = "float_wrapper", - srcs = ["backend/float_wrapper.py"], - srcs_version = "PY2AND3", -) - -py_test( - name = "float_wrapper_test", - size = "small", - srcs = ["backend/float_wrapper_test.py"], - srcs_version = "PY2AND3", - deps = [ - ":float_wrapper", - "//tensorflow/python:platform_test", - ], -) - -py_library( - name = "tensorboard_server", - srcs = ["backend/tensorboard_server.py"], - srcs_version = "PY2AND3", - deps = [ - ":tensorboard_handler", - "//tensorflow/python:platform", - "//tensorflow/python:summary", - ], -) - -py_binary( - name = "tensorboard", - srcs = ["backend/tensorboard.py"], - data = [":tensorboard_frontend"], - srcs_version = "PY2AND3", - deps = [ - ":tensorboard_server", - "//tensorflow/python:platform", + "@accessibility_developer_tools//:accessibility_developer_tools", + "@async//:async", + "@chai//:chai", + "@d3//:d3", + "@dagre//:dagre", + "@es6_promise//:es6_promise", + "@font_roboto//:font_roboto", + "@graphlib//:graphlib", + "@hydrolysis//:hydrolysis", + "@iron_a11y_keys_behavior//:iron_a11y_keys_behavior", + "@iron_ajax//:iron_ajax", + "@iron_autogrow_textarea//:iron_autogrow_textarea", + "@iron_behaviors//:iron_behaviors", + "@iron_checked_element_behavior//:iron_checked_element_behavior", + "@iron_collapse//:iron_collapse", + "@iron_component_page//:iron_component_page", + "@iron_doc_viewer//:iron_doc_viewer", + "@iron_dropdown//:iron_dropdown", + "@iron_fit_behavior//:iron_fit_behavior", + "@iron_flex_layout//:iron_flex_layout", + "@iron_form_element_behavior//:iron_form_element_behavior", + "@iron_icon//:iron_icon", + "@iron_icons//:iron_icons", + "@iron_iconset_svg//:iron_iconset_svg", + "@iron_input//:iron_input", + "@iron_list//:iron_list", + "@iron_menu_behavior//:iron_menu_behavior", + "@iron_meta//:iron_meta", + "@iron_overlay_behavior//:iron_overlay_behavior", + "@iron_range_behavior//:iron_range_behavior", + "@iron_resizable_behavior//:iron_resizable_behavior", + "@iron_selector//:iron_selector", + "@iron_validatable_behavior//:iron_validatable_behavior", + "@lodash//:lodash", + "@marked//:marked", + "@marked_element//:marked_element", + "@mocha//:mocha", + "@neon_animation//:neon_animation", + "@paper_behaviors//:paper_behaviors", + "@paper_button//:paper_button", + "@paper_checkbox//:paper_checkbox", + "@paper_dropdown_menu//:paper_dropdown_menu", + "@paper_header_panel//:paper_header_panel", + "@paper_icon_button//:paper_icon_button", + "@paper_input//:paper_input", + "@paper_item//:paper_item", + "@paper_material//:paper_material", + "@paper_menu//:paper_menu", + "@paper_menu_button//:paper_menu_button", + "@paper_progress//:paper_progress", + "@paper_radio_button//:paper_radio_button", + "@paper_radio_group//:paper_radio_group", + "@paper_ripple//:paper_ripple", + "@paper_slider//:paper_slider", + "@paper_styles//:paper_styles", + "@paper_tabs//:paper_tabs", + "@paper_toggle_button//:paper_toggle_button", + "@paper_toolbar//:paper_toolbar", + "@plottable//:plottable", + "@polymer//:polymer", + "@prism//:prism", + "@prism_element//:prism_element", + "@promise_polyfill//:promise_polyfill", + "@sinon_chai//:sinon_chai", + "@sinonjs//:sinonjs", + "@stacky//:stacky", + "@svg_typewriter//:svg_typewriter", + "@test_fixture//:test_fixture", + "@web_animations_js//:web_animations_js", + "@web_component_tester//:web_component_tester", + "@webcomponentsjs//:webcomponentsjs", ], ) diff --git a/tensorflow/tensorboard/bower.json b/tensorflow/tensorboard/bower.json index 3c9bcd6801..978b3b44dd 100644 --- a/tensorflow/tensorboard/bower.json +++ b/tensorflow/tensorboard/bower.json @@ -19,16 +19,16 @@ "dagre": "0.7.4", "es6-promise": "3.0.2", "graphlib": "1.0.7", - "iron-ajax": "PolymerElements/iron-ajax#1.0.7", + "iron-ajax": "PolymerElements/iron-ajax#1.1.1", "iron-behaviors": "PolymerElements/iron-behaviors#1.0.10", - "iron-collapse": "PolymerElements/iron-collapse#1.0.4", - "iron-list": "PolymerElements/iron-list#1.1.5", + "iron-collapse": "PolymerElements/iron-collapse#1.0.5", + "iron-list": "PolymerElements/iron-list#1.1.7", "iron-selector": "PolymerElements/iron-selector#1.0.7", "paper-behaviors": "PolymerElements/paper-behaviors#1.0.9", - "paper-button": "PolymerElements/paper-button#1.0.8", + "paper-button": "PolymerElements/paper-button#1.0.11", "paper-checkbox": "PolymerElements/paper-checkbox#1.0.13", "paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#1.0.5", - "paper-header-panel": "PolymerElements/paper-header-panel#1.0.5", + "paper-header-panel": "PolymerElements/paper-header-panel#1.1.2", "paper-icon-button": "PolymerElements/paper-icon-button#1.0.5", "paper-input": "PolymerElements/paper-input#1.0.16", "paper-item": "PolymerElements/paper-item#1.0.5", @@ -41,8 +41,8 @@ "paper-toggle-button": "PolymerElements/paper-toggle-button#1.0.11", "paper-toolbar": "PolymerElements/paper-toolbar#1.0.4", "plottable": "1.16.2", - "polymer": "1.1.5", - "paper-tabs": "PolymerElements/paper-tabs#1.0" + "polymer": "1.2.4", + "paper-tabs": "PolymerElements/paper-tabs#1.0.4" }, "devDependencies": { "iron-component-page": "PolymerElements/iron-component-page#^1.0.0", |