From 52b4d471ebde27b5065a4f6195049a679d12d97e Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Wed, 17 May 2017 16:13:33 -0700 Subject: Delete TensorBoard Gulp build This CL uses web_library to build all components in the forked d3v4 packages. The tensorboard command now uses the newly vulcanized binary. This leaves the CMake build for TensorBoard in a partially broken state. We will need to update it to obtain tensorboard/index.html from a web server. PiperOrigin-RevId: 156369259 --- WORKSPACE | 500 +- bower.BUILD | 645 - tensorflow/BUILD | 4 +- tensorflow/contrib/cmake/CMakeLists.txt | 1 - .../contrib/cmake/external/tensorboard.cmake | 148 - tensorflow/contrib/cmake/tf_python.cmake | 25 +- tensorflow/tensorboard/.bowerrc | 3 - tensorflow/tensorboard/.gitignore | 27 - tensorflow/tensorboard/BUILD | 50 +- tensorflow/tensorboard/DEVELOPMENT.md | 123 +- tensorflow/tensorboard/app/BUILD | 19 - tensorflow/tensorboard/app/analytics.js | 16 - tensorflow/tensorboard/backend/BUILD | 2 +- tensorflow/tensorboard/backend/application.py | 64 +- tensorflow/tensorboard/backend/application_test.py | 5 - tensorflow/tensorboard/bower.json | 187 - tensorflow/tensorboard/bower/BUILD | 76 - tensorflow/tensorboard/components/BUILD | 39 +- tensorflow/tensorboard/components/analytics.html | 18 + tensorflow/tensorboard/components/index.html | 39 - tensorflow/tensorboard/components/tensorboard.html | 27 + .../components/tf_audio_dashboard/BUILD | 3 +- tensorflow/tensorboard/components/tf_backend/BUILD | 12 +- .../tensorboard/components/tf_backend_d3v4/BUILD | 1 + .../tensorboard/components/tf_color_scale/BUILD | 14 +- .../components/tf_dashboard_common/BUILD | 12 +- .../components/tf_distribution_dashboard/BUILD | 4 +- .../tensorboard/components/tf_graph_common/BUILD | 14 +- .../components/tf_histogram_dashboard/BUILD | 2 +- tensorflow/tensorboard/components/tf_imports/BUILD | 4 +- .../tensorboard/components/tf_imports_d3v4/BUILD | 10 +- .../components/tf_imports_google/README.md | 3 - .../components/tf_imports_google/d3.html | 18 - .../components/tf_imports_google/dagre.html | 18 - .../components/tf_imports_google/graphlib.html | 18 - .../components/tf_imports_google/lodash.html | 18 - .../components/tf_imports_google/plottable.html | 19 - .../components/tf_scalar_dashboard/BUILD | 3 +- tensorflow/tensorboard/components/tf_storage/BUILD | 12 +- .../components/tf_tensorboard_d3v4/BUILD | 43 +- .../components/tf_tensorboard_d3v4/demo.html | 15 +- .../components/tf_tensorboard_d3v4/dist.html | 32 - .../components/tf_tensorboard_d3v4/style.html | 28 + .../tf_tensorboard_d3v4/tf-tensorboard.html | 3 +- .../components/vz_distribution_chart/BUILD | 12 +- tensorflow/tensorboard/components/vz_heatmap/BUILD | 29 + .../components/vz_heatmap/demo/index.html | 3 +- .../components/vz_heatmap/vz-heatmap.html | 6 +- .../tensorboard/components/vz_heatmap_d3v4/BUILD | 41 + .../components/vz_heatmap_d3v4/demo/index.html | 161 + .../components/vz_heatmap_d3v4/index.html | 31 + .../components/vz_heatmap_d3v4/vz-heatmap.html | 360 + .../components/vz_histogram_timeseries/BUILD | 2 +- .../tensorboard/components/vz_line_chart/BUILD | 14 +- tensorflow/tensorboard/components/vz_sorting/BUILD | 1 - .../tensorboard/components/vz_sorting/test/BUILD | 10 +- .../tensorboard/dist/bazel-html-imports.html | 23 - tensorflow/tensorboard/dist/index.html | 32 - tensorflow/tensorboard/dist/tf-tensorboard.html | 27143 ------------------- tensorflow/tensorboard/gulp_tasks/bower.js | 23 - tensorflow/tensorboard/gulp_tasks/compile.js | 95 - tensorflow/tensorboard/gulp_tasks/test.js | 28 - tensorflow/tensorboard/gulp_tasks/util.js | 39 - tensorflow/tensorboard/gulp_tasks/vulcanize.js | 83 - tensorflow/tensorboard/gulpfile.js | 91 - .../org/tensorflow/tensorboard/vulcanize/BUILD | 1 + tensorflow/tensorboard/lib/BUILD | 22 - tensorflow/tensorboard/lib/css/global.css | 21 - tensorflow/tensorboard/package.json | 39 - tensorflow/tensorboard/tsconfig.json | 16 - tensorflow/tensorboard/wct.conf.json | 7 - tensorflow/tools/pip_package/BUILD | 8 +- tensorflow/tools/pip_package/setup.py | 5 +- tensorflow/workspace.bzl | 24 + 74 files changed, 932 insertions(+), 29762 deletions(-) delete mode 100644 bower.BUILD delete mode 100644 tensorflow/contrib/cmake/external/tensorboard.cmake delete mode 100644 tensorflow/tensorboard/.bowerrc delete mode 100644 tensorflow/tensorboard/.gitignore delete mode 100644 tensorflow/tensorboard/app/BUILD delete mode 100644 tensorflow/tensorboard/app/analytics.js delete mode 100644 tensorflow/tensorboard/bower.json delete mode 100644 tensorflow/tensorboard/bower/BUILD create mode 100644 tensorflow/tensorboard/components/analytics.html delete mode 100644 tensorflow/tensorboard/components/index.html create mode 100644 tensorflow/tensorboard/components/tensorboard.html delete mode 100644 tensorflow/tensorboard/components/tf_imports_google/README.md delete mode 100644 tensorflow/tensorboard/components/tf_imports_google/d3.html delete mode 100644 tensorflow/tensorboard/components/tf_imports_google/dagre.html delete mode 100644 tensorflow/tensorboard/components/tf_imports_google/graphlib.html delete mode 100644 tensorflow/tensorboard/components/tf_imports_google/lodash.html delete mode 100644 tensorflow/tensorboard/components/tf_imports_google/plottable.html delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard_d3v4/dist.html create mode 100644 tensorflow/tensorboard/components/tf_tensorboard_d3v4/style.html create mode 100644 tensorflow/tensorboard/components/vz_heatmap/BUILD create mode 100644 tensorflow/tensorboard/components/vz_heatmap_d3v4/BUILD create mode 100644 tensorflow/tensorboard/components/vz_heatmap_d3v4/demo/index.html create mode 100644 tensorflow/tensorboard/components/vz_heatmap_d3v4/index.html create mode 100644 tensorflow/tensorboard/components/vz_heatmap_d3v4/vz-heatmap.html delete mode 100644 tensorflow/tensorboard/dist/bazel-html-imports.html delete mode 100644 tensorflow/tensorboard/dist/index.html delete mode 100644 tensorflow/tensorboard/dist/tf-tensorboard.html delete mode 100644 tensorflow/tensorboard/gulp_tasks/bower.js delete mode 100644 tensorflow/tensorboard/gulp_tasks/compile.js delete mode 100644 tensorflow/tensorboard/gulp_tasks/test.js delete mode 100644 tensorflow/tensorboard/gulp_tasks/util.js delete mode 100644 tensorflow/tensorboard/gulp_tasks/vulcanize.js delete mode 100644 tensorflow/tensorboard/gulpfile.js delete mode 100644 tensorflow/tensorboard/lib/BUILD delete mode 100644 tensorflow/tensorboard/lib/css/global.css delete mode 100644 tensorflow/tensorboard/package.json delete mode 100644 tensorflow/tensorboard/tsconfig.json delete mode 100644 tensorflow/tensorboard/wct.conf.json diff --git a/WORKSPACE b/WORKSPACE index b2d6fb542b..edf655f6a7 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -20,7 +20,7 @@ load("//tensorflow:workspace.bzl", "tf_workspace") #android_sdk_repository( # name = "androidsdk", # api_level = 23, -# # Ensure that you have the build_tools_version below installed in the +# # Ensure that you have the build_tools_version below installed in the # # SDK manager as it updates periodically. # build_tools_version = "25.0.2", # # Replace with path to Android SDK on your system @@ -31,7 +31,7 @@ load("//tensorflow:workspace.bzl", "tf_workspace") #android_ndk_repository( # name="androidndk", # path="", -# # This needs to be 14 or higher to compile TensorFlow. +# # This needs to be 14 or higher to compile TensorFlow. # # Note that the NDK version is not the API level. # api_level=14) @@ -39,485 +39,31 @@ load("//tensorflow:workspace.bzl", "tf_workspace") tf_workspace() new_http_archive( - name = "inception5h", - build_file = "models.BUILD", - url = "https://storage.googleapis.com/download.tensorflow.org/models/inception5h.zip", - sha256 = "d13569f6a98159de37e92e9c8ec4dae8f674fbf475f69fe6199b514f756d4364" -) - -new_http_archive( - name = "mobile_multibox", - build_file = "models.BUILD", - url = "https://storage.googleapis.com/download.tensorflow.org/models/mobile_multibox_v1a.zip", - sha256 = "859edcddf84dddb974c36c36cfc1f74555148e9c9213dedacf1d6b613ad52b96" -) - -new_http_archive( - name = "stylize", - build_file = "models.BUILD", - url = "https://storage.googleapis.com/download.tensorflow.org/models/stylize_v1.zip", - sha256 = "3d374a730aef330424a356a8d4f04d8a54277c425e274ecb7d9c83aa912c6bfa" -) - -# TENSORBOARD_BOWER_AUTOGENERATED_BELOW_THIS_LINE_DO_NOT_EDIT - -new_http_archive( - name = "d3", - build_file = "bower.BUILD", - url = "https://github.com/mbostock-bower/d3-bower/archive/v3.5.15.tar.gz", - strip_prefix = "d3-bower-3.5.15", -) - -new_http_archive( - name = "dagre", - build_file = "bower.BUILD", - url = "https://github.com/cpettitt/dagre/archive/v0.7.4.tar.gz", - strip_prefix = "dagre-0.7.4", -) - -new_http_archive( - name = "es6_promise", - build_file = "bower.BUILD", - url = "https://github.com/components/es6-promise/archive/v2.1.0.tar.gz", - strip_prefix = "es6-promise-2.1.0", -) - -new_http_archive( - name = "font_roboto", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/font-roboto/archive/v1.0.1.tar.gz", - strip_prefix = "font-roboto-1.0.1", -) - -new_http_archive( - name = "graphlib", - build_file = "bower.BUILD", - url = "https://github.com/cpettitt/graphlib/archive/v1.0.7.tar.gz", - strip_prefix = "graphlib-1.0.7", -) - -new_http_archive( - name = "iron_a11y_announcer", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-a11y-announcer/archive/v1.0.5.tar.gz", - strip_prefix = "iron-a11y-announcer-1.0.5", -) - -new_http_archive( - name = "iron_a11y_keys_behavior", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-a11y-keys-behavior/archive/v1.1.8.tar.gz", - strip_prefix = "iron-a11y-keys-behavior-1.1.8", -) - -new_http_archive( - name = "iron_ajax", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-ajax/archive/v1.2.0.tar.gz", - strip_prefix = "iron-ajax-1.2.0", -) - -new_http_archive( - name = "iron_autogrow_textarea", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-autogrow-textarea/archive/v1.0.12.tar.gz", - strip_prefix = "iron-autogrow-textarea-1.0.12", -) - -new_http_archive( - name = "iron_behaviors", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-behaviors/archive/v1.0.17.tar.gz", - strip_prefix = "iron-behaviors-1.0.17", -) - -new_http_archive( - name = "iron_checked_element_behavior", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-checked-element-behavior/archive/v1.0.4.tar.gz", - strip_prefix = "iron-checked-element-behavior-1.0.4", -) - -new_http_archive( - name = "iron_collapse", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-collapse/archive/v1.0.8.tar.gz", - strip_prefix = "iron-collapse-1.0.8", -) - -new_http_archive( - name = "iron_dropdown", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-dropdown/archive/v1.4.0.tar.gz", - strip_prefix = "iron-dropdown-1.4.0", -) - -new_http_archive( - name = "iron_fit_behavior", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-fit-behavior/archive/v1.2.5.tar.gz", - strip_prefix = "iron-fit-behavior-1.2.5", -) - -new_http_archive( - name = "iron_flex_layout", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-flex-layout/archive/v1.3.0.tar.gz", - strip_prefix = "iron-flex-layout-1.3.0", -) - -new_http_archive( - name = "iron_form_element_behavior", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-form-element-behavior/archive/v1.0.6.tar.gz", - strip_prefix = "iron-form-element-behavior-1.0.6", -) - -new_http_archive( - name = "iron_icon", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-icon/archive/v1.0.11.tar.gz", - strip_prefix = "iron-icon-1.0.11", -) - -new_http_archive( - name = "iron_icons", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-icons/archive/v1.1.3.tar.gz", - strip_prefix = "iron-icons-1.1.3", -) - -new_http_archive( - name = "iron_iconset_svg", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-iconset-svg/archive/v1.1.0.tar.gz", - strip_prefix = "iron-iconset-svg-1.1.0", -) - -new_http_archive( - name = "iron_input", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-input/archive/1.0.10.tar.gz", - strip_prefix = "iron-input-1.0.10", -) - -new_http_archive( - name = "iron_list", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-list/archive/v1.3.9.tar.gz", - strip_prefix = "iron-list-1.3.9", -) - -new_http_archive( - name = "iron_menu_behavior", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-menu-behavior/archive/v1.1.10.tar.gz", - strip_prefix = "iron-menu-behavior-1.1.10", -) - -new_http_archive( - name = "iron_meta", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-meta/archive/v1.1.1.tar.gz", - strip_prefix = "iron-meta-1.1.1", -) - -new_http_archive( - name = "iron_overlay_behavior", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-overlay-behavior/archive/v1.10.1.tar.gz", - strip_prefix = "iron-overlay-behavior-1.10.1", -) - -new_http_archive( - name = "iron_range_behavior", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-range-behavior/archive/v1.0.4.tar.gz", - strip_prefix = "iron-range-behavior-1.0.4", -) - -new_http_archive( - name = "iron_resizable_behavior", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-resizable-behavior/archive/v1.0.3.tar.gz", - strip_prefix = "iron-resizable-behavior-1.0.3", -) - -new_http_archive( - name = "iron_scroll_target_behavior", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-scroll-target-behavior/archive/v1.0.3.tar.gz", - strip_prefix = "iron-scroll-target-behavior-1.0.3", -) - -new_http_archive( - name = "iron_selector", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-selector/archive/v1.5.2.tar.gz", - strip_prefix = "iron-selector-1.5.2", -) - -new_http_archive( - name = "iron_validatable_behavior", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/iron-validatable-behavior/archive/v1.1.1.tar.gz", - strip_prefix = "iron-validatable-behavior-1.1.1", -) - -new_http_archive( - name = "lodash", - build_file = "bower.BUILD", - url = "https://github.com/lodash/lodash/archive/3.8.0.tar.gz", - strip_prefix = "lodash-3.8.0", -) - -new_http_archive( - name = "neon_animation", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/neon-animation/archive/v1.2.2.tar.gz", - strip_prefix = "neon-animation-1.2.2", -) - -http_file( - name = "numericjs_numeric_min_js", - url = "https://cdnjs.cloudflare.com/ajax/libs/numeric/1.2.6/numeric.min.js", -) - -new_http_archive( - name = "paper_behaviors", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-behaviors/archive/v1.0.12.tar.gz", - strip_prefix = "paper-behaviors-1.0.12", -) - -new_http_archive( - name = "paper_button", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-button/archive/v1.0.11.tar.gz", - strip_prefix = "paper-button-1.0.11", -) - -new_http_archive( - name = "paper_checkbox", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-checkbox/archive/v1.4.0.tar.gz", - strip_prefix = "paper-checkbox-1.4.0", -) - -new_http_archive( - name = "paper_dialog", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-dialog/archive/v1.0.4.tar.gz", - strip_prefix = "paper-dialog-1.0.4", -) - -new_http_archive( - name = "paper_dialog_behavior", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-dialog-behavior/archive/v1.2.5.tar.gz", - strip_prefix = "paper-dialog-behavior-1.2.5", -) - -new_http_archive( - name = "paper_dialog_scrollable", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-dialog-scrollable/archive/1.1.5.tar.gz", - strip_prefix = "paper-dialog-scrollable-1.1.5", -) - -new_http_archive( - name = "paper_dropdown_menu", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-dropdown-menu/archive/v1.4.0.tar.gz", - strip_prefix = "paper-dropdown-menu-1.4.0", -) - -new_http_archive( - name = "paper_header_panel", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-header-panel/archive/v1.1.4.tar.gz", - strip_prefix = "paper-header-panel-1.1.4", -) - -new_http_archive( - name = "paper_icon_button", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-icon-button/archive/v1.1.3.tar.gz", - strip_prefix = "paper-icon-button-1.1.3", -) - -new_http_archive( - name = "paper_input", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-input/archive/v1.1.18.tar.gz", - strip_prefix = "paper-input-1.1.18", -) - -new_http_archive( - name = "paper_item", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-item/archive/v1.1.4.tar.gz", - strip_prefix = "paper-item-1.1.4", -) - -new_http_archive( - name = "paper_listbox", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-listbox/archive/v1.1.2.tar.gz", - strip_prefix = "paper-listbox-1.1.2", -) - -new_http_archive( - name = "paper_material", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-material/archive/v1.0.6.tar.gz", - strip_prefix = "paper-material-1.0.6", -) - -new_http_archive( - name = "paper_menu", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-menu/archive/v1.2.2.tar.gz", - strip_prefix = "paper-menu-1.2.2", -) - -new_http_archive( - name = "paper_menu_button", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-menu-button/archive/v1.5.1.tar.gz", - strip_prefix = "paper-menu-button-1.5.1", -) - -new_http_archive( - name = "paper_progress", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-progress/archive/v1.0.9.tar.gz", - strip_prefix = "paper-progress-1.0.9", -) - -new_http_archive( - name = "paper_radio_button", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-radio-button/archive/v1.1.2.tar.gz", - strip_prefix = "paper-radio-button-1.1.2", -) - -new_http_archive( - name = "paper_radio_group", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-radio-group/archive/v1.0.9.tar.gz", - strip_prefix = "paper-radio-group-1.0.9", -) - -new_http_archive( - name = "paper_ripple", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-ripple/archive/v1.0.5.tar.gz", - strip_prefix = "paper-ripple-1.0.5", -) - -new_http_archive( - name = "paper_slider", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-slider/archive/v1.0.10.tar.gz", - strip_prefix = "paper-slider-1.0.10", -) - -new_http_archive( - name = "paper_spinner", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-spinner/archive/v1.1.1.tar.gz", - strip_prefix = "paper-spinner-1.1.1", -) - -new_http_archive( - name = "paper_styles", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-styles/archive/v1.1.4.tar.gz", - strip_prefix = "paper-styles-1.1.4", -) - -new_http_archive( - name = "paper_tabs", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-tabs/archive/v1.7.0.tar.gz", - strip_prefix = "paper-tabs-1.7.0", -) - -new_http_archive( - name = "paper_toast", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-toast/archive/v1.3.0.tar.gz", - strip_prefix = "paper-toast-1.3.0", -) - -new_http_archive( - name = "paper_toggle_button", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-toggle-button/archive/v1.2.0.tar.gz", - strip_prefix = "paper-toggle-button-1.2.0", -) - -new_http_archive( - name = "paper_toolbar", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-toolbar/archive/v1.1.4.tar.gz", - strip_prefix = "paper-toolbar-1.1.4", -) - -new_http_archive( - name = "paper_tooltip", - build_file = "bower.BUILD", - url = "https://github.com/polymerelements/paper-tooltip/archive/v1.1.2.tar.gz", - strip_prefix = "paper-tooltip-1.1.2", -) - -new_http_archive( - name = "plottable", - build_file = "bower.BUILD", - url = "https://github.com/palantir/plottable/archive/v1.16.1.tar.gz", - strip_prefix = "plottable-1.16.1", -) - -new_http_archive( - name = "polymer", - build_file = "bower.BUILD", - url = "https://github.com/polymer/polymer/archive/v1.7.0.tar.gz", - strip_prefix = "polymer-1.7.0", -) - -new_http_archive( - name = "promise_polyfill", - build_file = "bower.BUILD", - url = "https://github.com/polymerlabs/promise-polyfill/archive/v1.0.0.tar.gz", - strip_prefix = "promise-polyfill-1.0.0", -) - -http_file( - name = "three_js_three_min_js", - url = "https://raw.githubusercontent.com/mrdoob/three.js/r77/build/three.min.js", -) - -http_file( - name = "three_js_orbitcontrols_js", - url = "https://raw.githubusercontent.com/mrdoob/three.js/r77/examples/js/controls/OrbitControls.js", + name = "inception5h", + build_file = "models.BUILD", + sha256 = "d13569f6a98159de37e92e9c8ec4dae8f674fbf475f69fe6199b514f756d4364", + urls = [ + "http://storage.googleapis.com/download.tensorflow.org/models/inception5h.zip", + "http://download.tensorflow.org/models/inception5h.zip", + ], ) new_http_archive( - name = "web_animations_js", - build_file = "bower.BUILD", - url = "https://github.com/web-animations/web-animations-js/archive/2.2.1.tar.gz", - strip_prefix = "web-animations-js-2.2.1", + name = "mobile_multibox", + build_file = "models.BUILD", + sha256 = "859edcddf84dddb974c36c36cfc1f74555148e9c9213dedacf1d6b613ad52b96", + urls = [ + "http://storage.googleapis.com/download.tensorflow.org/models/mobile_multibox_v1a.zip", + "http://download.tensorflow.org/models/mobile_multibox_v1a.zip", + ], ) new_http_archive( - name = "webcomponentsjs", - build_file = "bower.BUILD", - url = "https://github.com/webcomponents/webcomponentsjs/archive/v0.7.22.tar.gz", - strip_prefix = "webcomponentsjs-0.7.22", -) - -http_file( - name = "weblas_weblas_js", - url = "https://raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js", + name = "stylize", + build_file = "models.BUILD", + sha256 = "3d374a730aef330424a356a8d4f04d8a54277c425e274ecb7d9c83aa912c6bfa", + urls = [ + "http://storage.googleapis.com/download.tensorflow.org/models/stylize_v1.zip", + "http://download.tensorflow.org/models/stylize_v1.zip", + ], ) diff --git a/bower.BUILD b/bower.BUILD deleted file mode 100644 index eabd1d6450..0000000000 --- a/bower.BUILD +++ /dev/null @@ -1,645 +0,0 @@ -# AUTOGENERATED FILE by tensorboard_bower_dependency_sync.py - -package(default_visibility = ["//visibility:public"]) - -filegroup( - name = "d3", - srcs = [ - "d3.js", - "d3.min.js", - "package.js", - ], -) - -filegroup( - name = "dagre", - srcs = [ - "dist/dagre.core.js", - "dist/dagre.core.min.js", - ], -) - -filegroup( - name = "es6_promise", - srcs = [ - "promise.js", - "promise.min.js", - ], -) - -filegroup( - name = "font_roboto", - srcs = ["roboto.html"], -) - -filegroup( - name = "graphlib", - srcs = [ - "dist/graphlib.core.js", - "dist/graphlib.core.min.js", - ], -) - -filegroup( - name = "iron_a11y_announcer", - srcs = [ - "index.html", - "iron-a11y-announcer.html", - ], -) - -filegroup( - name = "iron_a11y_keys_behavior", - srcs = [ - "index.html", - "iron-a11y-keys-behavior.html", - ], -) - -filegroup( - name = "iron_ajax", - srcs = [ - "index.html", - "iron-ajax.html", - "iron-request.html", - ], -) - -filegroup( - name = "iron_autogrow_textarea", - srcs = [ - "index.html", - "iron-autogrow-textarea.html", - ], -) - -filegroup( - name = "iron_behaviors", - srcs = [ - "index.html", - "iron-button-state.html", - "iron-control-state.html", - ], -) - -filegroup( - name = "iron_checked_element_behavior", - srcs = [ - "index.html", - "iron-checked-element-behavior.html", - ], -) - -filegroup( - name = "iron_collapse", - srcs = [ - "index.html", - "iron-collapse.html", - ], -) - -filegroup( - name = "iron_dropdown", - srcs = [ - "index.html", - "iron-dropdown.html", - "iron-dropdown-scroll-manager.html", - ], -) - -filegroup( - name = "iron_fit_behavior", - srcs = [ - "index.html", - "iron-fit-behavior.html", - ], -) - -filegroup( - name = "iron_flex_layout", - srcs = [ - "classes/iron-flex-layout.html", - "classes/iron-shadow-flex-layout.html", - "index.html", - "iron-flex-layout.html", - "iron-flex-layout-classes.html", - ], -) - -filegroup( - name = "iron_form_element_behavior", - srcs = [ - "index.html", - "iron-form-element-behavior.html", - ], -) - -filegroup( - name = "iron_icon", - srcs = [ - "index.html", - "iron-icon.html", - ], -) - -filegroup( - name = "iron_icons", - srcs = [ - "av-icons.html", - "communication-icons.html", - "device-icons.html", - "editor-icons.html", - "hardware-icons.html", - "image-icons.html", - "index.html", - "iron-icons.html", - "maps-icons.html", - "notification-icons.html", - "places-icons.html", - "social-icons.html", - ], -) - -filegroup( - name = "iron_iconset_svg", - srcs = [ - "index.html", - "iron-iconset-svg.html", - ], -) - -filegroup( - name = "iron_input", - srcs = [ - "index.html", - "iron-input.html", - ], -) - -filegroup( - name = "iron_list", - srcs = [ - "index.html", - "iron-list.html", - "test/smoke/avg-worst-case.html", - "test/smoke/dummy-data.html", - "test/smoke/index.html", - "test/smoke/physical-count.html", - ], -) - -filegroup( - name = "iron_menu_behavior", - srcs = [ - "index.html", - "iron-menu-behavior.html", - "iron-menubar-behavior.html", - ], -) - -filegroup( - name = "iron_meta", - srcs = [ - "index.html", - "iron-meta.html", - ], -) - -filegroup( - name = "iron_overlay_behavior", - srcs = [ - "index.html", - "iron-focusables-helper.html", - "iron-overlay-backdrop.html", - "iron-overlay-behavior.html", - "iron-overlay-manager.html", - ], -) - -filegroup( - name = "iron_range_behavior", - srcs = [ - "index.html", - "iron-range-behavior.html", - ], -) - -filegroup( - name = "iron_resizable_behavior", - srcs = [ - "demo/src/x-app.html", - "index.html", - "iron-resizable-behavior.html", - ], -) - -filegroup( - name = "iron_scroll_target_behavior", - srcs = [ - "index.html", - "iron-scroll-target-behavior.html", - ], -) - -filegroup( - name = "iron_selector", - srcs = [ - "index.html", - "iron-multi-selectable.html", - "iron-selectable.html", - "iron-selection.html", - "iron-selector.html", - ], -) - -filegroup( - name = "iron_validatable_behavior", - srcs = [ - "index.html", - "iron-validatable-behavior.html", - ], -) - -filegroup( - name = "lodash", - srcs = [ - "lodash.js", - "lodash.min.js", - ], -) - -filegroup( - name = "neon_animation", - srcs = [ - "animations/cascaded-animation.html", - "animations/fade-in-animation.html", - "animations/fade-out-animation.html", - "animations/hero-animation.html", - "animations/opaque-animation.html", - "animations/reverse-ripple-animation.html", - "animations/ripple-animation.html", - "animations/scale-down-animation.html", - "animations/scale-up-animation.html", - "animations/slide-down-animation.html", - "animations/slide-from-bottom-animation.html", - "animations/slide-from-left-animation.html", - "animations/slide-from-right-animation.html", - "animations/slide-from-top-animation.html", - "animations/slide-left-animation.html", - "animations/slide-right-animation.html", - "animations/slide-up-animation.html", - "animations/transform-animation.html", - "demo/card/index.html", - "demo/card/x-card.html", - "demo/card/x-cards-list.html", - "demo/declarative/index.html", - "demo/doc/index.html", - "demo/doc/my-animatable.html", - "demo/doc/my-dialog.html", - "demo/dropdown/animated-dropdown.html", - "demo/dropdown/index.html", - "demo/grid/animated-grid.html", - "demo/grid/fullsize-page-with-card.html", - "demo/grid/index.html", - "demo/list/full-view.html", - "demo/list/index.html", - "demo/list/list-demo.html", - "demo/list/list-view.html", - "demo/load/animated-grid.html", - "demo/load/full-page.html", - "demo/load/index.html", - "demo/reprojection/animated-grid.html", - "demo/reprojection/fullsize-page-with-card.html", - "demo/reprojection/index.html", - "demo/reprojection/reprojected-pages.html", - "demo/tiles/circles-page.html", - "demo/tiles/index.html", - "demo/tiles/squares-page.html", - "index.html", - "neon-animatable.html", - "neon-animatable-behavior.html", - "neon-animated-pages.html", - "neon-animation.html", - "neon-animation-behavior.html", - "neon-animation-runner-behavior.html", - "neon-animations.html", - "neon-shared-element-animatable-behavior.html", - "neon-shared-element-animation-behavior.html", - "web-animations.html", - ], -) - -filegroup( - name = "paper_behaviors", - srcs = [ - "index.html", - "paper-button-behavior.html", - "paper-checked-element-behavior.html", - "paper-inky-focus-behavior.html", - "paper-ripple-behavior.html", - ], -) - -filegroup( - name = "paper_button", - srcs = [ - "index.html", - "paper-button.html", - ], -) - -filegroup( - name = "paper_checkbox", - srcs = [ - "index.html", - "paper-checkbox.html", - ], -) - -filegroup( - name = "paper_dialog", - srcs = [ - "index.html", - "paper-dialog.html", - ], -) - -filegroup( - name = "paper_dialog_behavior", - srcs = [ - "index.html", - "paper-dialog-behavior.html", - "paper-dialog-common.css", - "paper-dialog-shared-styles.html", - ], -) - -filegroup( - name = "paper_dialog_scrollable", - srcs = [ - "index.html", - "paper-dialog-scrollable.html", - ], -) - -filegroup( - name = "paper_dropdown_menu", - srcs = [ - "index.html", - "paper-dropdown-menu.html", - "paper-dropdown-menu-icons.html", - "paper-dropdown-menu-light.html", - "paper-dropdown-menu-shared-styles.html", - ], -) - -filegroup( - name = "paper_header_panel", - srcs = [ - "index.html", - "paper-header-panel.html", - ], -) - -filegroup( - name = "paper_icon_button", - srcs = [ - "index.html", - "paper-icon-button.html", - "paper-icon-button-light.html", - ], -) - -filegroup( - name = "paper_input", - srcs = [ - "all-imports.html", - "index.html", - "paper-input.html", - "paper-input-addon-behavior.html", - "paper-input-behavior.html", - "paper-input-char-counter.html", - "paper-input-container.html", - "paper-input-error.html", - "paper-textarea.html", - ], -) - -filegroup( - name = "paper_item", - srcs = [ - "all-imports.html", - "index.html", - "paper-icon-item.html", - "paper-item.html", - "paper-item-behavior.html", - "paper-item-body.html", - "paper-item-shared-styles.html", - ], -) - -filegroup( - name = "paper_listbox", - srcs = [ - "index.html", - "paper-listbox.html", - ], -) - -filegroup( - name = "paper_material", - srcs = [ - "index.html", - "paper-material.html", - "paper-material-shared-styles.html", - ], -) - -filegroup( - name = "paper_menu", - srcs = [ - "index.html", - "paper-menu.html", - "paper-menu-shared-styles.html", - "paper-submenu.html", - ], -) - -filegroup( - name = "paper_menu_button", - srcs = [ - "index.html", - "paper-menu-button.html", - "paper-menu-button-animations.html", - ], -) - -filegroup( - name = "paper_progress", - srcs = [ - "index.html", - "paper-progress.html", - ], -) - -filegroup( - name = "paper_radio_button", - srcs = [ - "index.html", - "paper-radio-button.html", - ], -) - -filegroup( - name = "paper_radio_group", - srcs = [ - "index.html", - "paper-radio-group.html", - ], -) - -filegroup( - name = "paper_ripple", - srcs = [ - "index.html", - "paper-ripple.html", - ], -) - -filegroup( - name = "paper_slider", - srcs = [ - "index.html", - "paper-slider.html", - ], -) - -filegroup( - name = "paper_spinner", - srcs = [ - "index.html", - "paper-spinner.html", - "paper-spinner-behavior.html", - "paper-spinner-lite.html", - "paper-spinner-styles.html", - ], -) - -filegroup( - name = "paper_styles", - srcs = [ - "classes/global.html", - "classes/shadow.html", - "classes/shadow-layout.html", - "classes/typography.html", - "color.html", - "default-theme.html", - "demo.css", - "demo-pages.html", - "index.html", - "paper-styles.html", - "paper-styles-classes.html", - "shadow.html", - "typography.html", - ], -) - -filegroup( - name = "paper_tabs", - srcs = [ - "index.html", - "paper-tab.html", - "paper-tabs.html", - "paper-tabs-icons.html", - ], -) - -filegroup( - name = "paper_toast", - srcs = [ - "index.html", - "paper-toast.html", - ], -) - -filegroup( - name = "paper_toggle_button", - srcs = [ - "index.html", - "paper-toggle-button.html", - ], -) - -filegroup( - name = "paper_toolbar", - srcs = [ - "index.html", - "paper-toolbar.html", - ], -) - -filegroup( - name = "paper_tooltip", - srcs = [ - "index.html", - "paper-tooltip.html", - ], -) - -filegroup( - name = "plottable", - srcs = [ - "plottable.css", - "plottable.js", - "plottable.min.js", - ], -) - -filegroup( - name = "polymer", - srcs = [ - "polymer.html", - "polymer-micro.html", - "polymer-mini.html", - ], -) - -filegroup( - name = "promise_polyfill", - srcs = [ - "Gruntfile.js", - "Promise.js", - "Promise.min.js", - "Promise-Statics.js", - "promise-polyfill.html", - "promise-polyfill-lite.html", - ], -) - -filegroup( - name = "web_animations_js", - srcs = [ - "web-animations.html", - "web-animations.min.js", - "web-animations-next.min.js", - "web-animations-next-lite.min.js", - ], -) - -filegroup( - name = "webcomponentsjs", - srcs = [ - "CustomElements.js", - "CustomElements.min.js", - "HTMLImports.js", - "HTMLImports.min.js", - "MutationObserver.js", - "MutationObserver.min.js", - "ShadowDOM.js", - "ShadowDOM.min.js", - "webcomponents.js", - "webcomponents.min.js", - "webcomponents-lite.js", - "webcomponents-lite.min.js", - ], -) diff --git a/tensorflow/BUILD b/tensorflow/BUILD index 8f67ae25df..acd5c108f9 100644 --- a/tensorflow/BUILD +++ b/tensorflow/BUILD @@ -321,7 +321,6 @@ filegroup( "//tensorflow/python/saved_model:all_files", "//tensorflow/python/tools:all_files", "//tensorflow/tensorboard:all_files", - "//tensorflow/tensorboard/app:all_files", "//tensorflow/tensorboard/backend:all_files", "//tensorflow/tensorboard/backend/event_processing:all_files", "//tensorflow/tensorboard/components:all_files", @@ -404,6 +403,8 @@ filegroup( "//tensorflow/tensorboard/components/vz_distribution_chart:all_files", "//tensorflow/tensorboard/components/vz_distribution_chart/demo:all_files", "//tensorflow/tensorboard/components/vz_distribution_chart_d3v4:all_files", + "//tensorflow/tensorboard/components/vz_heatmap:all_files", + "//tensorflow/tensorboard/components/vz_heatmap_d3v4:all_files", "//tensorflow/tensorboard/components/vz_histogram_timeseries:all_files", "//tensorflow/tensorboard/components/vz_histogram_timeseries/demo:all_files", "//tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4:all_files", @@ -419,7 +420,6 @@ filegroup( "//tensorflow/tensorboard/components/vz_sorting_d3v4/test:all_files", "//tensorflow/tensorboard/demo:all_files", "//tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize:all_files", - "//tensorflow/tensorboard/lib:all_files", "//tensorflow/tensorboard/plugins:all_files", "//tensorflow/tensorboard/plugins/projector:all_files", "//tensorflow/tensorboard/plugins/text:all_files", diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt index 83b405fd4e..62afa9481b 100644 --- a/tensorflow/contrib/cmake/CMakeLists.txt +++ b/tensorflow/contrib/cmake/CMakeLists.txt @@ -261,7 +261,6 @@ if(tensorflow_BUILD_CC_EXAMPLE) endif() include(tf_tools.cmake) if(tensorflow_BUILD_PYTHON_BINDINGS) - include(tensorboard) include(tf_python.cmake) endif() if(tensorflow_BUILD_SHARED_LIB) diff --git a/tensorflow/contrib/cmake/external/tensorboard.cmake b/tensorflow/contrib/cmake/external/tensorboard.cmake deleted file mode 100644 index 457868c72b..0000000000 --- a/tensorflow/contrib/cmake/external/tensorboard.cmake +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 2017 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================== -include (ExternalProject) - -set(tensorboard_dependencies) -add_custom_target(tensorboard_copy_dependencies) - -function(tb_new_http_archive) - cmake_parse_arguments(_TB "" "NAME;URL" "FILES" ${ARGN}) - ExternalProject_Add(${_TB_NAME} - PREFIX ${_TB_NAME} - URL ${_TB_URL} - DOWNLOAD_DIR "${DOWNLOAD_LOCATION}/${_TB_NAME}" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - ) - - set(src_dir "${CMAKE_CURRENT_BINARY_DIR}/${_TB_NAME}/src/${_TB_NAME}") - set(dst_dir "${CMAKE_CURRENT_BINARY_DIR}/tensorboard_external/${_TB_NAME}") - - foreach(src_file ${_TB_FILES}) - add_custom_command( - TARGET tensorboard_copy_dependencies PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src_dir}/${src_file} ${dst_dir}/${src_file} - ) - endforeach() - - set(tensorboard_dependencies ${tensorboard_dependencies} ${_TB_NAME} PARENT_SCOPE) -endfunction() - -function(tb_http_file) - cmake_parse_arguments(_TB "" "NAME;URL" "" ${ARGN}) - get_filename_component(src_file ${_TB_URL} NAME) - file(DOWNLOAD ${_TB_URL} "${DOWNLOAD_LOCATION}/${_TB_NAME}/${src_file}") - - set(src_dir "${DOWNLOAD_LOCATION}/${_TB_NAME}") - set(dst_dir "${CMAKE_CURRENT_BINARY_DIR}/tensorboard_external/${_TB_NAME}/file") - - add_custom_command( - TARGET tensorboard_copy_dependencies PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src_dir}/${src_file} ${dst_dir}/${src_file} - ) - - add_custom_target(${_TB_NAME} DEPENDS ${src_dir}/${src_file}) - set(tensorboard_dependencies ${tensorboard_dependencies} ${_TB_NAME} PARENT_SCOPE) -endfunction() - -# Parse TensorBoard dependency names and URLs from Bazel's WORKSPACE file. -set(tb_dep_names) -file(STRINGS ${PROJECT_SOURCE_DIR}/../../../WORKSPACE workspace_contents) -foreach(line ${workspace_contents}) - if(line MATCHES "# TENSORBOARD_BOWER_AUTOGENERATED_BELOW_THIS_LINE_DO_NOT_EDIT") - set(tb_deps_started 1) - endif() - - if(NOT tb_deps_started) - continue() - endif() - - if(line MATCHES "new_http_archive\\(") - set(tb_dep_is_archive 1) - continue() - elseif(line MATCHES "http_file\\(") - set(tb_dep_is_archive 0) - continue() - endif() - - string(REGEX MATCH "name.*=.*\"(.*)\"" has_name ${line}) - if(has_name) - set(tb_dep_name ${CMAKE_MATCH_1}) - continue() - endif() - - string(REGEX MATCH "url.*=.*\"(.*)\"" has_url ${line}) - if(has_url) - list(APPEND tb_dep_names ${tb_dep_name}) - set(${tb_dep_name}_is_archive ${tb_dep_is_archive}) - set(${tb_dep_name}_url ${CMAKE_MATCH_1}) - endif() -endforeach() - -# Parse the files needed for each TensorBoard dependency from Bazel's bower.BUILD file. -# Due to CMAKE quirkiness, cannot use file(strings) with files that contain '[' and ']'. -file(READ ${PROJECT_SOURCE_DIR}/../../../bower.BUILD bower_build_contents) -string(REPLACE "\[" "OB" bower_build_contents "${bower_build_contents}") -string(REPLACE "\]" "CB" bower_build_contents "${bower_build_contents}") -string(REPLACE ";" "\\\\;" bower_build_contents "${bower_build_contents}") -string(REPLACE "\n" "E;" bower_build_contents "${bower_build_contents}") -foreach(line ${bower_build_contents}) - string(REGEX MATCH "name.*=.*\"(.*)\"" has_name ${line}) - if(has_name) - set(tb_dep_name ${CMAKE_MATCH_1}) - set(${tb_dep_name}_files) - continue() - endif() - - string(REGEX MATCH "srcs.*=.*\"(.*)\"CB" has_single_line_src ${line}) - if(has_single_line_src) - list(APPEND ${tb_dep_name}_files ${CMAKE_MATCH_1}) - continue() - endif() - - if(line MATCHES "srcs.*=.*OB") - set(inside_files_def 1) - continue() - elseif(line MATCHES "CB,") - set(inside_files_def 0) - continue() - endif() - - if(inside_files_def) - string(REGEX MATCH "\"(.*)\"," has_file ${line}) - if(has_file) - list(APPEND ${tb_dep_name}_files ${CMAKE_MATCH_1}) - endif() - endif() -endforeach() - -# Generate a target for each dependency. -foreach(tb_dep_name ${tb_dep_names}) - if (${tb_dep_name}_is_archive) - tb_new_http_archive( - NAME ${tb_dep_name} - URL ${${tb_dep_name}_url} - FILES ${${tb_dep_name}_files} - ) - else() - tb_http_file( - NAME ${tb_dep_name} - URL ${${tb_dep_name}_url} - ) - endif() -endforeach() - -add_dependencies(tensorboard_copy_dependencies ${tensorboard_dependencies}) diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake index b660508b8b..793f7b22f1 100755 --- a/tensorflow/contrib/cmake/tf_python.cmake +++ b/tensorflow/contrib/cmake/tf_python.cmake @@ -514,13 +514,6 @@ add_python_module("tensorflow/contrib/training/python/training") add_python_module("tensorflow/contrib/util") -# Additional directories with no Python sources. -add_custom_command(TARGET tf_python_touchup_modules PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/dist") -add_custom_command(TARGET tf_python_touchup_modules PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/lib/css") - - ######################################################## # tf_python_op_gen_main library ######################################################## @@ -859,7 +852,6 @@ endif(WIN32) add_custom_target(tf_python_build_pip_package) add_dependencies(tf_python_build_pip_package pywrap_tensorflow_internal - tensorboard_copy_dependencies tf_python_copy_scripts_to_destination tf_python_touchup_modules tf_python_ops @@ -886,24 +878,9 @@ add_custom_command(TARGET tf_python_build_pip_package POST_BUILD ${CMAKE_CURRENT_BINARY_DIR}/tf_python/) # Copy resources for TensorBoard. -add_custom_command(TARGET tf_python_build_pip_package POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tensorboard/dist/bazel-html-imports.html - ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/dist/) -add_custom_command(TARGET tf_python_build_pip_package POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tensorboard/dist/index.html - ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/dist/) -add_custom_command(TARGET tf_python_build_pip_package POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tensorboard/dist/tf-tensorboard.html - ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/dist/) -add_custom_command(TARGET tf_python_build_pip_package POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tensorboard/lib/css/global.css - ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/lib/css/) add_custom_command(TARGET tf_python_build_pip_package POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tensorboard/TAG - ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/) -add_custom_command(TARGET tf_python_build_pip_package POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/tensorboard_external - ${CMAKE_CURRENT_BINARY_DIR}/tf_python/external) + ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/) # Copy datasets for tf.contrib.learn. add_custom_command(TARGET tf_python_build_pip_package POST_BUILD diff --git a/tensorflow/tensorboard/.bowerrc b/tensorflow/tensorboard/.bowerrc deleted file mode 100644 index 333544ec7a..0000000000 --- a/tensorflow/tensorboard/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory" : "components" -} \ No newline at end of file diff --git a/tensorflow/tensorboard/.gitignore b/tensorflow/tensorboard/.gitignore deleted file mode 100644 index 98b9642545..0000000000 --- a/tensorflow/tensorboard/.gitignore +++ /dev/null @@ -1,27 +0,0 @@ -node_modules/* -typings/* -build/* -dist/tf-tensorboard-demo.html - -# Since bower components are stored in the same directory as -# tensorboard components, we ignore everything under components -# except our own components which start with tf-. -components/* -# This rule should always be in sync with TF_COMPONENTS_TYPESCRIPT_GLOB -# in gulpfile.js -!components/tf-* -!components/tf_* -!components/vz-* -!components/vz_* -!components/index.html -!components/BUILD -# Ignore the sample graph files since they are too large to -# be in the repo. -components/tf-graph/demo/tf_model_zoo/* - -# All standalone code for TensorBoard components should be written in -# typescript, and the compiled javascript code should be ignored. -components/tf-*/**/*.js -components/tf_*/**/*.js -components/vz-*/**/*.js -components/vz_*/**/*.js diff --git a/tensorflow/tensorboard/BUILD b/tensorflow/tensorboard/BUILD index 9772538524..11715319a0 100644 --- a/tensorflow/tensorboard/BUILD +++ b/tensorflow/tensorboard/BUILD @@ -1,39 +1,14 @@ # Description: # TensorBoard, a dashboard for investigating TensorFlow -package( - default_visibility = ["//tensorflow:internal"], - features = [ - "-layering_check", - "-parse_headers", - ], -) +package(default_visibility = ["//tensorflow:internal"]) licenses(["notice"]) # Apache 2.0 -exports_files(["LICENSE"]) - -load("//tensorflow:tensorflow.bzl", "py_test") - -filegroup( - name = "frontend", - srcs = [ - "TAG", - "dist/bazel-html-imports.html", - "dist/index.html", - "dist/tf-tensorboard.html", - "//tensorflow/tensorboard/bower", - "//tensorflow/tensorboard/lib:all_files", - ], -) - py_binary( name = "tensorboard", - srcs = [ - "__main__.py", - "tensorboard.py", - ], - data = [":frontend"], + srcs = ["tensorboard.py"], + data = [":assets"], srcs_version = "PY2AND3", deps = [ "//tensorflow/python:platform", @@ -45,16 +20,23 @@ py_binary( ], ) +filegroup( + name = "assets", + srcs = [ + "TAG", + "//tensorflow/tensorboard/components:index.html", + ], +) + filegroup( name = "all_files", srcs = glob( - ["**/*"], + ["**"], exclude = [ - "**/METADATA", - "**/OWNERS", - "**/node_modules/**", - "**/typings/**", + "METADATA", + "OWNERS", + "tensorboard.google.bzl", ], ), - visibility = ["//tensorflow:__subpackages__"], + tags = ["notsan"], ) diff --git a/tensorflow/tensorboard/DEVELOPMENT.md b/tensorflow/tensorboard/DEVELOPMENT.md index 3ff2c87dab..8e86bf04db 100644 --- a/tensorflow/tensorboard/DEVELOPMENT.md +++ b/tensorflow/tensorboard/DEVELOPMENT.md @@ -2,125 +2,24 @@ ## Launching a Development Instance -The first step is getting a TensorBoard development environment set up. You -should start by making sure you have [nodejs](https://nodejs.org/en/) and -[npm](https://www.npmjs.com/). On Ubuntu, `sudo apt-get install -y nodejs -nodejs-legacy npm`. Ensure your npm version is >=3.0 by running -'npm --version'. If the version is <3.0, run 'sudo npm install npm -g' to -update to the latest version. You may need to open a new terminal window after -updating in order to make use of the newly-installed version. +Run the following to launch a demo of TensorBoard in raw sources mode: -Next, you'll want to install [gulp](http://gulpjs.com/) and -[bower](http://bower.io/), which are used for build tooling and dependency -management respectively. Both must be installed globally: `sudo npm install -g -gulp bower` will do that. +```sh +bazel run third_party/tensorflow/tensorboard/components/tf_tensorboard_d3v4:demo +``` -Then, cd into the TensorBoard directory: - -`cd tensorflow/tensorboard` - -and install dependencies: - -`npm run prep` - -Then, run gulp: `gulp` - -(Don't worry if there are some linter errors.) - -Now you can navigate to -[http://localhost:8000/demo/index.html](http://localhost:8000/demo/index.html) -and play with the demo TensorBoard instance. If you make changes to the source -code, `gulp` should detect it, recompile (if Typescript), and reload your -browser. +Now you can navigate to and play with +the demo TensorBoard instance. This will have live source reloading. This demo TensorBoard will have a small amount of demo data generated by [generate_testdata.py](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/scripts/generate_testdata.py). You can use [serialize_tensorboard.py](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/scripts/serialize_tensorboard.py) to create a realistic demo directory from your own data files. -## Launching TensorBoard with modified source - -If you are developing in open source, and have made some changes to TensorBoard -that you'd like to try out on real data, then you need to regenerate -`dist/tf-tensorboard.html`. - -Run `gulp regenerate`. That will recompile all of the TensorBoard assets, and -produce a new tf-tensorboard.html with your changes. - -Now, you can use `bazel` to launch TensorBoard: - -`bazel run //tensorflow/tensorboard:tensorboard -- --logdir=/path/to/logs`. - -## Updating the vulcanized HTML file (for linux) - -The vulcanized HTML file `dist/tf-tensorboard.html.OPENSOURCE` is the version of -Tensorboard started up by users who install TensorFlow via pip. Today, updating -that file involves using gulp. Future efforts will streamline this process. - -First, `cd` into the `tensorflow/tensorboard` directory within a git repository -(a piper client will not work). Run `npm run prepare`. - -Next, we build some third party JS dependencies via webfiles targets. Run - - bazel build \ - tensorflow/tensorboard/components/tf_imports:d3 \ - tensorflow/tensorboard/components/tf_imports:lodash \ - tensorflow/tensorboard/components/tf_imports:graphlib \ - tensorflow/tensorboard/components/tf_imports:dagre \ - tensorflow/tensorboard/components/tf_imports:plottable - -Users internal to Google should use the internal build tool instead. Move the -output JS binaries into the tf_imports directory. - -Run `gulp vulcanize`. If compilation errors arise (such as those related to -TypeScript), fix them and re-run. This step should update the contents of -`dist/tf-tensorboard.html.OPENSOURCE`. - -Next, we perform some manual find-and-replaces on script `src` paths within -`dist/tf-tensorboard.html.OPENSOURCE`. Manually replace: - -* `` with `` -* `` with `` -* `` with `` -* `` with `` -* `` with `` - -Also, remove duplicate instances of script includes. Each of those scripts -should only be included once (the first time) within the vulcanized output. - -### Try out the vulcanized Tensorboard HTML output - -To test the vulcanized output, prepare a pip package within a virtualized -environment, and run `tensorboard` after activating the environment. - -To do that, we first create and activate a virtual environment called say -`tf_foo` (Pick your own name.). - - virtualenv --system-site-packages ~/tf_foo - source ~/tf_foo/bin/activate - -Make sure that you have installed `pip` and `virtualenv` beforehand. If not, run - - sudo easy_install pip - sudo pip install --upgrade virtualenv - -Next, we run this command from the `tensorflow directory`. - - tools/google/make_tree.sh --pip_dir=/tmp/pip_dir - -to create a pip package. If you are running within Google, also provide the -`--pending_cl` flag. That script will generate a wheel file (.whl) within -`/tmp/pip_dir`. Lets say that it is -`tensorflow-1.0.0rc2-cp27-none-linux_x86_64.whl`. - -Run - - pip install --upgrade /tmp/pip_dir/tensorflow-1.0.0rc2-cp27-none-linux_x86_64.whl +## Launching TensorBoard Proper -to update the pip installation of TensorFlow within the virtual environment. -Verify that the `tensorboard` command defers to the tensorboard instance -installed within your virtual environment (`tf_foo`) by running -`which tensorboard`. To run tensorboard, start it up as usual within the virtual -environment: +Running TensorBoard automatically asks Bazel to create a vulcanized HTML binary: - tensorboard --logdir=/tmp/my/logdir +```sh +bazel run //tensorflow/tensorboard:tensorboard -- --logdir=/path/to/logs +``` diff --git a/tensorflow/tensorboard/app/BUILD b/tensorflow/tensorboard/app/BUILD deleted file mode 100644 index 9afcd23e9e..0000000000 --- a/tensorflow/tensorboard/app/BUILD +++ /dev/null @@ -1,19 +0,0 @@ -# Description: -# Build rules for building the HTML/JS necessary for TensorBoard. -package(default_visibility = ["//tensorflow:internal"]) - -licenses(["notice"]) # Apache 2.0 - -exports_files(["LICENSE"]) - -filegroup( - name = "all_files", - srcs = glob( - ["**/*"], - exclude = [ - "**/METADATA", - "**/OWNERS", - ], - ), - visibility = ["//tensorflow:__subpackages__"], -) diff --git a/tensorflow/tensorboard/app/analytics.js b/tensorflow/tensorboard/app/analytics.js deleted file mode 100644 index 497c02ced8..0000000000 --- a/tensorflow/tensorboard/app/analytics.js +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2015 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -// Nothing to see here. vulcanize doesn't like empty files. diff --git a/tensorflow/tensorboard/backend/BUILD b/tensorflow/tensorboard/backend/BUILD index d27a22a82b..adbdea5f45 100644 --- a/tensorflow/tensorboard/backend/BUILD +++ b/tensorflow/tensorboard/backend/BUILD @@ -57,7 +57,7 @@ py_test( py_library( name = "application", srcs = ["application.py"], - data = ["//tensorflow/tensorboard:frontend"], + data = ["//tensorflow/tensorboard:assets"], srcs_version = "PY2AND3", deps = [ ":http_util", diff --git a/tensorflow/tensorboard/backend/application.py b/tensorflow/tensorboard/backend/application.py index 3c8963e302..c38ad92be6 100644 --- a/tensorflow/tensorboard/backend/application.py +++ b/tensorflow/tensorboard/backend/application.py @@ -24,7 +24,6 @@ from __future__ import print_function import csv import imghdr -import mimetypes import os import re import threading @@ -159,8 +158,6 @@ class TensorBoardWSGIApp(object): reload_multiplexer(self._multiplexer, path_to_run) self.data_applications = { - '/app.js': - self._serve_js, DATA_PREFIX + AUDIO_ROUTE: self._serve_audio, DATA_PREFIX + COMPRESSED_HISTOGRAMS_ROUTE: @@ -545,59 +542,9 @@ class TensorBoardWSGIApp(object): @wrappers.Request.application def _serve_index(self, request): """Serves the index page (i.e., the tensorboard app itself).""" - return self._serve_static_file(request, '/dist/index.html') - - @wrappers.Request.application - def _serve_js(self, request): - """Serves the JavaScript for the index page.""" - return self._serve_static_file(request, '/dist/app.js') - - def _serve_static_file(self, request, path): - """Serves the static file located at the given path. - - Args: - request: A werkzeug Request - path: The path of the static file, relative to the tensorboard/ directory. - - Returns: - A werkzeug.Response application. - """ - # Strip off the leading forward slash. - orig_path = path.lstrip('/') - if not self._path_is_safe(orig_path): - logging.warning('path not safe: %s', orig_path) - return http_util.Respond(request, 'Naughty naughty!', 'text/plain', 400) - # Resource loader wants a path relative to //WORKSPACE/tensorflow. - path = os.path.join('tensorboard', orig_path) - # Open the file and read it. - try: - contents = resource_loader.load_resource(path) - except IOError: - # For compatibility with latest version of Bazel, we renamed bower - # packages to use '_' rather than '-' in their package name. - # This means that the directory structure is changed too. - # So that all our recursive imports work, we need to modify incoming - # requests to map onto the new directory structure. - path = orig_path - components = path.split('/') - components[0] = components[0].replace('-', '_') - path = ('/').join(components) - # Bazel keeps all the external dependencies in //WORKSPACE/external. - # and resource loader wants a path relative to //WORKSPACE/tensorflow/. - path = os.path.join('../external', path) - try: - contents = resource_loader.load_resource(path) - except IOError: - logging.warning('path %s not found, sending 404', path) - return http_util.Respond(request, 'Not found', 'text/plain', code=404) - mimetype, content_encoding = mimetypes.guess_type(path) - mimetype = mimetype or 'application/octet-stream' - return http_util.Respond( - request, - contents, - mimetype, - expires=3600, - content_encoding=content_encoding) + contents = resource_loader.load_resource( + 'tensorboard/components/index.html') + return http_util.Respond(request, contents, 'text/html', expires=3600) def __call__(self, environ, start_response): # pylint: disable=invalid-name """Central entry point for the TensorBoard application. @@ -628,8 +575,9 @@ class TensorBoardWSGIApp(object): elif clean_path in TAB_ROUTES: return self._serve_index(environ, start_response) else: - return self._serve_static_file(request, clean_path)(environ, - start_response) + logging.warning('path %s not found, sending 404', clean_path) + return http_util.Respond(request, 'Not found', 'text/plain', code=404)( + environ, start_response) # pylint: enable=too-many-function-args diff --git a/tensorflow/tensorboard/backend/application_test.py b/tensorflow/tensorboard/backend/application_test.py index 4ea627def7..e8556c0c61 100644 --- a/tensorflow/tensorboard/backend/application_test.py +++ b/tensorflow/tensorboard/backend/application_test.py @@ -154,11 +154,6 @@ class TensorboardServerTest(test.TestCase): response = self._get('/asdf') self.assertEqual(response.status, 404) - def testDirectoryTraversal(self): - """Attempt a directory traversal attack.""" - response = self._get('/..' * 30 + '/etc/passwd') - self.assertEqual(response.status, 400) - def testLogdir(self): """Test the format of the data/logdir endpoint.""" parsed_object = self._getJson('/data/logdir') diff --git a/tensorflow/tensorboard/bower.json b/tensorflow/tensorboard/bower.json deleted file mode 100644 index 0a0fac45fd..0000000000 --- a/tensorflow/tensorboard/bower.json +++ /dev/null @@ -1,187 +0,0 @@ -{ - "__autoadded_transitive_dep__": [ - "font-roboto", - "iron-a11y-announcer", - "iron-a11y-keys-behavior", - "iron-autogrow-textarea", - "iron-checked-element-behavior", - "iron-dropdown", - "iron-fit-behavior", - "iron-flex-layout", - "iron-form-element-behavior", - "iron-icon", - "iron-iconset-svg", - "iron-input", - "iron-menu-behavior", - "iron-meta", - "iron-overlay-behavior", - "iron-range-behavior", - "iron-resizable-behavior", - "iron-scroll-target-behavior", - "iron-validatable-behavior", - "neon-animation", - "paper-dialog-behavior", - "paper-material", - "paper-menu-button", - "paper-ripple", - "promise-polyfill", - "web-animations-js", - "webcomponentsjs" - ], - "authors": [ - "Google" - ], - "dependencies": { - "d3": "3.5.15", - "dagre": "0.7.4", - "es6-promise": "2.1.0", - "font-roboto": "PolymerElements/font-roboto#1.0.1", - "graphlib": "1.0.7", - "iron-a11y-announcer": "PolymerElements/iron-a11y-announcer#1.0.5", - "iron-a11y-keys-behavior": "PolymerElements/iron-a11y-keys-behavior#1.1.8", - "iron-ajax": "PolymerElements/iron-ajax#1.2.0", - "iron-autogrow-textarea": "PolymerElements/iron-autogrow-textarea#1.0.12", - "iron-behaviors": "PolymerElements/iron-behaviors#1.0.17", - "iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#1.0.4", - "iron-collapse": "PolymerElements/iron-collapse#1.0.8", - "iron-dropdown": "PolymerElements/iron-dropdown#1.4.0", - "iron-fit-behavior": "PolymerElements/iron-fit-behavior#1.2.5", - "iron-flex-layout": "PolymerElements/iron-flex-layout#1.3.0", - "iron-form-element-behavior": "PolymerElements/iron-form-element-behavior#1.0.6", - "iron-icon": "PolymerElements/iron-icon#1.0.11", - "iron-icons": "PolymerElements/iron-icons#1.1.3", - "iron-iconset-svg": "PolymerElements/iron-iconset-svg#1.1.0", - "iron-input": "PolymerElements/iron-input#1.0.10", - "iron-list": "PolymerElements/iron-list#1.3.9", - "iron-menu-behavior": "PolymerElements/iron-menu-behavior#1.1.10", - "iron-meta": "PolymerElements/iron-meta#1.1.1", - "iron-overlay-behavior": "PolymerElements/iron-overlay-behavior#1.10.1", - "iron-range-behavior": "PolymerElements/iron-range-behavior#1.0.4", - "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#1.0.3", - "iron-scroll-target-behavior": "PolymerElements/iron-scroll-target-behavior#1.0.3", - "iron-selector": "PolymerElements/iron-selector#1.5.2", - "iron-validatable-behavior": "PolymerElements/iron-validatable-behavior#1.1.1", - "lodash": "3.8.0", - "neon-animation": "PolymerElements/neon-animation#1.2.2", - "numericjs": "1.2.6", - "paper-behaviors": "PolymerElements/paper-behaviors#1.0.12", - "paper-button": "PolymerElements/paper-button#1.0.11", - "paper-checkbox": "PolymerElements/paper-checkbox#1.4.0", - "paper-dialog": "PolymerElements/paper-dialog#1.0.4", - "paper-dialog-behavior": "PolymerElements/paper-dialog-behavior#1.2.5", - "paper-dialog-scrollable": "PolymerElements/paper-dialog-scrollable#1.1.5", - "paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#1.4.0", - "paper-header-panel": "PolymerElements/paper-header-panel#1.1.4", - "paper-icon-button": "PolymerElements/paper-icon-button#1.1.3", - "paper-input": "PolymerElements/paper-input#1.1.18", - "paper-item": "PolymerElements/paper-item#1.1.4", - "paper-listbox": "PolymerElements/paper-listbox#1.1.2", - "paper-material": "PolymerElements/paper-material#1.0.6", - "paper-menu": "PolymerElements/paper-menu#1.2.2", - "paper-menu-button": "PolymerElements/paper-menu-button#1.5.1", - "paper-progress": "PolymerElements/paper-progress#1.0.9", - "paper-radio-button": "PolymerElements/paper-radio-button#1.1.2", - "paper-radio-group": "PolymerElements/paper-radio-group#1.0.9", - "paper-ripple": "PolymerElements/paper-ripple#1.0.5", - "paper-slider": "PolymerElements/paper-slider#1.0.10", - "paper-spinner": "PolymerElements/paper-spinner#1.1.1", - "paper-styles": "PolymerElements/paper-styles#1.1.4", - "paper-tabs": "PolymerElements/paper-tabs#1.7.0", - "paper-toast": "PolymerElements/paper-toast#1.3.0", - "paper-toggle-button": "PolymerElements/paper-toggle-button#1.2.0", - "paper-toolbar": "PolymerElements/paper-toolbar#1.1.4", - "paper-tooltip": "PolymerElements/paper-tooltip#1.1.2", - "plottable": "1.16.1", - "polymer": "1.7.0", - "promise-polyfill": "polymerlabs/promise-polyfill#1.0.0", - "three.js": "threejs#r77", - "web-animations-js": "web-animations/web-animations-js#2.2.1", - "webcomponentsjs": "webcomponents/webcomponentsjs#0.7.22", - "weblas": "0.9.0" - }, - "description": "TensorBoard: Visualizations for TensorFlow", - "devDependencies": { - "iron-component-page": "PolymerElements/iron-component-page#^1.1.4", - "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.2.3", - "web-component-tester": "Polymer/web-component-tester" - }, - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ], - "license": "Apache-2.0", - "name": "tensorboard", - "private": true, - "resolutions": { - "d3": "3.5.15", - "dagre": "0.7.4", - "es6-promise": "2.1.0", - "font-roboto": "1.0.1", - "graphlib": "1.0.7", - "iron-a11y-announcer": "1.0.5", - "iron-a11y-keys-behavior": "1.1.8", - "iron-ajax": "1.2.0", - "iron-autogrow-textarea": "1.0.12", - "iron-behaviors": "1.0.17", - "iron-checked-element-behavior": "1.0.4", - "iron-collapse": "1.0.8", - "iron-dropdown": "1.4.0", - "iron-fit-behavior": "1.2.5", - "iron-flex-layout": "1.3.0", - "iron-form-element-behavior": "1.0.6", - "iron-icon": "1.0.11", - "iron-icons": "1.1.3", - "iron-iconset-svg": "1.1.0", - "iron-input": "1.0.10", - "iron-list": "1.3.9", - "iron-menu-behavior": "1.1.10", - "iron-meta": "1.1.1", - "iron-overlay-behavior": "1.10.1", - "iron-range-behavior": "1.0.4", - "iron-resizable-behavior": "1.0.3", - "iron-scroll-target-behavior": "1.0.3", - "iron-selector": "1.5.2", - "iron-validatable-behavior": "1.1.1", - "lodash": "3.8.0", - "neon-animation": "1.2.2", - "numericjs": "1.2.6", - "paper-behaviors": "1.0.12", - "paper-button": "1.0.11", - "paper-checkbox": "1.4.0", - "paper-dialog": "1.0.4", - "paper-dialog-behavior": "1.2.5", - "paper-dialog-scrollable": "1.1.5", - "paper-dropdown-menu": "1.4.0", - "paper-header-panel": "1.1.4", - "paper-icon-button": "1.1.3", - "paper-input": "1.1.18", - "paper-item": "1.1.4", - "paper-listbox": "1.1.2", - "paper-material": "1.0.6", - "paper-menu": "1.2.2", - "paper-menu-button": "1.5.1", - "paper-progress": "1.0.9", - "paper-radio-button": "1.1.2", - "paper-radio-group": "1.0.9", - "paper-ripple": "1.0.5", - "paper-slider": "1.0.10", - "paper-spinner": "1.1.1", - "paper-styles": "1.1.4", - "paper-tabs": "1.7.0", - "paper-toast": "1.3.0", - "paper-toggle-button": "1.2.0", - "paper-toolbar": "1.1.4", - "paper-tooltip": "1.1.2", - "plottable": "1.16.1", - "polymer": "1.7.0", - "promise-polyfill": "1.0.0", - "three.js": "threejs#r77", - "web-animations-js": "2.2.1", - "webcomponentsjs": "0.7.22", - "weblas": "0.9.0" - }, - "version": "0.0.0" -} diff --git a/tensorflow/tensorboard/bower/BUILD b/tensorflow/tensorboard/bower/BUILD deleted file mode 100644 index 2c2921d988..0000000000 --- a/tensorflow/tensorboard/bower/BUILD +++ /dev/null @@ -1,76 +0,0 @@ -# AUTOGENERATED FILE by tensorboard_bower_dependency_sync.py - -package(default_visibility = ["//visibility:public"]) - -filegroup( - name = "bower", - srcs = [ - "@d3//:d3", - "@dagre//:dagre", - "@es6_promise//:es6_promise", - "@font_roboto//:font_roboto", - "@graphlib//:graphlib", - "@iron_a11y_announcer//:iron_a11y_announcer", - "@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_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_scroll_target_behavior//:iron_scroll_target_behavior", - "@iron_selector//:iron_selector", - "@iron_validatable_behavior//:iron_validatable_behavior", - "@lodash//:lodash", - "@neon_animation//:neon_animation", - "@numericjs_numeric_min_js//file", - "@paper_behaviors//:paper_behaviors", - "@paper_button//:paper_button", - "@paper_checkbox//:paper_checkbox", - "@paper_dialog//:paper_dialog", - "@paper_dialog_behavior//:paper_dialog_behavior", - "@paper_dialog_scrollable//:paper_dialog_scrollable", - "@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_listbox//:paper_listbox", - "@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_spinner//:paper_spinner", - "@paper_styles//:paper_styles", - "@paper_tabs//:paper_tabs", - "@paper_toast//:paper_toast", - "@paper_toggle_button//:paper_toggle_button", - "@paper_toolbar//:paper_toolbar", - "@paper_tooltip//:paper_tooltip", - "@plottable//:plottable", - "@polymer//:polymer", - "@promise_polyfill//:promise_polyfill", - "@three_js_orbitcontrols_js//file", - "@three_js_three_min_js//file", - "@web_animations_js//:web_animations_js", - "@webcomponentsjs//:webcomponentsjs", - "@weblas_weblas_js//file", - ], -) diff --git a/tensorflow/tensorboard/components/BUILD b/tensorflow/tensorboard/components/BUILD index 301425d96d..2d2c2d2d7b 100644 --- a/tensorflow/tensorboard/components/BUILD +++ b/tensorflow/tensorboard/components/BUILD @@ -1,23 +1,32 @@ package(default_visibility = ["//tensorflow:internal"]) +load("@io_bazel_rules_closure//closure:defs.bzl", "web_library") +load("//tensorflow/tensorboard:vulcanize.bzl", "tensorboard_html_binary") + licenses(["notice"]) # Apache 2.0 -exports_files(["LICENSE"]) +web_library( + name = "tensorboard", + srcs = [ + "analytics.html", + "tensorboard.html", + ], + path = "/", + deps = [ + "//tensorflow/tensorboard/components/tf_tensorboard_d3v4", + "@org_polymer_webcomponentsjs", + ], +) + +tensorboard_html_binary( + name = "index", + input_path = "/tensorboard.html", + output_path = "/index.html", + deps = [":tensorboard"], +) filegroup( name = "all_files", - srcs = glob( - [ - "tf_*/**/*", - "vz_*/**/*", - ], - exclude = [ - "**/tf_model_zoo/*", - "**/METADATA", - "**/OWNERS", - ], - ) + [ - "BUILD", - ], - visibility = ["//tensorflow:__subpackages__"], + srcs = glob(["**"]), + tags = ["notsan"], ) diff --git a/tensorflow/tensorboard/components/analytics.html b/tensorflow/tensorboard/components/analytics.html new file mode 100644 index 0000000000..d319f576fc --- /dev/null +++ b/tensorflow/tensorboard/components/analytics.html @@ -0,0 +1,18 @@ + + + diff --git a/tensorflow/tensorboard/components/index.html b/tensorflow/tensorboard/components/index.html deleted file mode 100644 index c790a76f75..0000000000 --- a/tensorflow/tensorboard/components/index.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - TensorBoard - - - - - - diff --git a/tensorflow/tensorboard/components/tensorboard.html b/tensorflow/tensorboard/components/tensorboard.html new file mode 100644 index 0000000000..0652902cfa --- /dev/null +++ b/tensorflow/tensorboard/components/tensorboard.html @@ -0,0 +1,27 @@ + + + + +TensorBoard + + + + + + + diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD index 9172ebb22a..010643b856 100644 --- a/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD +++ b/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD @@ -44,9 +44,9 @@ tensorboard_webcomponent_library( ], destdir = "tf-audio-dashboard", deps = [ - "//tensorflow/tensorboard/components:tf_imports", "//tensorflow/tensorboard/components/tf_backend:legacy", "//tensorflow/tensorboard/components/tf_dashboard_common:legacy", + "//tensorflow/tensorboard/components/tf_imports_google:lib", "//third_party/javascript/polymer/v1/paper-icon-button:lib", "//third_party/javascript/polymer/v1/paper-styles:lib", "//third_party/javascript/polymer/v1/polymer:lib", @@ -59,5 +59,4 @@ tensorboard_ts_library( srcs = [], deps_mgmt = "off", runtime = "nodejs", - deps = ["//tensorflow/tensorboard/components:common_deps"], ) diff --git a/tensorflow/tensorboard/components/tf_backend/BUILD b/tensorflow/tensorboard/components/tf_backend/BUILD index d9f3a035d8..14781f327c 100644 --- a/tensorflow/tensorboard/components/tf_backend/BUILD +++ b/tensorflow/tensorboard/components/tf_backend/BUILD @@ -58,7 +58,7 @@ tensorboard_webcomponent_library( visibility = ["//visibility:public"], destdir = "tf-backend", deps = [ - "//tensorflow/tensorboard/components:tf_imports", + "//tensorflow/tensorboard/components/tf_imports_google:lib", "//third_party/javascript/polymer/v1/polymer:lib", ], ) @@ -75,7 +75,15 @@ tensorboard_ts_library( deps_mgmt = "off", runtime = "nodejs", deps = [ - "//tensorflow/tensorboard/components:common_deps", "//tensorflow/tensorboard/components/vz_sorting:legacy_ts", + "//third_party/javascript/node_modules/typescript:es2015.promise", + "//third_party/javascript/plottable/v1:typings", + "//third_party/javascript/typings/chai", + "//third_party/javascript/typings/d3", + "//third_party/javascript/typings/lodash", + "//third_party/javascript/typings/mocha", + "//third_party/javascript/typings/polymer:polymer_without_externs", + "//third_party/javascript/typings/sinon", + "//third_party/javascript/typings/webcomponents_js", ], ) diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD b/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD index 019283816f..179ca27cd2 100644 --- a/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD +++ b/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD @@ -13,6 +13,7 @@ web_library( "tf-backend.html", ], path = "/tf-backend", + visibility = ["//visibility:public"], deps = [ "//tensorflow/tensorboard/components/tf_imports_d3v4:d3", "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash", diff --git a/tensorflow/tensorboard/components/tf_color_scale/BUILD b/tensorflow/tensorboard/components/tf_color_scale/BUILD index 3e64fccd2e..f6f1be099a 100644 --- a/tensorflow/tensorboard/components/tf_color_scale/BUILD +++ b/tensorflow/tensorboard/components/tf_color_scale/BUILD @@ -48,7 +48,7 @@ tensorboard_webcomponent_library( ], destdir = "tf-color-scale", deps = [ - "//tensorflow/tensorboard/components:tf_imports", + "//tensorflow/tensorboard/components/tf_imports_google:lib", "//third_party/javascript/polymer/v1/polymer:lib", ], ) @@ -61,5 +61,15 @@ tensorboard_ts_library( ], deps_mgmt = "off", runtime = "nodejs", - deps = ["//tensorflow/tensorboard/components:common_deps"], + deps = [ + "//third_party/javascript/node_modules/typescript:es2015.promise", + "//third_party/javascript/plottable/v1:typings", + "//third_party/javascript/typings/chai", + "//third_party/javascript/typings/d3", + "//third_party/javascript/typings/lodash", + "//third_party/javascript/typings/mocha", + "//third_party/javascript/typings/polymer:polymer_without_externs", + "//third_party/javascript/typings/sinon", + "//third_party/javascript/typings/webcomponents_js", + ], ) diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD index 321e4a821e..5a9e941e46 100644 --- a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD +++ b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD @@ -65,7 +65,7 @@ tensorboard_webcomponent_library( srcs = glob(["*.html"]) + [":legacy_ts"], destdir = "tf-dashboard-common", deps = [ - "//tensorflow/tensorboard/components:tf_imports", + "//tensorflow/tensorboard/components/tf_imports_google:lib", "//tensorflow/tensorboard/components/tf_storage:legacy", "//tensorflow/tensorboard/components/vz_sorting:legacy", "//third_party/javascript/polymer/v1/iron-ajax:lib", @@ -97,7 +97,15 @@ tensorboard_ts_library( deps_mgmt = "off", runtime = "nodejs", deps = [ - "//tensorflow/tensorboard/components:common_deps", "//tensorflow/tensorboard/components/vz_sorting:legacy_ts", + "//third_party/javascript/node_modules/typescript:es2015.promise", + "//third_party/javascript/plottable/v1:typings", + "//third_party/javascript/typings/chai", + "//third_party/javascript/typings/d3", + "//third_party/javascript/typings/lodash", + "//third_party/javascript/typings/mocha", + "//third_party/javascript/typings/polymer:polymer_without_externs", + "//third_party/javascript/typings/sinon", + "//third_party/javascript/typings/webcomponents_js", ], ) diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD index 38c3eb6c11..65341e7647 100644 --- a/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD +++ b/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD @@ -42,9 +42,9 @@ tensorboard_webcomponent_library( ], destdir = "tf-distribution-dashboard", deps = [ - "//tensorflow/tensorboard/components:tf_imports", "//tensorflow/tensorboard/components/tf_backend:legacy", "//tensorflow/tensorboard/components/tf_dashboard_common:legacy", + "//tensorflow/tensorboard/components/tf_imports_google:lib", "//tensorflow/tensorboard/components/vz_distribution_chart:legacy", "//third_party/javascript/polymer/v1/iron-collapse:lib", "//third_party/javascript/polymer/v1/paper-icon-button:lib", @@ -59,6 +59,4 @@ tensorboard_ts_library( srcs = [], deps_mgmt = "off", runtime = "nodejs", - # Don't list the common_deps here; a src-less ts_library re-exports them, - # and they are outside the package where the Fileset will be rooted. ) diff --git a/tensorflow/tensorboard/components/tf_graph_common/BUILD b/tensorflow/tensorboard/components/tf_graph_common/BUILD index 50f7a309ed..7c0a4a44a2 100644 --- a/tensorflow/tensorboard/components/tf_graph_common/BUILD +++ b/tensorflow/tensorboard/components/tf_graph_common/BUILD @@ -51,7 +51,7 @@ tensorboard_webcomponent_library( ], destdir = "tf-graph-common", deps = [ - "//tensorflow/tensorboard/components:tf_imports", + "//tensorflow/tensorboard/components/tf_imports_google:lib", "//third_party/javascript/polymer/v1/polymer:lib", ], ) @@ -61,5 +61,15 @@ tensorboard_ts_library( srcs = glob(["*.ts"]), deps_mgmt = "off", runtime = "nodejs", - deps = ["//tensorflow/tensorboard/components:common_deps"], + deps = [ + "//third_party/javascript/node_modules/typescript:es2015.promise", + "//third_party/javascript/plottable/v1:typings", + "//third_party/javascript/typings/chai", + "//third_party/javascript/typings/d3", + "//third_party/javascript/typings/lodash", + "//third_party/javascript/typings/mocha", + "//third_party/javascript/typings/polymer:polymer_without_externs", + "//third_party/javascript/typings/sinon", + "//third_party/javascript/typings/webcomponents_js", + ], ) diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD index 3f17bda34c..d8e2f672f8 100644 --- a/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD +++ b/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD @@ -42,9 +42,9 @@ tensorboard_webcomponent_library( ], destdir = "tf-histogram-dashboard", deps = [ - "//tensorflow/tensorboard/components:tf_imports", "//tensorflow/tensorboard/components/tf_backend:legacy", "//tensorflow/tensorboard/components/tf_dashboard_common:legacy", + "//tensorflow/tensorboard/components/tf_imports_google:lib", "//tensorflow/tensorboard/components/vz_histogram_timeseries:legacy", "//third_party/javascript/polymer/v1/iron-collapse:lib", "//third_party/javascript/polymer/v1/paper-icon-button:lib", diff --git a/tensorflow/tensorboard/components/tf_imports/BUILD b/tensorflow/tensorboard/components/tf_imports/BUILD index ac4c41d00f..81d1234d66 100644 --- a/tensorflow/tensorboard/components/tf_imports/BUILD +++ b/tensorflow/tensorboard/components/tf_imports/BUILD @@ -24,7 +24,7 @@ web_library( name = "graphlib", srcs = [ "graphlib.html", - "@io_github_cpettitt_graphlib", + "@io_github_cpettitt_graphlib//:graphlib.core.js", ], path = "/tf-imports", deps = [":lodash"], @@ -34,7 +34,7 @@ web_library( name = "dagre", srcs = [ "dagre.html", - "@io_github_cpettitt_dagre", + "@io_github_cpettitt_dagre//:dagre.core.js", ], path = "/tf-imports", deps = [ diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD index edf759052f..abebe34368 100644 --- a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD +++ b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD @@ -26,7 +26,7 @@ web_library( name = "numericjs", srcs = [ "numericjs.html", - "@com_numericjs", + "@com_numericjs//:numeric.js", ], path = "/tf-imports", ) @@ -35,7 +35,7 @@ web_library( name = "weblas", srcs = [ "weblas.html", - "@io_github_waylonflinn_weblas", + "@io_github_waylonflinn_weblas//:weblas.js", ], path = "/tf-imports", ) @@ -44,7 +44,7 @@ web_library( name = "graphlib", srcs = [ "graphlib.html", - "@io_github_cpettitt_graphlib", + "@io_github_cpettitt_graphlib//:graphlib.core.js", ], path = "/tf-imports", deps = [":lodash"], @@ -54,7 +54,7 @@ web_library( name = "dagre", srcs = [ "dagre.html", - "@io_github_cpettitt_dagre", + "@io_github_cpettitt_dagre//:dagre.core.js", ], path = "/tf-imports", deps = [ @@ -67,7 +67,7 @@ web_library( name = "d3", srcs = [ "d3.html", - "@org_d3js_v4", + "@org_d3js_v4//:d3.js", ], path = "/tf-imports", ) diff --git a/tensorflow/tensorboard/components/tf_imports_google/README.md b/tensorflow/tensorboard/components/tf_imports_google/README.md deleted file mode 100644 index 60d9cce777..0000000000 --- a/tensorflow/tensorboard/components/tf_imports_google/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This file acts as import routers for third party javascript libraries, -e.g. Plottable and D3 from `g3/third_party`; it exists to facilitate development -inside google. diff --git a/tensorflow/tensorboard/components/tf_imports_google/d3.html b/tensorflow/tensorboard/components/tf_imports_google/d3.html deleted file mode 100644 index dbfd11aa87..0000000000 --- a/tensorflow/tensorboard/components/tf_imports_google/d3.html +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/tensorflow/tensorboard/components/tf_imports_google/dagre.html b/tensorflow/tensorboard/components/tf_imports_google/dagre.html deleted file mode 100644 index 5b8b981741..0000000000 --- a/tensorflow/tensorboard/components/tf_imports_google/dagre.html +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/tensorflow/tensorboard/components/tf_imports_google/graphlib.html b/tensorflow/tensorboard/components/tf_imports_google/graphlib.html deleted file mode 100644 index 56b37ebe4b..0000000000 --- a/tensorflow/tensorboard/components/tf_imports_google/graphlib.html +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/tensorflow/tensorboard/components/tf_imports_google/lodash.html b/tensorflow/tensorboard/components/tf_imports_google/lodash.html deleted file mode 100644 index eb8fef2883..0000000000 --- a/tensorflow/tensorboard/components/tf_imports_google/lodash.html +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/tensorflow/tensorboard/components/tf_imports_google/plottable.html b/tensorflow/tensorboard/components/tf_imports_google/plottable.html deleted file mode 100644 index 6f9678f9cb..0000000000 --- a/tensorflow/tensorboard/components/tf_imports_google/plottable.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD index c1fbf80c4b..46c91c484f 100644 --- a/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD +++ b/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD @@ -49,10 +49,10 @@ tensorboard_webcomponent_library( ], destdir = "tf-scalar-dashboard", deps = [ - "//tensorflow/tensorboard/components:tf_imports", "//tensorflow/tensorboard/components/tf_backend:legacy", "//tensorflow/tensorboard/components/tf_color_scale:legacy", "//tensorflow/tensorboard/components/tf_dashboard_common:legacy", + "//tensorflow/tensorboard/components/tf_imports_google:lib", "//tensorflow/tensorboard/components/vz_line_chart:legacy", "//third_party/javascript/polymer/v1/iron-collapse:lib", "//third_party/javascript/polymer/v1/paper-checkbox:lib", @@ -73,5 +73,4 @@ tensorboard_ts_library( srcs = [], deps_mgmt = "off", runtime = "nodejs", - deps = ["//tensorflow/tensorboard/components:common_deps"], ) diff --git a/tensorflow/tensorboard/components/tf_storage/BUILD b/tensorflow/tensorboard/components/tf_storage/BUILD index 8b2e006367..940d09681d 100644 --- a/tensorflow/tensorboard/components/tf_storage/BUILD +++ b/tensorflow/tensorboard/components/tf_storage/BUILD @@ -52,8 +52,8 @@ tensorboard_webcomponent_library( visibility = ["//visibility:public"], destdir = "tf-storage", deps = [ - "//tensorflow/tensorboard/components:tf_imports", "//tensorflow/tensorboard/components/tf_globals:legacy", + "//tensorflow/tensorboard/components/tf_imports_google:lib", "//third_party/javascript/polymer/v1/polymer:lib", ], ) @@ -64,7 +64,15 @@ tensorboard_ts_library( deps_mgmt = "off", runtime = "nodejs", deps = [ - "//tensorflow/tensorboard/components:common_deps", "//tensorflow/tensorboard/components/tf_globals:legacy_ts", + "//third_party/javascript/node_modules/typescript:es2015.promise", + "//third_party/javascript/plottable/v1:typings", + "//third_party/javascript/typings/chai", + "//third_party/javascript/typings/d3", + "//third_party/javascript/typings/lodash", + "//third_party/javascript/typings/mocha", + "//third_party/javascript/typings/polymer:polymer_without_externs", + "//third_party/javascript/typings/sinon", + "//third_party/javascript/typings/webcomponents_js", ], ) diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/BUILD b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/BUILD index 683302bb45..e17a083cb1 100644 --- a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/BUILD +++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//tensorflow:internal"]) load("@io_bazel_rules_closure//closure:defs.bzl", "web_library") -load("//tensorflow/tensorboard:vulcanize.bzl", "tensorboard_html_binary") load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule") licenses(["notice"]) # Apache 2.0 @@ -9,32 +8,35 @@ licenses(["notice"]) # Apache 2.0 web_library( name = "tf_tensorboard_d3v4", srcs = [ + "style.html", "tf-tensorboard.html", ":ts", ], path = "/tf-tensorboard", + visibility = ["//visibility:public"], deps = [ - "@org_polymer_iron_icons", - "@org_polymer_paper_button", - "@org_polymer_paper_checkbox", - "@org_polymer_paper_dialog", - "@org_polymer_paper_header_panel", - "@org_polymer_paper_icon_button", - "@org_polymer_paper_tabs", - "@org_polymer_paper_toolbar", - "@org_polymer", "//tensorflow/tensorboard/components/tf_audio_dashboard_d3v4", "//tensorflow/tensorboard/components/tf_backend_d3v4", "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4", "//tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4", "//tensorflow/tensorboard/components/tf_globals_d3v4", - # "//tensorflow/tensorboard/components/tf_graph_dashboard_d3v4", + "//tensorflow/tensorboard/components/tf_graph_dashboard_d3v4", "//tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4", "//tensorflow/tensorboard/components/tf_image_dashboard_d3v4", "//tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4", "//tensorflow/tensorboard/components/tf_storage_d3v4", "//tensorflow/tensorboard/components/tf_text_dashboard_d3v4", "//tensorflow/tensorboard/components/vz_projector_d3v4", + "@org_polymer", + "@org_polymer_font_roboto", + "@org_polymer_iron_icons", + "@org_polymer_paper_button", + "@org_polymer_paper_checkbox", + "@org_polymer_paper_dialog", + "@org_polymer_paper_header_panel", + "@org_polymer_paper_icon_button", + "@org_polymer_paper_tabs", + "@org_polymer_paper_toolbar", ], ) @@ -49,25 +51,6 @@ web_library( ], ) -web_library( - name = "dist", - srcs = ["dist.html"], - path = "/tf-tensorboard", - deps = [ - ":tf_tensorboard_d3v4", - "//tensorflow/tensorboard/demo:demo_data", - "@org_polymer_webcomponentsjs", - ], -) - -tensorboard_html_binary( - name = "index", - # input_path = "/tf-dashboard-common/tf-chart-scaffold.html", - input_path = "/tf-tensorboard/dist.html", - output_path = "/index.html", - deps = [":dist"], -) - tensorboard_typescript_genrule( name = "ts", srcs = ["autoReloadBehavior.ts"], diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/demo.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/demo.html index 95f5b718a5..c8a9238aef 100644 --- a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/demo.html +++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/demo.html @@ -16,17 +16,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -TensorBoard - + +TensorBoard Demo - + - + diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/dist.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/dist.html deleted file mode 100644 index 89bcfb733e..0000000000 --- a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/dist.html +++ /dev/null @@ -1,32 +0,0 @@ - - - -TensorBoard - - - - - - diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/style.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/style.html new file mode 100644 index 0000000000..575e89e398 --- /dev/null +++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/style.html @@ -0,0 +1,28 @@ + + + + + diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/tf-tensorboard.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/tf-tensorboard.html index f3f5d590f9..3a56535410 100644 --- a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/tf-tensorboard.html +++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/tf-tensorboard.html @@ -30,12 +30,13 @@ limitations under the License. - + + + + + + + Heatmap example + + + + + + +

