Skip to content

Commit a8512e2

Browse files
author
Daniel W Mane
authored
Merge pull request tensorflow#4137 from danmane/tb-27
Merge TensorBoard 28 into r0.10
2 parents c6aaf8e + 1d71246 commit a8512e2

File tree

149 files changed

+16153
-4367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+16153
-4367
lines changed

‎WORKSPACE

Lines changed: 201 additions & 174 deletions
Large diffs are not rendered by default.

‎bower.BUILD

Lines changed: 337 additions & 0 deletions
Large diffs are not rendered by default.

‎tensorflow/tensorboard/BUILD

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ filegroup(
2020

2121
py_binary(
2222
name = "tensorboard",
23-
srcs = ["tensorboard.py"],
23+
srcs = [
24+
"__main__.py",
25+
"tensorboard.py",
26+
],
2427
data = [":frontend"],
2528
srcs_version = "PY2AND3",
2629
deps = [

‎tensorflow/tensorboard/TAG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
25
1+
28

‎tensorflow/tensorboard/__main__.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
# ==============================================================================
15+
16+
from __future__ import absolute_import
17+
from __future__ import division
18+
from __future__ import print_function
19+
20+
import sys
21+
22+
from tensorflow.tensorboard.tensorboard import main
23+
24+
if __name__ == '__main__':
25+
sys.exit(main())

‎tensorflow/tensorboard/backend/handler.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import re
3333

3434
from six import BytesIO
35+
from six import StringIO
3536
from six.moves import BaseHTTPServer
3637
from six.moves import urllib
3738
from six.moves import xrange # pylint: disable=redefined-builtin
@@ -276,7 +277,7 @@ def _serve_scalars(self, query_params):
276277
values = self._multiplexer.Scalars(run, tag)
277278

278279
if query_params.get('format') == _OutputFormat.CSV:
279-
string_io = BytesIO()
280+
string_io = StringIO()
280281
writer = csv.writer(string_io)
281282
writer.writerow(['Wall time', 'Step', 'Value'])
282283
writer.writerows(values)
@@ -353,7 +354,7 @@ def _serve_compressed_histograms(self, query_params):
353354
run = query_params.get('run')
354355
compressed_histograms = self._multiplexer.CompressedHistograms(run, tag)
355356
if query_params.get('format') == _OutputFormat.CSV:
356-
string_io = BytesIO()
357+
string_io = StringIO()
357358
writer = csv.writer(string_io)
358359

359360
# Build the headers; we have two columns for timing and two columns for

‎tensorflow/tensorboard/backend/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def ParseEventFilesSpec(logdir):
8181
run_name = None
8282
path = specification
8383
if not gcs.IsGCSPath(path):
84-
path = os.path.realpath(os.path.expanduser(path))
84+
path = os.path.realpath(path)
8585
files[path] = run_name
8686
return files
8787

‎tensorflow/tensorboard/bower.json

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@
4444
"iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#1.0.4",
4545
"iron-collapse": "PolymerElements/iron-collapse#1.0.8",
4646
"iron-dropdown": "PolymerElements/iron-dropdown#1.4.0",
47-
"iron-fit-behavior": "PolymerElements/iron-fit-behavior#1.2.1",
47+
"iron-fit-behavior": "PolymerElements/iron-fit-behavior#1.2.5",
4848
"iron-flex-layout": "PolymerElements/iron-flex-layout#1.3.0",
4949
"iron-form-element-behavior": "PolymerElements/iron-form-element-behavior#1.0.6",
5050
"iron-icon": "PolymerElements/iron-icon#1.0.8",
51+
"iron-icons": "PolymerElements/iron-icons#1.1.3",
5152
"iron-iconset-svg": "PolymerElements/iron-iconset-svg#1.0.9",
5253
"iron-input": "PolymerElements/iron-input#1.0.10",
5354
"iron-list": "PolymerElements/iron-list#1.1.7",
@@ -60,6 +61,7 @@
6061
"iron-validatable-behavior": "PolymerElements/iron-validatable-behavior#1.1.1",
6162
"lodash": "3.8.0",
6263
"neon-animation": "PolymerElements/neon-animation#1.2.2",
64+
"numericjs": "1.2.6",
6365
"paper-behaviors": "PolymerElements/paper-behaviors#1.0.11",
6466
"paper-button": "PolymerElements/paper-button#1.0.11",
6567
"paper-checkbox": "PolymerElements/paper-checkbox#1.1.3",
@@ -70,6 +72,7 @@
7072
"paper-icon-button": "PolymerElements/paper-icon-button#1.1.1",
7173
"paper-input": "PolymerElements/paper-input#1.1.14",
7274
"paper-item": "PolymerElements/paper-item#1.1.4",
75+
"paper-listbox": "PolymerElements/paper-listbox#1.1.2",
7376
"paper-material": "PolymerElements/paper-material#1.0.6",
7477
"paper-menu": "PolymerElements/paper-menu#1.2.2",
7578
"paper-menu-button": "PolymerElements/paper-menu-button#1.5.0",
@@ -84,10 +87,12 @@
8487
"paper-toolbar": "PolymerElements/paper-toolbar#1.1.4",
8588
"paper-tooltip": "PolymerElements/paper-tooltip#1.1.2",
8689
"plottable": "1.16.1",
87-
"polymer": "1.6.0",
90+
"polymer": "1.6.1",
8891
"promise-polyfill": "polymerlabs/promise-polyfill#1.0.0",
92+
"three.js": "threejs#r77",
8993
"web-animations-js": "web-animations/web-animations-js#2.2.1",
90-
"webcomponentsjs": "webcomponents/webcomponentsjs#0.7.22"
94+
"webcomponentsjs": "webcomponents/webcomponentsjs#0.7.22",
95+
"weblas": "0.9.0"
9196
},
9297
"description": "TensorBoard: Visualizations for TensorFlow",
9398
"devDependencies": {
@@ -119,7 +124,7 @@
119124
"iron-checked-element-behavior": "1.0.4",
120125
"iron-collapse": "1.0.8",
121126
"iron-dropdown": "1.4.0",
122-
"iron-fit-behavior": "1.2.1",
127+
"iron-fit-behavior": "1.2.5",
123128
"iron-flex-layout": "1.3.0",
124129
"iron-form-element-behavior": "1.0.6",
125130
"iron-icon": "1.0.8",
@@ -136,6 +141,7 @@
136141
"iron-validatable-behavior": "1.1.1",
137142
"lodash": "3.8.0",
138143
"neon-animation": "1.2.2",
144+
"numericjs": "1.2.6",
139145
"paper-behaviors": "1.0.11",
140146
"paper-button": "1.0.11",
141147
"paper-checkbox": "1.1.3",
@@ -146,6 +152,7 @@
146152
"paper-icon-button": "1.1.1",
147153
"paper-input": "1.1.14",
148154
"paper-item": "1.1.4",
155+
"paper-listbox": "1.1.2",
149156
"paper-material": "1.0.6",
150157
"paper-menu": "1.2.2",
151158
"paper-menu-button": "1.5.0",
@@ -160,10 +167,12 @@
160167
"paper-toolbar": "1.1.4",
161168
"paper-tooltip": "1.1.2",
162169
"plottable": "1.16.1",
163-
"polymer": "1.6.0",
170+
"polymer": "1.6.1",
164171
"promise-polyfill": "1.0.0",
172+
"three.js": "threejs#r77",
165173
"web-animations-js": "2.2.1",
166-
"webcomponentsjs": "0.7.22"
174+
"webcomponentsjs": "0.7.22",
175+
"weblas": "0.9.0"
167176
},
168177
"version": "0.0.0"
169178
}

‎tensorflow/tensorboard/bower/BUILD

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ filegroup(
2222
"@iron_flex_layout//:iron_flex_layout",
2323
"@iron_form_element_behavior//:iron_form_element_behavior",
2424
"@iron_icon//:iron_icon",
25+
"@iron_icons//:iron_icons",
2526
"@iron_iconset_svg//:iron_iconset_svg",
2627
"@iron_input//:iron_input",
2728
"@iron_list//:iron_list",
@@ -34,6 +35,7 @@ filegroup(
3435
"@iron_validatable_behavior//:iron_validatable_behavior",
3536
"@lodash//:lodash",
3637
"@neon_animation//:neon_animation",
38+
"@numericjs//:numericjs",
3739
"@paper_behaviors//:paper_behaviors",
3840
"@paper_button//:paper_button",
3941
"@paper_checkbox//:paper_checkbox",
@@ -44,6 +46,7 @@ filegroup(
4446
"@paper_icon_button//:paper_icon_button",
4547
"@paper_input//:paper_input",
4648
"@paper_item//:paper_item",
49+
"@paper_listbox//:paper_listbox",
4750
"@paper_material//:paper_material",
4851
"@paper_menu//:paper_menu",
4952
"@paper_menu_button//:paper_menu_button",
@@ -60,7 +63,9 @@ filegroup(
6063
"@plottable//:plottable",
6164
"@polymer//:polymer",
6265
"@promise_polyfill//:promise_polyfill",
66+
"@three_js//:three_js",
6367
"@web_animations_js//:web_animations_js",
6468
"@webcomponentsjs//:webcomponentsjs",
69+
"@weblas//:weblas",
6570
],
6671
)

‎tensorflow/tensorboard/components/index.html

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
2+
<!--
3+
@license
4+
Copyright 2016 The TensorFlow Authors. All Rights Reserved.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
219
<html>
320
<head>
421
<script src="webcomponentsjs/webcomponents-lite.min.js"></script>

‎tensorflow/tensorboard/components/tf-audio-dashboard/demo/index.html

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
2+
<!--
3+
@license
4+
Copyright 2016 The TensorFlow Authors. All Rights Reserved.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
219
<html>
320
<head>
421
<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>

‎tensorflow/tensorboard/components/tf-audio-dashboard/test/index.html

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
2+
<!--
3+
@license
4+
Copyright 2016 The TensorFlow Authors. All Rights Reserved.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
219
<html>
320
<head>
421
<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>

‎tensorflow/tensorboard/components/tf-audio-dashboard/tf-audio-dashboard.html

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
<!--
2+
@license
3+
Copyright 2016 The TensorFlow Authors. All Rights Reserved.
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
118
<link rel="import" href="../polymer/polymer.html">
219
<link rel="import" href="../paper-icon-button/paper-icon-button.html">
320
<link rel="import" href="tf-audio-grid.html">
@@ -6,6 +23,9 @@
623

724
<!--
825
tf-audio-dashboard displays a dashboard that loads audio from a TensorFlow run.
26+
27+
@element tf-audio-dashboard
28+
@demo demo/index.html
929
-->
1030
<dom-module id="tf-audio-dashboard">
1131
<template>

‎tensorflow/tensorboard/components/tf-audio-dashboard/tf-audio-grid.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
<!--
2+
@license
3+
Copyright 2016 The TensorFlow Authors. All Rights Reserved.
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
118
<link rel="import" href="../polymer/polymer.html">
219
<link rel="import" href="../paper-styles/paper-styles.html">
320
<link rel="import" href="tf-audio-loader.html">
@@ -29,6 +46,7 @@
2946
- Fix column/row names
3047
- Include hook for loading past audio (by step/timestamp? or index?)
3148
49+
@element tf-audio-grid
3250
-->
3351
<dom-module id="tf-audio-grid">
3452
<template>

‎tensorflow/tensorboard/components/tf-audio-dashboard/tf-audio-loader.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
<!--
2+
@license
3+
Copyright 2016 The TensorFlow Authors. All Rights Reserved.
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
118
<link rel="import" href="../polymer/polymer.html">
219
<link rel="import" href="../tf-imports/lodash.html">
320

@@ -6,6 +23,8 @@
623
724
Right now it always loads the most recent audio clip. We should add support in the
825
future for loading older clips.
26+
27+
@element tf-audio-loader
928
-->
1029
<dom-module id="tf-audio-loader">
1130
<style>

0 commit comments

Comments
 (0)