From def653e88d9f3c6dee1fe5a3d3dfc03b79d9b1c6 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Mon, 14 Dec 2015 16:44:36 -0800 Subject: [PATCH] Fix `gulp vulcanize`. To do this we remove bower_components folder and all components are now under `components` directory. This follows polymer conventions. Change: 110158503 --- tensorflow/tensorboard/.bowerrc | 3 + tensorflow/tensorboard/.gitignore | 17 ++- .../tensorboard/components/imports/README.md | 6 - .../components/imports/local-imports/d3.html | 1 - .../imports/local-imports/dagre.html | 5 - .../imports/local-imports/graphlib.html | 2 - .../imports/local-imports/lodash.html | 1 - .../imports/local-imports/plottable.html | 3 - .../{app => components}/index.html | 6 +- .../components/tf-categorizer/demo/index.html | 6 +- .../components/tf-categorizer/index.html | 4 +- .../tf-collapsable-pane/demo/index.html | 2 +- .../components/tf-collapsable-pane/index.html | 4 +- .../tf-dashboard-common/tf-run-generator.html | 2 +- .../tf-dashboard-common/urlGenerator.ts | 2 +- .../tf-event-dashboard/dataCoordinator.ts | 2 +- .../components/tf-event-dashboard/dataset.ts | 2 +- .../tf-event-dashboard/demo/index.html | 2 +- .../tf-event-dashboard/tf-chart.html | 4 +- .../components/tf-event-dashboard/tf-chart.ts | 2 +- .../tf-event-dashboard/tf-color-scale.html | 4 +- .../tf-data-coordinator.html | 4 +- .../tf-event-dashboard.html | 2 +- .../tf-event-dashboard/tf-run-selector.html | 2 +- .../tf-graph-common/test/index.html | 2 +- .../tf-graph-common/tf-graph-common.html | 8 +- .../tf-graph-loader/test/index.html | 2 +- .../tf-graph/demo/tf-graph-demo.html | 7 +- .../tf-histogram-dashboard.html | 2 +- .../demo/image-loader-demo.html | 8 +- .../tf-image-dashboard/demo/index.html | 2 +- .../tf-image-dashboard/tf-image-grid.html | 2 +- .../tf-image-dashboard/tf-image-loader.html | 2 +- .../components/tf-imports/README.md | 2 + .../tensorboard/components/tf-imports/d3.html | 1 + .../components/tf-imports/dagre.html | 7 ++ .../components/tf-imports/google/README.md | 3 + .../components/tf-imports/google/d3.html | 1 + .../components/tf-imports/google/dagre.html | 1 + .../tf-imports/google/graphlib.html | 1 + .../components/tf-imports/google/lodash.html | 1 + .../tf-imports/google/plottable.html | 2 + .../components/tf-imports/graphlib.html | 2 + .../components/tf-imports/lodash.html | 1 + .../components/tf-imports/plottable.html | 3 + .../tf-multi-checkbox/demo/index.html | 4 +- .../tf-multi-checkbox/tf-multi-checkbox.html | 2 +- .../components/tf-regex-group/demo/index.html | 2 +- .../components/tf-regex-group/index.html | 4 +- .../components/{test => tf-test}/index.html | 2 +- tensorflow/tensorboard/gulpfile.js | 111 +++++++++++------- tensorflow/tensorboard/package.json | 4 +- tensorflow/tensorboard/scripts/tfserve.js | 94 --------------- 53 files changed, 163 insertions(+), 208 deletions(-) create mode 100644 tensorflow/tensorboard/.bowerrc delete mode 100644 tensorflow/tensorboard/components/imports/README.md delete mode 100644 tensorflow/tensorboard/components/imports/local-imports/d3.html delete mode 100644 tensorflow/tensorboard/components/imports/local-imports/dagre.html delete mode 100644 tensorflow/tensorboard/components/imports/local-imports/graphlib.html delete mode 100644 tensorflow/tensorboard/components/imports/local-imports/lodash.html delete mode 100644 tensorflow/tensorboard/components/imports/local-imports/plottable.html rename tensorflow/tensorboard/{app => components}/index.html (63%) create mode 100644 tensorflow/tensorboard/components/tf-imports/README.md create mode 100644 tensorflow/tensorboard/components/tf-imports/d3.html create mode 100644 tensorflow/tensorboard/components/tf-imports/dagre.html create mode 100644 tensorflow/tensorboard/components/tf-imports/google/README.md create mode 100644 tensorflow/tensorboard/components/tf-imports/google/d3.html create mode 100644 tensorflow/tensorboard/components/tf-imports/google/dagre.html create mode 100644 tensorflow/tensorboard/components/tf-imports/google/graphlib.html create mode 100644 tensorflow/tensorboard/components/tf-imports/google/lodash.html create mode 100644 tensorflow/tensorboard/components/tf-imports/google/plottable.html create mode 100644 tensorflow/tensorboard/components/tf-imports/graphlib.html create mode 100644 tensorflow/tensorboard/components/tf-imports/lodash.html create mode 100644 tensorflow/tensorboard/components/tf-imports/plottable.html rename tensorflow/tensorboard/components/{test => tf-test}/index.html (77%) delete mode 100644 tensorflow/tensorboard/scripts/tfserve.js diff --git a/tensorflow/tensorboard/.bowerrc b/tensorflow/tensorboard/.bowerrc new file mode 100644 index 00000000000..333544ec7a8 --- /dev/null +++ b/tensorflow/tensorboard/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory" : "components" +} \ No newline at end of file diff --git a/tensorflow/tensorboard/.gitignore b/tensorflow/tensorboard/.gitignore index 33117e9d630..343c2e963e5 100644 --- a/tensorflow/tensorboard/.gitignore +++ b/tensorflow/tensorboard/.gitignore @@ -1,16 +1,25 @@ -bower_components/* 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/index.html +# Ignore the sample graph files since they are too large to +# be in the repo. components/tf-graph/demo/tf_model_zoo/* -# Js files in the graph visualizer migrated to typescript. These files -# are produced by the compiler and should not be submitted to the repo. +# Js files in the graph visualizer produces by the typescript +# compiler and should not be submitted to the repo. components/tf-graph-common/lib/*.js components/tf-graph-common/lib/scene/*.js components/tf-event-dashboard/*.js components/tf-categorizer/*.js components/tf-dashboard-common/*.js -components/**/test/*.js +components/**/tf-test/*.js diff --git a/tensorflow/tensorboard/components/imports/README.md b/tensorflow/tensorboard/components/imports/README.md deleted file mode 100644 index 695698bf237..00000000000 --- a/tensorflow/tensorboard/components/imports/README.md +++ /dev/null @@ -1,6 +0,0 @@ -This file acts as import routers for third party javascript libraries, -e.g. Plottable and D3. - -The "local-imports" folder contains alternate versions of the import routers -that load from `bower_components`; it exists to faciliate local development -with a gulp workflow. diff --git a/tensorflow/tensorboard/components/imports/local-imports/d3.html b/tensorflow/tensorboard/components/imports/local-imports/d3.html deleted file mode 100644 index e2797c0a1a9..00000000000 --- a/tensorflow/tensorboard/components/imports/local-imports/d3.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/tensorflow/tensorboard/components/imports/local-imports/dagre.html b/tensorflow/tensorboard/components/imports/local-imports/dagre.html deleted file mode 100644 index 29586e769de..00000000000 --- a/tensorflow/tensorboard/components/imports/local-imports/dagre.html +++ /dev/null @@ -1,5 +0,0 @@ -// hackhack for some reason getting graphlib via an import reference results in -// out of order script evaluation - - - diff --git a/tensorflow/tensorboard/components/imports/local-imports/graphlib.html b/tensorflow/tensorboard/components/imports/local-imports/graphlib.html deleted file mode 100644 index 4bf3528fcd3..00000000000 --- a/tensorflow/tensorboard/components/imports/local-imports/graphlib.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/tensorflow/tensorboard/components/imports/local-imports/lodash.html b/tensorflow/tensorboard/components/imports/local-imports/lodash.html deleted file mode 100644 index 95f8375a1d4..00000000000 --- a/tensorflow/tensorboard/components/imports/local-imports/lodash.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/tensorflow/tensorboard/components/imports/local-imports/plottable.html b/tensorflow/tensorboard/components/imports/local-imports/plottable.html deleted file mode 100644 index dfbe77c8c44..00000000000 --- a/tensorflow/tensorboard/components/imports/local-imports/plottable.html +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/tensorflow/tensorboard/app/index.html b/tensorflow/tensorboard/components/index.html similarity index 63% rename from tensorflow/tensorboard/app/index.html rename to tensorflow/tensorboard/components/index.html index c6a1a8f80ef..8b0f87d3504 100644 --- a/tensorflow/tensorboard/app/index.html +++ b/tensorflow/tensorboard/components/index.html @@ -1,7 +1,7 @@ - + - + - + TensorBoard diff --git a/tensorflow/tensorboard/components/tf-categorizer/demo/index.html b/tensorflow/tensorboard/components/tf-categorizer/demo/index.html index ea3f162aa5d..403e25da873 100644 --- a/tensorflow/tensorboard/components/tf-categorizer/demo/index.html +++ b/tensorflow/tensorboard/components/tf-categorizer/demo/index.html @@ -1,10 +1,10 @@ - - + + - + diff --git a/tensorflow/tensorboard/components/tf-categorizer/index.html b/tensorflow/tensorboard/components/tf-categorizer/index.html index f08a125f7c6..5956a9789b1 100644 --- a/tensorflow/tensorboard/components/tf-categorizer/index.html +++ b/tensorflow/tensorboard/components/tf-categorizer/index.html @@ -6,8 +6,8 @@ - - + + diff --git a/tensorflow/tensorboard/components/tf-collapsable-pane/demo/index.html b/tensorflow/tensorboard/components/tf-collapsable-pane/demo/index.html index 8906b0f3daa..237870408b3 100644 --- a/tensorflow/tensorboard/components/tf-collapsable-pane/demo/index.html +++ b/tensorflow/tensorboard/components/tf-collapsable-pane/demo/index.html @@ -1,7 +1,7 @@ - + diff --git a/tensorflow/tensorboard/components/tf-collapsable-pane/index.html b/tensorflow/tensorboard/components/tf-collapsable-pane/index.html index 032e5be8c83..c985bc2b52f 100644 --- a/tensorflow/tensorboard/components/tf-collapsable-pane/index.html +++ b/tensorflow/tensorboard/components/tf-collapsable-pane/index.html @@ -6,8 +6,8 @@ - - + + diff --git a/tensorflow/tensorboard/components/tf-dashboard-common/tf-run-generator.html b/tensorflow/tensorboard/components/tf-dashboard-common/tf-run-generator.html index 4d72552049b..6c3389fb7f9 100644 --- a/tensorflow/tensorboard/components/tf-dashboard-common/tf-run-generator.html +++ b/tensorflow/tensorboard/components/tf-dashboard-common/tf-run-generator.html @@ -1,6 +1,6 @@ - + + + + diff --git a/tensorflow/tensorboard/components/tf-imports/google/README.md b/tensorflow/tensorboard/components/tf-imports/google/README.md new file mode 100644 index 00000000000..7ff40697701 --- /dev/null +++ b/tensorflow/tensorboard/components/tf-imports/google/README.md @@ -0,0 +1,3 @@ +This file acts as import routers for third party javascript libraries, +e.g. Plottable and D3 from `g3/third_party`; it exists to faciliate development +inside google. diff --git a/tensorflow/tensorboard/components/tf-imports/google/d3.html b/tensorflow/tensorboard/components/tf-imports/google/d3.html new file mode 100644 index 00000000000..1ede44827c5 --- /dev/null +++ b/tensorflow/tensorboard/components/tf-imports/google/d3.html @@ -0,0 +1 @@ + diff --git a/tensorflow/tensorboard/components/tf-imports/google/dagre.html b/tensorflow/tensorboard/components/tf-imports/google/dagre.html new file mode 100644 index 00000000000..ea68d72e770 --- /dev/null +++ b/tensorflow/tensorboard/components/tf-imports/google/dagre.html @@ -0,0 +1 @@ + diff --git a/tensorflow/tensorboard/components/tf-imports/google/graphlib.html b/tensorflow/tensorboard/components/tf-imports/google/graphlib.html new file mode 100644 index 00000000000..51fd0e679de --- /dev/null +++ b/tensorflow/tensorboard/components/tf-imports/google/graphlib.html @@ -0,0 +1 @@ + diff --git a/tensorflow/tensorboard/components/tf-imports/google/lodash.html b/tensorflow/tensorboard/components/tf-imports/google/lodash.html new file mode 100644 index 00000000000..58f06ec84f8 --- /dev/null +++ b/tensorflow/tensorboard/components/tf-imports/google/lodash.html @@ -0,0 +1 @@ + diff --git a/tensorflow/tensorboard/components/tf-imports/google/plottable.html b/tensorflow/tensorboard/components/tf-imports/google/plottable.html new file mode 100644 index 00000000000..df9acdd2715 --- /dev/null +++ b/tensorflow/tensorboard/components/tf-imports/google/plottable.html @@ -0,0 +1,2 @@ + + diff --git a/tensorflow/tensorboard/components/tf-imports/graphlib.html b/tensorflow/tensorboard/components/tf-imports/graphlib.html new file mode 100644 index 00000000000..03d28765abd --- /dev/null +++ b/tensorflow/tensorboard/components/tf-imports/graphlib.html @@ -0,0 +1,2 @@ + + diff --git a/tensorflow/tensorboard/components/tf-imports/lodash.html b/tensorflow/tensorboard/components/tf-imports/lodash.html new file mode 100644 index 00000000000..1e94d2c1c4c --- /dev/null +++ b/tensorflow/tensorboard/components/tf-imports/lodash.html @@ -0,0 +1 @@ + diff --git a/tensorflow/tensorboard/components/tf-imports/plottable.html b/tensorflow/tensorboard/components/tf-imports/plottable.html new file mode 100644 index 00000000000..5789a5be4dc --- /dev/null +++ b/tensorflow/tensorboard/components/tf-imports/plottable.html @@ -0,0 +1,3 @@ + + + diff --git a/tensorflow/tensorboard/components/tf-multi-checkbox/demo/index.html b/tensorflow/tensorboard/components/tf-multi-checkbox/demo/index.html index e5661b98bc7..6f4d7839f7b 100644 --- a/tensorflow/tensorboard/components/tf-multi-checkbox/demo/index.html +++ b/tensorflow/tensorboard/components/tf-multi-checkbox/demo/index.html @@ -1,8 +1,8 @@ - - + + diff --git a/tensorflow/tensorboard/components/tf-multi-checkbox/tf-multi-checkbox.html b/tensorflow/tensorboard/components/tf-multi-checkbox/tf-multi-checkbox.html index a5447e8f5e1..18dc50cd54d 100644 --- a/tensorflow/tensorboard/components/tf-multi-checkbox/tf-multi-checkbox.html +++ b/tensorflow/tensorboard/components/tf-multi-checkbox/tf-multi-checkbox.html @@ -1,6 +1,6 @@ - +