Initialized with data

+
+ + + +
+ +

Initialized with data and custom data range

+
+ + + +
+ +

Initialized with data and colors

+
+ + + +
+ +

Initialized with data and colors and threshold values

+
+ + + +
+

Initialized with data and color function

+
+ + + + +
+ +

Initialized with data and updated data

+

Click on the heatmap to create new random data.

+
+ + + +
+ +

Initialized with data and updated color update

+

Click on the heatmap to update the color scheme.

+
+ + + +
+ +

Let's try to actually break it... *Puts on fedora*

+

Code below is not meant to be seen, but to ensure that no errors are + thrown when invalid data is passed into the Polymer element.

+ + + + + + + diff --git a/tensorflow/tensorboard/components/vz_heatmap_d3v4/index.html b/tensorflow/tensorboard/components/vz_heatmap_d3v4/index.html new file mode 100644 index 0000000000..656306499e --- /dev/null +++ b/tensorflow/tensorboard/components/vz_heatmap_d3v4/index.html @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + diff --git a/tensorflow/tensorboard/components/vz_heatmap_d3v4/vz-heatmap.html b/tensorflow/tensorboard/components/vz_heatmap_d3v4/vz-heatmap.html new file mode 100644 index 0000000000..8a3503468f --- /dev/null +++ b/tensorflow/tensorboard/components/vz_heatmap_d3v4/vz-heatmap.html @@ -0,0 +1,360 @@ + + + + + + + + + + + diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD index d36cf2b331..3ca3936f32 100644 --- a/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD +++ b/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD @@ -37,7 +37,7 @@ tensorboard_webcomponent_library( visibility = ["//visibility:public"], destdir = "vz-histogram-timeseries", deps = [ - "//tensorflow/tensorboard/components:tf_imports", + "//tensorflow/tensorboard/components/tf_imports_google:lib", "//third_party/javascript/polymer/v1/polymer:lib", ], ) diff --git a/tensorflow/tensorboard/components/vz_line_chart/BUILD b/tensorflow/tensorboard/components/vz_line_chart/BUILD index 130d58dec7..6b988e5279 100644 --- a/tensorflow/tensorboard/components/vz_line_chart/BUILD +++ b/tensorflow/tensorboard/components/vz_line_chart/BUILD @@ -54,7 +54,7 @@ tensorboard_webcomponent_library( visibility = ["//visibility:public"], destdir = "vz-line-chart", deps = [ - "//tensorflow/tensorboard/components:tf_imports", + "//tensorflow/tensorboard/components/tf_imports_google:lib", "//tensorflow/tensorboard/components/vz_sorting:legacy", "//third_party/javascript/polymer/v1/polymer:lib", ], @@ -69,5 +69,15 @@ tensorboard_ts_library( ], deps_mgmt = "off", runtime = "nodejs", - deps = ["//tensorflow/tensorboard/components:common_deps"], + deps = [ + "//third_party/javascript/node_modules/typescript:es2015.promise", + "//third_party/javascript/plottable/v1:typings", + "//third_party/javascript/typings/chai", + "//third_party/javascript/typings/d3", + "//third_party/javascript/typings/lodash", + "//third_party/javascript/typings/mocha", + "//third_party/javascript/typings/polymer:polymer_without_externs", + "//third_party/javascript/typings/sinon", + "//third_party/javascript/typings/webcomponents_js", + ], ) diff --git a/tensorflow/tensorboard/components/vz_sorting/BUILD b/tensorflow/tensorboard/components/vz_sorting/BUILD index ab5d7c3989..795fc5cee4 100644 --- a/tensorflow/tensorboard/components/vz_sorting/BUILD +++ b/tensorflow/tensorboard/components/vz_sorting/BUILD @@ -46,5 +46,4 @@ tensorboard_ts_library( srcs = ["sorting.ts"], deps_mgmt = "off", runtime = "nodejs", - deps = ["//tensorflow/tensorboard/components:common_deps"], ) diff --git a/tensorflow/tensorboard/components/vz_sorting/test/BUILD b/tensorflow/tensorboard/components/vz_sorting/test/BUILD index d1cf5a596a..649bfc5c6e 100644 --- a/tensorflow/tensorboard/components/vz_sorting/test/BUILD +++ b/tensorflow/tensorboard/components/vz_sorting/test/BUILD @@ -34,7 +34,15 @@ tensorboard_ts_library( deps_mgmt = "off", runtime = "nodejs", deps = [ - "//tensorflow/tensorboard/components:common_deps", "//tensorflow/tensorboard/components/vz_sorting:legacy_ts", + "//third_party/javascript/node_modules/typescript:es2015.promise", + "//third_party/javascript/plottable/v1:typings", + "//third_party/javascript/typings/chai", + "//third_party/javascript/typings/d3", + "//third_party/javascript/typings/lodash", + "//third_party/javascript/typings/mocha", + "//third_party/javascript/typings/polymer:polymer_without_externs", + "//third_party/javascript/typings/sinon", + "//third_party/javascript/typings/webcomponents_js", ], ) diff --git a/tensorflow/tensorboard/dist/bazel-html-imports.html b/tensorflow/tensorboard/dist/bazel-html-imports.html deleted file mode 100644 index 2268e6d7d4..0000000000 --- a/tensorflow/tensorboard/dist/bazel-html-imports.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/tensorflow/tensorboard/dist/index.html b/tensorflow/tensorboard/dist/index.html deleted file mode 100644 index 5f09faf31d..0000000000 --- a/tensorflow/tensorboard/dist/index.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - TensorBoard - - - - - - - - - - - diff --git a/tensorflow/tensorboard/dist/tf-tensorboard.html b/tensorflow/tensorboard/dist/tf-tensorboard.html deleted file mode 100644 index 9f13cdfb47..0000000000 --- a/tensorflow/tensorboard/dist/tf-tensorboard.html +++ /dev/null @@ -1,27143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tensorflow/tensorboard/gulp_tasks/bower.js b/tensorflow/tensorboard/gulp_tasks/bower.js deleted file mode 100644 index 8f4666a8c1..0000000000 --- a/tensorflow/tensorboard/gulp_tasks/bower.js +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2015 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -const gulp = require('gulp'); -const bower = require('gulp-bower'); - -module.exports = function() { - return function() { - return bower(); - } -} diff --git a/tensorflow/tensorboard/gulp_tasks/compile.js b/tensorflow/tensorboard/gulp_tasks/compile.js deleted file mode 100644 index 01af60eba7..0000000000 --- a/tensorflow/tensorboard/gulp_tasks/compile.js +++ /dev/null @@ -1,95 +0,0 @@ -/* Copyright 2015 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -const gulp = require('gulp'); -const ts = require('gulp-typescript'); -const typescript = require('typescript'); -const gutil = require('gulp-util'); -const filter = require('gulp-filter'); -const merge = require('merge2'); -const browserify = require('browserify'); -const tsify = require('tsify'); -const source = require('vinyl-source-stream'); -const glob = require('glob').sync; -const concat = require('gulp-concat'); - -const tsProject = ts.createProject('./tsconfig.json', { - typescript: typescript, - noExternalResolve: true, // opt-in for faster compilation! -}); - -/** List of components (and their external deps) that are using es6 modules. */ -const ES6_COMPONENTS = [{ - name: 'vz_projector', - deps: [ - 'd3/d3.min.js', 'weblas/dist/weblas.js', 'three.js/build/three.min.js', - 'three.js/examples/js/controls/OrbitControls.js', - 'numericjs/lib/numeric-1.2.6.js' - ] -}]; - -module.exports = function(includeDeps) { - return function() { - // Compile all components that are using ES6 modules into a bundle.js - // using browserify. - const entries = ['typings/index.d.ts']; - const deps = {}; - ES6_COMPONENTS.forEach(function(component) { - // Collect all the typescript files across the components. - entries = entries.concat(glob( - 'components/' + component.name + '/**/*.ts', - // Do not include tests or IDE-purposed files. - {ignore: ['**/*_test.ts', '**/deps.d.ts']})); - // Collect the unique external deps across all components using es6 - // modules. - component.deps.forEach(function(dep) { - deps['components/' + dep] = true; - }); - }); - deps = Object.keys(deps); - - // Compile, bundle all the typescript files and prepend their deps. - browserify(entries) - .plugin(tsify) - .bundle() - .on('error', function(error) { console.error(error.toString()); }) - .pipe(source('bundle.js')) - .pipe(gulp.dest('components')) - .on('end', function() { - // Typescript was compiled and bundled. Now we need to prepend - // the external dependencies. - if (includeDeps) { - gulp.src(deps.concat(['components/bundle.js'])) - .pipe(concat('bundle.js')) - .pipe(gulp.dest('components')); - } - }); - - // Compile components that are using global namespaces producing 1 js file - // for each ts file. - const isComponent = filter([ - 'components/tf_*/**/*.ts', 'components/vz_*/**/*.ts', 'typings/**/*.ts', - 'components/plottable/plottable.d.ts' - // Ignore components that use es6 modules. - ].concat(ES6_COMPONENTS.map(function(component) { - return '!components/' + component.name + '/**/*.ts'; - }))); - - return tsProject.src() - .pipe(isComponent) - .pipe(ts(tsProject)) - .js.pipe(gulp.dest('.')); - }; -}; diff --git a/tensorflow/tensorboard/gulp_tasks/test.js b/tensorflow/tensorboard/gulp_tasks/test.js deleted file mode 100644 index 0c8b14a4cd..0000000000 --- a/tensorflow/tensorboard/gulp_tasks/test.js +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2015 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -const gulp = require('gulp'); -const tester = require('web-component-tester').test; - -module.exports = function(done) { - tester({}, function(error) { - if (error) { - // Pretty error for gulp. - error = new Error(error.message || error); - error.showStack = false; - } - done(error); - }); -} diff --git a/tensorflow/tensorboard/gulp_tasks/util.js b/tensorflow/tensorboard/gulp_tasks/util.js deleted file mode 100644 index 0d73f69c73..0000000000 --- a/tensorflow/tensorboard/gulp_tasks/util.js +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2016 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -const fs = require('fs'); -const path = require('path'); - -/** - * Returns a list of web components inside the components directory for which - * the name predicate is true. - */ -exports.getComponents = function(namePredicate) { - return fs.readdirSync('components') - .filter(function(file) { - return fs.statSync(path.join('components', file)).isDirectory() && - namePredicate(file); - }) - .map(function(dir) { return '/' + dir + '/'; }); -}; - -/** - * Returns a list of tensorboard web components that are inside the components - * directory. - */ -exports.tbComponents = exports.getComponents(function(name) { - const prefix = name.slice(0, 3); - return prefix == 'tf_' || prefix == 'vz_'; -}); diff --git a/tensorflow/tensorboard/gulp_tasks/vulcanize.js b/tensorflow/tensorboard/gulp_tasks/vulcanize.js deleted file mode 100644 index d2286f1d6c..0000000000 --- a/tensorflow/tensorboard/gulp_tasks/vulcanize.js +++ /dev/null @@ -1,83 +0,0 @@ -/* Copyright 2015 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -const gulp = require('gulp'); -const path = require('path'); -const util = require('./util'); -const vulcanize = require('gulp-vulcanize'); -const replace = require('gulp-replace'); -const rename = require('gulp-rename'); -const header = require('gulp-header'); - -const HEADER_STR = - '\n\n' - -const base = path.join(__dirname, '../components'); -// List of redirects of the form path1|path2 for every tensorboard component -// in order to replace dashes with underscores. -// E.g. .../tf-tensorboard|.../tf_tensorboard -const redirects = util.tbComponents.map(function(dir) { - return path.join(base, dir.replace(/_/g, '-')) + '|' + path.join(base, dir); -}); - -const nonTBComponents = util.getComponents(function(name) { - const prefix = name.slice(0, 3); - return prefix !== 'tf_' && prefix !== 'vz_'; -}); - -// These manual additions are necessary. The task should not inline these -// third-party javascript files. However, vulcanization still needs the HTML -// files found within those directories. Upon adding new third-party javascript, -// consider updating this list. -nonTBComponents.push('/tf-imports/d3.js'); -nonTBComponents.push('/tf-imports/dagre.js'); -nonTBComponents.push('/tf-imports/graphlib.js'); -nonTBComponents.push('/tf-imports/lodash.js'); -nonTBComponents.push('/tf-imports/plottable.js'); - -module.exports = function(overwrite) { - return function() { - const suffix = overwrite ? '' : '.OPENSOURCE'; - // Vulcanize TensorBoard without external libraries. - gulp.src('components/tf_tensorboard/tf-tensorboard.html') - .pipe(vulcanize({ - inlineScripts: true, - inlineCss: true, - stripComments: true, - excludes: nonTBComponents, - redirects: redirects - })) - .pipe(header(HEADER_STR)) - .pipe(rename('tf-tensorboard.html' + suffix)) - .pipe(gulp.dest('./dist')); - } -} diff --git a/tensorflow/tensorboard/gulpfile.js b/tensorflow/tensorboard/gulpfile.js deleted file mode 100644 index c03c4faebc..0000000000 --- a/tensorflow/tensorboard/gulpfile.js +++ /dev/null @@ -1,91 +0,0 @@ -/* Copyright 2015 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -const gulp = require('gulp'); -const server = require('gulp-server-livereload'); -const minimist = require('minimist'); -const util = require('./gulp_tasks/util'); - -const options = minimist(process.argv.slice(2), { - default: { - p: 8000, // port for gulp server - h: '0.0.0.0', // host to serve on - } -}); - -function getTask(task) { - return require('./gulp_tasks/' + task); -} - - -gulp.task('compile', getTask('compile')(true)); -gulp.task('first-compile', getTask('compile')(true)); -gulp.task('compile-without-deps', getTask('compile')(false)); -gulp.task('test.onlytest', getTask('test')); -gulp.task('test', ['compile'], getTask('test')); - -gulp.task('watch', [], function() { - // Avoid watching generated .d.ts in the build (aka output) directory. - return gulp.watch( - ['components/tf_*/**/*.ts', 'components/vz_*/**/*.ts'], - {ignoreInitial: true}, ['compile']); -}); - -const httpPrefix = 'http://' + options.h + ':' + options.p + '/components'; -const proxies = util.tbComponents.map(function(component) { - return { - source: '/components' + component.replace(/_/g, '-'), - target: httpPrefix + component - }; -}); - -// Do first-compile before turning on server, to avoid spamming -// livereload info -// TODO(danmane): Disconnect this once we can get livereload to -// no longer spam. -gulp.task('server', ['first-compile'], function() { - gulp.src('.').pipe(server({ - host: options.h, - port: options.p, - livereload: { - enable: true, - // Don't livereload on .ts changes, since they aren't loaded by browser. - filter: function(filePath, cb) { cb(!(/\.ts$/.test(filePath))); }, - port: 27729 + options.p - }, - proxies: proxies, - directoryListing: true, - })); -}); - -// TODO(danmane): When testing is nicer, integrate into vulcanize task -// gulp vulcanize: Regenerate the tf-tensorboard.html.OPENSOURCE file for pre-release -gulp.task( - 'vulcanize', ['compile-without-deps'], - getTask('vulcanize')(false)); -// gulp regenerate: Regenerate the tf-tensorboard.html for interactive bazel development -gulp.task( - 'regenerate', ['compile-without-deps'], - getTask('vulcanize')(true)); - -// TODO(danmane): consider making bower install part of default task -gulp.task('default', ['watch', 'server']); - -// Clean all compiled JS files. -const cleanCompiledTypeScript = require('gulp-clean-compiled-typescript'); -gulp.task('clean', function () { - return gulp.src(['./components/**/*.ts', '!./components/**/deps.d.ts']) - .pipe(cleanCompiledTypeScript()); -}); diff --git a/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD b/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD index 07fc3a70a7..de57d7ce2e 100644 --- a/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD +++ b/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD @@ -5,6 +5,7 @@ licenses(["notice"]) # Apache 2.0 java_binary( name = "Vulcanize", srcs = ["Vulcanize.java"], + visibility = ["//visibility:public"], deps = [ "@com_google_guava", "@com_google_protobuf_java", diff --git a/tensorflow/tensorboard/lib/BUILD b/tensorflow/tensorboard/lib/BUILD deleted file mode 100644 index 9c497396c6..0000000000 --- a/tensorflow/tensorboard/lib/BUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Description: -# BUILD rules for the static resources in TensorBoard. - -package(default_visibility = [ - "//tensorflow:internal", -]) - -licenses(["notice"]) # Apache 2.0 - -exports_files([ - "LICENSE", -]) - -filegroup( - name = "all_files", - srcs = glob( - [ - "**/*", - ], - ), - visibility = ["//tensorflow:__subpackages__"], -) diff --git a/tensorflow/tensorboard/lib/css/global.css b/tensorflow/tensorboard/lib/css/global.css deleted file mode 100644 index cb6e966fdd..0000000000 --- a/tensorflow/tensorboard/lib/css/global.css +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2016 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -html, body { - margin: 0; - padding: 0; - height: 100%; - font-family: "RobotoDraft","Roboto",sans-serif; -} diff --git a/tensorflow/tensorboard/package.json b/tensorflow/tensorboard/package.json deleted file mode 100644 index d424f103dd..0000000000 --- a/tensorflow/tensorboard/package.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "tensorflow-vis", - "version": "0.0.0", - "description": "Visualizers for TensorFlow", - "scripts": { - "test": "gulp test", - "prep": "npm install && bower install && typings install", - "compile": "gulp compile" - }, - "keywords": [ - "tensorflow" - ], - "author": "Google", - "license": "Apache-2.0", - "devDependencies": { - "browserify": "^13.1.0", - "gulp": "~3.9.0", - "gulp-bower": "0.0.13", - "gulp-clean-compiled-typescript": "~1.0.1", - "gulp-cli": "^1.1.0", - "gulp-concat": "^2.6.0", - "gulp-filter": "~3.0.1", - "gulp-header": "~1.7.1", - "gulp-rename": "~1.2.2", - "gulp-replace": "~0.5.4", - "gulp-server-livereload": "1.9.2", - "gulp-typescript": "~2.10.0", - "gulp-util": "~3.0.7", - "gulp-vulcanize": "~6.1.0", - "merge2": "~0.3.6", - "minimist": "~1.2.0", - "tsify": "^0.14.8", - "typescript": "2.3.1", - "typings": "1.4.0", - "vinyl-source-stream": "^1.1.0", - "vulcanize": "^1.14.0", - "web-component-tester": "4.2.2" - } -} diff --git a/tensorflow/tensorboard/tsconfig.json b/tensorflow/tensorboard/tsconfig.json deleted file mode 100644 index ac69c30533..0000000000 --- a/tensorflow/tensorboard/tsconfig.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "compilerOptions": { - "noImplicitAny": false, - "noEmitOnError": true, - "target": "ES5", - "module": "commonjs" - }, - "compileOnSave": false, - "exclude": [ - "node_modules", - "typings/main.d.ts", - "typings/main", - "lib", - "components/**/deps.d.ts" - ] -} diff --git a/tensorflow/tensorboard/wct.conf.json b/tensorflow/tensorboard/wct.conf.json deleted file mode 100644 index 519218ce41..0000000000 --- a/tensorflow/tensorboard/wct.conf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "suites": [ - "components/tf_*/test", - "components/vz_*/test" - ], - "plugins": ["local"] -} diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD index 377a687c34..c44b966451 100644 --- a/tensorflow/tools/pip_package/BUILD +++ b/tensorflow/tools/pip_package/BUILD @@ -96,6 +96,7 @@ filegroup( "//third_party/hadoop:LICENSE.txt", "@boringssl//:LICENSE", "@com_googlesource_code_re2//:LICENSE", + "@com_microsoft_typescript//:LICENSE.txt", "@curl//:COPYING", "@eigen_archive//:COPYING.MPL2", "@farmhash_archive//:COPYING", @@ -109,13 +110,14 @@ filegroup( "@libxsmm_archive//:LICENSE", "@local_config_sycl//sycl:LICENSE.text", "@nanopb_git//:LICENSE.txt", - "@png_archive//:LICENSE", - "@protobuf//:LICENSE", - "@six_archive//:LICENSE", "@org_html5lib//:LICENSE", "@org_mozilla_bleach//:LICENSE", + "@org_nodejs//:LICENSE", "@org_pocoo_werkzeug//:LICENSE", "@org_pythonhosted_markdown//:LICENSE.md", + "@png_archive//:LICENSE", + "@protobuf//:LICENSE", + "@six_archive//:LICENSE", "@snappy//:COPYING", "@zlib_archive//:zlib.h", ] + if_not_windows([ diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py index f8982073c3..ae6516db89 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -190,10 +190,7 @@ setup( package_data={ 'tensorflow': [ EXTENSION_NAME, - 'tensorboard/dist/bazel-html-imports.html', - 'tensorboard/dist/index.html', - 'tensorboard/dist/tf-tensorboard.html', - 'tensorboard/lib/css/global.css', + 'tensorboard/components/index.html', 'tensorboard/TAG', ] + matches, }, diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 2a206b0acd..f41dffefec 100644 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -669,6 +669,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""): ], }, sha256_urls_windows = { + "3d4cfca9dcec556a077a2324bf5bd165ea3e6e64a2bfd7fc6e7a1f0dc4eb552b": [ + "http://mirror.bazel.build/raw.githubusercontent.com/nodejs/node/v4.3.2/LICENSE", + "https://raw.githubusercontent.com/nodejs/node/v4.3.2/LICENSE", + ], "606c44c42d17866c017c50c0afadad411d9492ac4281d2431b937f881911614e": [ "http://mirror.bazel.build/nodejs.org/dist/v4.3.2/win-x64/node.exe", "http://nodejs.org/dist/v4.3.2/win-x64/node.exe", @@ -698,6 +702,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""): name = "com_microsoft_typescript", licenses = ["notice"], # Apache 2.0 sha256_urls = { + "a7d00bfd54525bc694b6e32f64c7ebcf5e6b7ae3657be5cc12767bce74654a47": [ + "http://mirror.bazel.build/raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/LICENSE.txt", + "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/LICENSE.txt", + ], "8465342c318f9c4cf0a29b109fa63ee3742dd4dc7080d05d9fd8f604814d04cf": [ "http://mirror.bazel.build/raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/tsc.js", "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/tsc.js", @@ -754,6 +762,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""): # no @license header licenses = ["notice"], # MIT sha256_urls = { + "0e94aada97f12dee6118064add9170484c55022f5d53206ee4407143cd36ddcd": [ + "http://mirror.bazel.build/raw.githubusercontent.com/sloisel/numeric/v1.2.6/license.txt", + "https://raw.githubusercontent.com/sloisel/numeric/v1.2.6/license.txt", + ], "dfaca3b8485bee735788cc6eebca82ea25719adc1fb8911c7799c6bd5a95df3b": [ "http://mirror.bazel.build/raw.githubusercontent.com/sloisel/numeric/v1.2.6/src/numeric.js", "https://raw.githubusercontent.com/sloisel/numeric/v1.2.6/src/numeric.js", @@ -802,6 +814,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""): # no @license header licenses = ["notice"], # MIT sha256_urls = { + "6a349742a6cb219d5a2fc8d0844f6d89a6efc62e20c664450d884fc7ff2d6015": [ + "http://mirror.bazel.build/raw.githubusercontent.com/cpettitt/dagre/v0.7.4/LICENSE", + "https://raw.githubusercontent.com/cpettitt/dagre/v0.7.4/LICENSE", + ], "7323829ddd77924a69e2b1235ded3eac30acd990da0f037e0fbd3c8e9035b50d": [ "http://mirror.bazel.build/raw.githubusercontent.com/cpettitt/dagre/v0.7.4/dist/dagre.core.js", "https://raw.githubusercontent.com/cpettitt/dagre/v0.7.4/dist/dagre.core.js", @@ -813,6 +829,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""): name = "io_github_cpettitt_graphlib", licenses = ["notice"], # MIT sha256_urls = { + "6a349742a6cb219d5a2fc8d0844f6d89a6efc62e20c664450d884fc7ff2d6015": [ + "http://mirror.bazel.build/raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/LICENSE", + "https://raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/LICENSE", + ], "772045d412b1513b549be991c2e1846c38019429d43974efcae943fbe83489bf": [ "http://mirror.bazel.build/raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/dist/graphlib.core.js", "https://raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/dist/graphlib.core.js", @@ -825,6 +845,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""): # no @license header licenses = ["notice"], # MIT sha256_urls = { + "633f2861a9a862b9cd7967e841e14dd3527912f209d6563595774fa31e3d84cb": [ + "http://mirror.bazel.build/raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/LICENSES", + "https://raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/LICENSE", + ], "f138fce57f673ca8a633f4aee5ae5b6fcb6ad0de59069a42a74e996fd04d8fcc": [ "http://mirror.bazel.build/raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js", "https://raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js", -- cgit v1.2.3