From 9986acdaa49ee554ea11a6bdd7377a96a2a44922 Mon Sep 17 00:00:00 2001 From: Dan Mané Date: Tue, 5 Apr 2016 13:21:28 -0800 Subject: Change how TensorBoard demo routing works, so that it will load on TensorFlow.org Change: 119090272 --- .../tensorboard/components/tf-backend/router.ts | 20 +++++++++++++---- .../components/tf-backend/test/backendTests.ts | 9 ++++---- .../data/compressedHistograms_run_run1_tag_histo1 | 1 - .../compressedHistograms_run_run1_tag_histo1.json | 1 + .../test/data/histograms_run_run1_tag_histo1 | 1 - .../test/data/histograms_run_run1_tag_histo1.json | 1 + .../tf-backend/test/data/images_run_run1_tag_im1 | 1 - .../test/data/images_run_run1_tag_im1.json | 1 + .../data/individualImage_index_0_tag_im1_run_run1 | Bin 42 -> 0 bytes .../individualImage_index_0_tag_im1_run_run1.png | Bin 0 -> 42 bytes .../components/tf-backend/test/data/runs | 24 --------------------- .../components/tf-backend/test/data/runs.json | 24 +++++++++++++++++++++ .../components/tf-backend/test/data/scalars | 1 - .../components/tf-backend/test/data/scalars.json | 1 + .../scalars_run_run1_tag_cross_entropy__281_29 | 1 - ...scalars_run_run1_tag_cross_entropy__281_29.json | 1 + .../data/compressedHistograms_run_run1_tag_histo1 | 1 - .../compressedHistograms_run_run1_tag_histo1.json | 1 + .../data/compressedHistograms_run_run2_tag_histo1 | 1 - .../compressedHistograms_run_run2_tag_histo1.json | 1 + .../data/compressedHistograms_run_run2_tag_histo2 | 1 - .../compressedHistograms_run_run2_tag_histo2.json | 1 + tensorflow/tensorboard/demo/data/graph_run_run1 | 9 -------- .../tensorboard/demo/data/graph_run_run1.pbtxt | 9 ++++++++ tensorflow/tensorboard/demo/data/graph_run_run2 | 15 ------------- .../tensorboard/demo/data/graph_run_run2.pbtxt | 15 +++++++++++++ .../demo/data/histograms_run_run1_tag_histo1 | 1 - .../demo/data/histograms_run_run1_tag_histo1.json | 1 + .../demo/data/histograms_run_run2_tag_histo1 | 1 - .../demo/data/histograms_run_run2_tag_histo1.json | 1 + .../demo/data/histograms_run_run2_tag_histo2 | 1 - .../demo/data/histograms_run_run2_tag_histo2.json | 1 + .../demo/data/images_run_run1_tag_im1_2Fimage_2F0 | 1 - .../data/images_run_run1_tag_im1_2Fimage_2F0.json | 1 + .../demo/data/images_run_run1_tag_im2_2Fimage_2F0 | 1 - .../data/images_run_run1_tag_im2_2Fimage_2F0.json | 1 + .../demo/data/images_run_run2_tag_im1_2Fimage_2F0 | 1 - .../data/images_run_run2_tag_im1_2Fimage_2F0.json | 1 + ...idualImage_run_run1_tag_im1_2Fimage_2F0_index_0 | Bin 118 -> 0 bytes ...idualImage_run_run1_tag_im2_2Fimage_2F0_index_0 | Bin 120 -> 0 bytes ...idualImage_run_run2_tag_im1_2Fimage_2F0_index_0 | Bin 120 -> 0 bytes ...lImage_tag_im1_2Fimage_2F0_index_0_run_run1.png | Bin 0 -> 118 bytes ...lImage_tag_im1_2Fimage_2F0_index_0_run_run2.png | Bin 0 -> 120 bytes ...lImage_tag_im2_2Fimage_2F0_index_0_run_run1.png | Bin 0 -> 120 bytes tensorflow/tensorboard/demo/data/runs | 1 - tensorflow/tensorboard/demo/data/runs.json | 1 + tensorflow/tensorboard/demo/data/scalars | 1 - tensorflow/tensorboard/demo/data/scalars.json | 1 + .../demo/data/scalars_run_run1_tag_bar_2Fsquare | 1 - .../data/scalars_run_run1_tag_bar_2Fsquare.json | 1 + .../demo/data/scalars_run_run1_tag_foo_2Fcos | 1 - .../demo/data/scalars_run_run1_tag_foo_2Fcos.json | 1 + .../demo/data/scalars_run_run1_tag_foo_2Fsin | 1 - .../demo/data/scalars_run_run1_tag_foo_2Fsin.json | 1 + .../demo/data/scalars_run_run1_tag_foo_2Fsquare | 1 - .../data/scalars_run_run1_tag_foo_2Fsquare.json | 1 + .../demo/data/scalars_run_run2_tag_bar_2Fsquare | 1 - .../data/scalars_run_run2_tag_bar_2Fsquare.json | 1 + .../demo/data/scalars_run_run2_tag_foo_2Fcos | 1 - .../demo/data/scalars_run_run2_tag_foo_2Fcos.json | 1 + .../demo/data/scalars_run_run2_tag_foo_2Fsquare | 1 - .../data/scalars_run_run2_tag_foo_2Fsquare.json | 1 + .../tensorboard/scripts/serialize_tensorboard.py | 13 ++++++----- 63 files changed, 99 insertions(+), 85 deletions(-) delete mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/compressedHistograms_run_run1_tag_histo1 create mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/compressedHistograms_run_run1_tag_histo1.json delete mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/histograms_run_run1_tag_histo1 create mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/histograms_run_run1_tag_histo1.json delete mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/images_run_run1_tag_im1 create mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/images_run_run1_tag_im1.json delete mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/individualImage_index_0_tag_im1_run_run1 create mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/individualImage_index_0_tag_im1_run_run1.png delete mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/runs create mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/runs.json delete mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/scalars create mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/scalars.json delete mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/scalars_run_run1_tag_cross_entropy__281_29 create mode 100644 tensorflow/tensorboard/components/tf-backend/test/data/scalars_run_run1_tag_cross_entropy__281_29.json delete mode 100644 tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1 create mode 100644 tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1.json delete mode 100644 tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1 create mode 100644 tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1.json delete mode 100644 tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2 create mode 100644 tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2.json delete mode 100644 tensorflow/tensorboard/demo/data/graph_run_run1 create mode 100644 tensorflow/tensorboard/demo/data/graph_run_run1.pbtxt delete mode 100644 tensorflow/tensorboard/demo/data/graph_run_run2 create mode 100644 tensorflow/tensorboard/demo/data/graph_run_run2.pbtxt delete mode 100644 tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1 create mode 100644 tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1.json delete mode 100644 tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1 create mode 100644 tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1.json delete mode 100644 tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2 create mode 100644 tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2.json delete mode 100644 tensorflow/tensorboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0 create mode 100644 tensorflow/tensorboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0.json delete mode 100644 tensorflow/tensorboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0 create mode 100644 tensorflow/tensorboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0.json delete mode 100644 tensorflow/tensorboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0 create mode 100644 tensorflow/tensorboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0.json delete mode 100644 tensorflow/tensorboard/demo/data/individualImage_run_run1_tag_im1_2Fimage_2F0_index_0 delete mode 100644 tensorflow/tensorboard/demo/data/individualImage_run_run1_tag_im2_2Fimage_2F0_index_0 delete mode 100644 tensorflow/tensorboard/demo/data/individualImage_run_run2_tag_im1_2Fimage_2F0_index_0 create mode 100644 tensorflow/tensorboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run1.png create mode 100644 tensorflow/tensorboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run2.png create mode 100644 tensorflow/tensorboard/demo/data/individualImage_tag_im2_2Fimage_2F0_index_0_run_run1.png delete mode 100644 tensorflow/tensorboard/demo/data/runs create mode 100644 tensorflow/tensorboard/demo/data/runs.json delete mode 100644 tensorflow/tensorboard/demo/data/scalars create mode 100644 tensorflow/tensorboard/demo/data/scalars.json delete mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run1_tag_bar_2Fsquare create mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run1_tag_bar_2Fsquare.json delete mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos create mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos.json delete mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin create mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin.json delete mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare create mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare.json delete mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare create mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare.json delete mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos create mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos.json delete mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare create mode 100644 tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare.json diff --git a/tensorflow/tensorboard/components/tf-backend/router.ts b/tensorflow/tensorboard/components/tf-backend/router.ts index fc9bbcd5d7..15d7a838e2 100644 --- a/tensorflow/tensorboard/components/tf-backend/router.ts +++ b/tensorflow/tensorboard/components/tf-backend/router.ts @@ -39,11 +39,19 @@ module TF.Backend { } function standardRoute(route: string): ((tag: string, run: string) => string) { return function(tag: string, run: string): string { - return dataDir + "/" + route + clean(queryEncoder({tag: tag, run: run})); + var url = dataDir + "/" + route + clean(queryEncoder({tag: tag, run: run})); + if (demoMode) { + url += ".json"; + } + return url; }; } function individualImageUrl(query: string) { - return dataDir + "/" + clean("individualImage?" + query); + var url = dataDir + "/" + clean("individualImage?" + query); + if (demoMode) { + url += ".png"; + } + return url; } function graphUrl(run: string, limit_attr_size?: number, large_attrs_key?: string) { @@ -57,10 +65,14 @@ module TF.Backend { let query = query_params.map(param => { return param[0] + "=" + encodeURIComponent(param[1]); }).join("&"); - return dataDir + "/graph" + clean("?" + query); + var url = dataDir + "/graph" + clean("?" + query); + if (demoMode) { + url += ".pbtxt"; + } + return url; } return { - runs: () => dataDir + "/runs", + runs: () => dataDir + "/runs" + (demoMode ? ".json" : ""), individualImage: individualImageUrl, graph: graphUrl, scalars: standardRoute("scalars"), diff --git a/tensorflow/tensorboard/components/tf-backend/test/backendTests.ts b/tensorflow/tensorboard/components/tf-backend/test/backendTests.ts index e60eaee692..3c2911fe83 100644 --- a/tensorflow/tensorboard/components/tf-backend/test/backendTests.ts +++ b/tensorflow/tensorboard/components/tf-backend/test/backendTests.ts @@ -46,16 +46,16 @@ module TF.Backend { var backend: Backend; var rm: RequestManager; var base = "data"; + var demoRouter = TF.Backend.router(base, true); beforeEach(function() { // Construct a demo Backend (third param is true) - var router = TF.Backend.router(base, true); - backend = new Backend(router); + backend = new Backend(demoRouter); rm = new RequestManager(); }); it("runs are loaded properly", function(done) { var runsResponse = backend.runs(); - var actualRuns = rm.request(base + "/runs"); + var actualRuns = rm.request(demoRouter.runs()); Promise.all([runsResponse, actualRuns]).then((values) => { assert.deepEqual(values[0], values[1]); done(); @@ -103,8 +103,7 @@ module TF.Backend { assert.isNumber(image.width); assert.isNumber(image.height); var nonDemoQuery = "index=0&tag=im1&run=run1"; - var nonDemoUrl = "individualImage?" + nonDemoQuery; - var expectedUrl = base + "/" + TF.Backend.demoify(nonDemoUrl); + var expectedUrl = demoRouter.individualImage(nonDemoQuery); assert.equal(image.url, expectedUrl); done(); }); diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/compressedHistograms_run_run1_tag_histo1 b/tensorflow/tensorboard/components/tf-backend/test/data/compressedHistograms_run_run1_tag_histo1 deleted file mode 100644 index 8b4c088392..0000000000 --- a/tensorflow/tensorboard/components/tf-backend/test/data/compressedHistograms_run_run1_tag_histo1 +++ /dev/null @@ -1 +0,0 @@ -[[0, 0, [[0, -2.3150592308536755], [668, -2.0967547155036605], [1587, -1.4326244423655616], [3085, -0.8871306575801902], [5000, -0.09312398815580714], [6915, 0.2584093405812282], [8413, 0.8895470642005087], [9332, 1.3198979614453679], [10000, 1.6793308878855118]]], [100.0, 10, [[0, -1.3417572789138936], [668, -1.183563374619141], [1587, -0.48920418783271574], [3085, 0.29326906896076954], [5000, 0.56953784145381], [6915, 0.8684655583499333], [8413, 1.4133127368907181], [9332, 1.906140650457873], [10000, 2.135771998171255]]], [200.0, 20, [[0, -1.5066917525035333], [668, -1.3910909571770793], [1587, -0.902737218885874], [3085, -0.3807791904765027], [5000, 0.38900200905253046], [6915, 0.8209734209339482], [8413, 1.302385856695965], [9332, 1.9324626053521639], [10000, 2.957505317875451]]], [300.0, 30, [[0, -0.5430457051469562], [668, -0.4626161834245273], [1587, 0.21573949543027715], [3085, 0.37353741100174215], [5000, 0.6891407881591103], [6915, 1.0927156232630852], [8413, 1.2745337159550916], [9332, 1.4321116832891605], [10000, 2.1913774993059034]]], [400.0, 40, [[0, -0.3584790755077172], [668, -0.33301611509753215], [1587, -0.1089466072951948], [3085, 0.5792199847585249], [5000, 1.220854943811942], [6915, 1.759829438421432], [8413, 2.3072559906741614], [9332, 2.753036118353921], [10000, 3.0267252195784047]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/compressedHistograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/components/tf-backend/test/data/compressedHistograms_run_run1_tag_histo1.json new file mode 100644 index 0000000000..8b4c088392 --- /dev/null +++ b/tensorflow/tensorboard/components/tf-backend/test/data/compressedHistograms_run_run1_tag_histo1.json @@ -0,0 +1 @@ +[[0, 0, [[0, -2.3150592308536755], [668, -2.0967547155036605], [1587, -1.4326244423655616], [3085, -0.8871306575801902], [5000, -0.09312398815580714], [6915, 0.2584093405812282], [8413, 0.8895470642005087], [9332, 1.3198979614453679], [10000, 1.6793308878855118]]], [100.0, 10, [[0, -1.3417572789138936], [668, -1.183563374619141], [1587, -0.48920418783271574], [3085, 0.29326906896076954], [5000, 0.56953784145381], [6915, 0.8684655583499333], [8413, 1.4133127368907181], [9332, 1.906140650457873], [10000, 2.135771998171255]]], [200.0, 20, [[0, -1.5066917525035333], [668, -1.3910909571770793], [1587, -0.902737218885874], [3085, -0.3807791904765027], [5000, 0.38900200905253046], [6915, 0.8209734209339482], [8413, 1.302385856695965], [9332, 1.9324626053521639], [10000, 2.957505317875451]]], [300.0, 30, [[0, -0.5430457051469562], [668, -0.4626161834245273], [1587, 0.21573949543027715], [3085, 0.37353741100174215], [5000, 0.6891407881591103], [6915, 1.0927156232630852], [8413, 1.2745337159550916], [9332, 1.4321116832891605], [10000, 2.1913774993059034]]], [400.0, 40, [[0, -0.3584790755077172], [668, -0.33301611509753215], [1587, -0.1089466072951948], [3085, 0.5792199847585249], [5000, 1.220854943811942], [6915, 1.759829438421432], [8413, 2.3072559906741614], [9332, 2.753036118353921], [10000, 3.0267252195784047]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/histograms_run_run1_tag_histo1 b/tensorflow/tensorboard/components/tf-backend/test/data/histograms_run_run1_tag_histo1 deleted file mode 100644 index a5600a356e..0000000000 --- a/tensorflow/tensorboard/components/tf-backend/test/data/histograms_run_run1_tag_histo1 +++ /dev/null @@ -1 +0,0 @@ -[[400.0, 40, [-0.3584790755077172, 3.0267252195784047, 20.0, 24.012225532303315, 48.29045006426564, [-0.35363819004775493, -0.29226296698161564, -0.19961953895336082, 0.3214892636797772, 0.5177616740489182, 0.56953784145381, 0.6264916255991911, 0.7580548669750213, 0.8338603536725235, 1.220854943811942, 1.3429404381931362, 1.47723448201245, 1.624957930213695, 1.7874537232350647, 1.9661990955585713, 2.379100905625872, 2.6170109961884593, 3.1665833053880363], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 1.0, 1.0, 2.0]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/histograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/components/tf-backend/test/data/histograms_run_run1_tag_histo1.json new file mode 100644 index 0000000000..a5600a356e --- /dev/null +++ b/tensorflow/tensorboard/components/tf-backend/test/data/histograms_run_run1_tag_histo1.json @@ -0,0 +1 @@ +[[400.0, 40, [-0.3584790755077172, 3.0267252195784047, 20.0, 24.012225532303315, 48.29045006426564, [-0.35363819004775493, -0.29226296698161564, -0.19961953895336082, 0.3214892636797772, 0.5177616740489182, 0.56953784145381, 0.6264916255991911, 0.7580548669750213, 0.8338603536725235, 1.220854943811942, 1.3429404381931362, 1.47723448201245, 1.624957930213695, 1.7874537232350647, 1.9661990955585713, 2.379100905625872, 2.6170109961884593, 3.1665833053880363], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 1.0, 1.0, 2.0]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/images_run_run1_tag_im1 b/tensorflow/tensorboard/components/tf-backend/test/data/images_run_run1_tag_im1 deleted file mode 100644 index a42c30686c..0000000000 --- a/tensorflow/tensorboard/components/tf-backend/test/data/images_run_run1_tag_im1 +++ /dev/null @@ -1 +0,0 @@ -[{"wall_time": 0, "step": 0, "query": "index=0&tag=im1&run=run1", "width": 1, "height": 1}] \ No newline at end of file diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/images_run_run1_tag_im1.json b/tensorflow/tensorboard/components/tf-backend/test/data/images_run_run1_tag_im1.json new file mode 100644 index 0000000000..fd2a96b62f --- /dev/null +++ b/tensorflow/tensorboard/components/tf-backend/test/data/images_run_run1_tag_im1.json @@ -0,0 +1 @@ +[{"wall_time": 0, "step": 0, "query": "index=0&tag=im1&run=run1", "width": 1, "height": 1}] diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/individualImage_index_0_tag_im1_run_run1 b/tensorflow/tensorboard/components/tf-backend/test/data/individualImage_index_0_tag_im1_run_run1 deleted file mode 100644 index f191b280ce..0000000000 Binary files a/tensorflow/tensorboard/components/tf-backend/test/data/individualImage_index_0_tag_im1_run_run1 and /dev/null differ diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/individualImage_index_0_tag_im1_run_run1.png b/tensorflow/tensorboard/components/tf-backend/test/data/individualImage_index_0_tag_im1_run_run1.png new file mode 100644 index 0000000000..f191b280ce Binary files /dev/null and b/tensorflow/tensorboard/components/tf-backend/test/data/individualImage_index_0_tag_im1_run_run1.png differ diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/runs b/tensorflow/tensorboard/components/tf-backend/test/data/runs deleted file mode 100644 index 6d10a675b0..0000000000 --- a/tensorflow/tensorboard/components/tf-backend/test/data/runs +++ /dev/null @@ -1,24 +0,0 @@ -{ - "run1": { - "images": [ - "im1" - ], - "scalars": [ - "cross_entropy (1)" - ], - "histograms": [ - "histo1" - ], - "compressedHistograms": [ - "histo1" - ], - "graph": false - }, - "fake_run_no_data": { - "images": ["im1", "im2"], - "scalars": ["scalar2"], - "histograms": ["histo1"], - "compressedHistograms": ["histo1"], - "graph": true - } -} diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/runs.json b/tensorflow/tensorboard/components/tf-backend/test/data/runs.json new file mode 100644 index 0000000000..6d10a675b0 --- /dev/null +++ b/tensorflow/tensorboard/components/tf-backend/test/data/runs.json @@ -0,0 +1,24 @@ +{ + "run1": { + "images": [ + "im1" + ], + "scalars": [ + "cross_entropy (1)" + ], + "histograms": [ + "histo1" + ], + "compressedHistograms": [ + "histo1" + ], + "graph": false + }, + "fake_run_no_data": { + "images": ["im1", "im2"], + "scalars": ["scalar2"], + "histograms": ["histo1"], + "compressedHistograms": ["histo1"], + "graph": true + } +} diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/scalars b/tensorflow/tensorboard/components/tf-backend/test/data/scalars deleted file mode 100644 index bc9d3353d5..0000000000 --- a/tensorflow/tensorboard/components/tf-backend/test/data/scalars +++ /dev/null @@ -1 +0,0 @@ -{"run1": {"cross_entropy (1)": [[0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]}} \ No newline at end of file diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/scalars.json b/tensorflow/tensorboard/components/tf-backend/test/data/scalars.json new file mode 100644 index 0000000000..bc9d3353d5 --- /dev/null +++ b/tensorflow/tensorboard/components/tf-backend/test/data/scalars.json @@ -0,0 +1 @@ +{"run1": {"cross_entropy (1)": [[0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]}} \ No newline at end of file diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/scalars_run_run1_tag_cross_entropy__281_29 b/tensorflow/tensorboard/components/tf-backend/test/data/scalars_run_run1_tag_cross_entropy__281_29 deleted file mode 100644 index 97b0062f0f..0000000000 --- a/tensorflow/tensorboard/components/tf-backend/test/data/scalars_run_run1_tag_cross_entropy__281_29 +++ /dev/null @@ -1 +0,0 @@ -[[0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]] \ No newline at end of file diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/scalars_run_run1_tag_cross_entropy__281_29.json b/tensorflow/tensorboard/components/tf-backend/test/data/scalars_run_run1_tag_cross_entropy__281_29.json new file mode 100644 index 0000000000..97b0062f0f --- /dev/null +++ b/tensorflow/tensorboard/components/tf-backend/test/data/scalars_run_run1_tag_cross_entropy__281_29.json @@ -0,0 +1 @@ +[[0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1 b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1 deleted file mode 100644 index 6ae6fbf880..0000000000 --- a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1 +++ /dev/null @@ -1 +0,0 @@ -[[0.0, 0, [[0, -2.3150592308536755], [668, -2.0967547155036605], [1587, -1.4326244423655616], [3085, -0.8871306575801902], [5000, -0.09312398815580714], [6915, 0.2584093405812282], [8413, 0.8895470642005087], [9332, 1.3198979614453679], [10000, 1.6793308878855118]]], [100.0, 10, [[0, -1.3417572789138936], [668, -1.183563374619141], [1587, -0.48920418783271574], [3085, 0.29326906896076954], [5000, 0.56953784145381], [6915, 0.8684655583499333], [8413, 1.4133127368907181], [9332, 1.906140650457873], [10000, 2.135771998171255]]], [200.0, 20, [[0, -1.5066917525035333], [668, -1.3910909571770793], [1587, -0.902737218885874], [3085, -0.3807791904765027], [5000, 0.38900200905253046], [6915, 0.8209734209339482], [8413, 1.302385856695965], [9332, 1.9324626053521639], [10000, 2.957505317875451]]], [300.0, 30, [[0, -0.5430457051469562], [668, -0.4626161834245273], [1587, 0.21573949543027715], [3085, 0.37353741100174215], [5000, 0.6891407881591103], [6915, 1.0927156232630852], [8413, 1.2745337159550916], [9332, 1.4321116832891605], [10000, 2.1913774993059034]]], [400.0, 40, [[0, -0.3584790755077172], [668, -0.33301611509753215], [1587, -0.1089466072951948], [3085, 0.5792199847585249], [5000, 1.220854943811942], [6915, 1.759829438421432], [8413, 2.3072559906741614], [9332, 2.753036118353921], [10000, 3.0267252195784047]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1.json new file mode 100644 index 0000000000..6ae6fbf880 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1.json @@ -0,0 +1 @@ +[[0.0, 0, [[0, -2.3150592308536755], [668, -2.0967547155036605], [1587, -1.4326244423655616], [3085, -0.8871306575801902], [5000, -0.09312398815580714], [6915, 0.2584093405812282], [8413, 0.8895470642005087], [9332, 1.3198979614453679], [10000, 1.6793308878855118]]], [100.0, 10, [[0, -1.3417572789138936], [668, -1.183563374619141], [1587, -0.48920418783271574], [3085, 0.29326906896076954], [5000, 0.56953784145381], [6915, 0.8684655583499333], [8413, 1.4133127368907181], [9332, 1.906140650457873], [10000, 2.135771998171255]]], [200.0, 20, [[0, -1.5066917525035333], [668, -1.3910909571770793], [1587, -0.902737218885874], [3085, -0.3807791904765027], [5000, 0.38900200905253046], [6915, 0.8209734209339482], [8413, 1.302385856695965], [9332, 1.9324626053521639], [10000, 2.957505317875451]]], [300.0, 30, [[0, -0.5430457051469562], [668, -0.4626161834245273], [1587, 0.21573949543027715], [3085, 0.37353741100174215], [5000, 0.6891407881591103], [6915, 1.0927156232630852], [8413, 1.2745337159550916], [9332, 1.4321116832891605], [10000, 2.1913774993059034]]], [400.0, 40, [[0, -0.3584790755077172], [668, -0.33301611509753215], [1587, -0.1089466072951948], [3085, 0.5792199847585249], [5000, 1.220854943811942], [6915, 1.759829438421432], [8413, 2.3072559906741614], [9332, 2.753036118353921], [10000, 3.0267252195784047]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1 b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1 deleted file mode 100644 index 3ad520c568..0000000000 --- a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1 +++ /dev/null @@ -1 +0,0 @@ -[[0.0, 0, [[0, -3.6801669545044846], [668, -3.192188140974744], [1587, -2.3414678549368806], [3085, -0.9632173471995873], [5000, -0.3214892636797772], [6915, 0.11870794142185205], [8413, 0.8895470642005087], [9332, 1.183563374619141], [10000, 2.665663810418372]]], [100.0, 10, [[0, -3.564793583751807], [668, -3.376844436865802], [1587, -1.0366615731293798], [3085, -0.27318696312672563], [5000, 0.9718642422053263], [6915, 2.5765662807928194], [8413, 3.1415385101545126], [9332, 4.085981768607621], [10000, 4.623079406808927]]], [200.0, 20, [[0, -2.235172510433281], [668, -2.004569042815611], [1587, -1.2015432383370985], [3085, 0.11835464933202625], [5000, 0.56953784145381], [6915, 1.202844810963146], [8413, 2.689066032283515], [9332, 2.8494015726499944], [10000, 3.481377676013788]]], [300.0, 30, [[0, -3.360113978269659], [668, -2.8293185004961043], [1587, -1.5992540502266783], [3085, 0.14393860259807117], [5000, 1.47723448201245], [6915, 1.9510057389110733], [8413, 2.833176104473626], [9332, 4.142405216576347], [10000, 4.706937777668589]]], [400.0, 40, [[0, -2.599286228987632], [668, -2.240365897443259], [1587, -1.5992540502266783], [3085, -0.9101893288861387], [5000, 0.7580548669750213], [6915, 1.6009864433919474], [8413, 2.3504002974280036], [9332, 2.7907805263353733], [10000, 3.5098048900144323]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1.json b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1.json new file mode 100644 index 0000000000..3ad520c568 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1.json @@ -0,0 +1 @@ +[[0.0, 0, [[0, -3.6801669545044846], [668, -3.192188140974744], [1587, -2.3414678549368806], [3085, -0.9632173471995873], [5000, -0.3214892636797772], [6915, 0.11870794142185205], [8413, 0.8895470642005087], [9332, 1.183563374619141], [10000, 2.665663810418372]]], [100.0, 10, [[0, -3.564793583751807], [668, -3.376844436865802], [1587, -1.0366615731293798], [3085, -0.27318696312672563], [5000, 0.9718642422053263], [6915, 2.5765662807928194], [8413, 3.1415385101545126], [9332, 4.085981768607621], [10000, 4.623079406808927]]], [200.0, 20, [[0, -2.235172510433281], [668, -2.004569042815611], [1587, -1.2015432383370985], [3085, 0.11835464933202625], [5000, 0.56953784145381], [6915, 1.202844810963146], [8413, 2.689066032283515], [9332, 2.8494015726499944], [10000, 3.481377676013788]]], [300.0, 30, [[0, -3.360113978269659], [668, -2.8293185004961043], [1587, -1.5992540502266783], [3085, 0.14393860259807117], [5000, 1.47723448201245], [6915, 1.9510057389110733], [8413, 2.833176104473626], [9332, 4.142405216576347], [10000, 4.706937777668589]]], [400.0, 40, [[0, -2.599286228987632], [668, -2.240365897443259], [1587, -1.5992540502266783], [3085, -0.9101893288861387], [5000, 0.7580548669750213], [6915, 1.6009864433919474], [8413, 2.3504002974280036], [9332, 2.7907805263353733], [10000, 3.5098048900144323]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2 b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2 deleted file mode 100644 index a3802ba236..0000000000 --- a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2 +++ /dev/null @@ -1 +0,0 @@ -[[0.0, 0, [[0, -1.9291158122759586], [668, -1.5970765333488954], [1587, -1.0923120348519078], [3085, -0.6688082872192093], [5000, 0.09312398815580714], [6915, 0.44532789251701854], [8413, 0.8238009655877649], [9332, 1.0357232383581656], [10000, 1.2741043689144438]]], [100.0, 10, [[0, -0.7780725642449806], [668, -0.7138496178727424], [1587, -0.5448932415735014], [3085, -0.24370397454796228], [5000, 0.42790220995778355], [6915, 0.6191730643365096], [8413, 0.752059342118037], [9332, 1.0451472255274825], [10000, 2.5559479569222825]]], [200.0, 20, [[0, -1.3876904425996377], [668, -1.1464188862638496], [1587, -0.4049955219067526], [3085, 0.04721394862139682], [5000, 0.56953784145381], [6915, 1.3221859041483333], [8413, 1.6188495656305735], [9332, 1.7613953069723651], [10000, 2.3257482385477384]]], [300.0, 30, [[0, -1.600772629982185], [668, -1.1548516185367033], [1587, -0.260387173785447], [3085, 0.17416570914366614], [5000, 0.47069243095356195], [6915, 1.1559276581637614], [8413, 2.0474031182051404], [9332, 2.18821711651116], [10000, 2.2393193406467518]]], [400.0, 40, [[0, -0.8286852465281818], [668, -0.7815041529866706], [1587, -0.3334896444053469], [3085, 0.21085213041026643], [5000, 0.5177616740489182], [6915, 1.077122434649409], [8413, 1.5898009703967424], [9332, 1.8859097291499742], [10000, 2.0954239138728523]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2.json b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2.json new file mode 100644 index 0000000000..a3802ba236 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2.json @@ -0,0 +1 @@ +[[0.0, 0, [[0, -1.9291158122759586], [668, -1.5970765333488954], [1587, -1.0923120348519078], [3085, -0.6688082872192093], [5000, 0.09312398815580714], [6915, 0.44532789251701854], [8413, 0.8238009655877649], [9332, 1.0357232383581656], [10000, 1.2741043689144438]]], [100.0, 10, [[0, -0.7780725642449806], [668, -0.7138496178727424], [1587, -0.5448932415735014], [3085, -0.24370397454796228], [5000, 0.42790220995778355], [6915, 0.6191730643365096], [8413, 0.752059342118037], [9332, 1.0451472255274825], [10000, 2.5559479569222825]]], [200.0, 20, [[0, -1.3876904425996377], [668, -1.1464188862638496], [1587, -0.4049955219067526], [3085, 0.04721394862139682], [5000, 0.56953784145381], [6915, 1.3221859041483333], [8413, 1.6188495656305735], [9332, 1.7613953069723651], [10000, 2.3257482385477384]]], [300.0, 30, [[0, -1.600772629982185], [668, -1.1548516185367033], [1587, -0.260387173785447], [3085, 0.17416570914366614], [5000, 0.47069243095356195], [6915, 1.1559276581637614], [8413, 2.0474031182051404], [9332, 2.18821711651116], [10000, 2.2393193406467518]]], [400.0, 40, [[0, -0.8286852465281818], [668, -0.7815041529866706], [1587, -0.3334896444053469], [3085, 0.21085213041026643], [5000, 0.5177616740489182], [6915, 1.077122434649409], [8413, 1.5898009703967424], [9332, 1.8859097291499742], [10000, 2.0954239138728523]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/graph_run_run1 b/tensorflow/tensorboard/demo/data/graph_run_run1 deleted file mode 100644 index 2a6af32840..0000000000 --- a/tensorflow/tensorboard/demo/data/graph_run_run1 +++ /dev/null @@ -1,9 +0,0 @@ -node { - name: "a" - op: "matmul" -} -node { - name: "b" - op: "matmul" - input: "a:0" -} diff --git a/tensorflow/tensorboard/demo/data/graph_run_run1.pbtxt b/tensorflow/tensorboard/demo/data/graph_run_run1.pbtxt new file mode 100644 index 0000000000..2a6af32840 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/graph_run_run1.pbtxt @@ -0,0 +1,9 @@ +node { + name: "a" + op: "matmul" +} +node { + name: "b" + op: "matmul" + input: "a:0" +} diff --git a/tensorflow/tensorboard/demo/data/graph_run_run2 b/tensorflow/tensorboard/demo/data/graph_run_run2 deleted file mode 100644 index a5a4d65d5c..0000000000 --- a/tensorflow/tensorboard/demo/data/graph_run_run2 +++ /dev/null @@ -1,15 +0,0 @@ -node { - name: "a" - op: "matmul" -} -node { - name: "b" - op: "matmul" - input: "a:0" -} -node { - name: "c" - op: "matmul" - input: "a:0" - input: "b:0" -} diff --git a/tensorflow/tensorboard/demo/data/graph_run_run2.pbtxt b/tensorflow/tensorboard/demo/data/graph_run_run2.pbtxt new file mode 100644 index 0000000000..a5a4d65d5c --- /dev/null +++ b/tensorflow/tensorboard/demo/data/graph_run_run2.pbtxt @@ -0,0 +1,15 @@ +node { + name: "a" + op: "matmul" +} +node { + name: "b" + op: "matmul" + input: "a:0" +} +node { + name: "c" + op: "matmul" + input: "a:0" + input: "b:0" +} diff --git a/tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1 b/tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1 deleted file mode 100644 index a5600a356e..0000000000 --- a/tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1 +++ /dev/null @@ -1 +0,0 @@ -[[400.0, 40, [-0.3584790755077172, 3.0267252195784047, 20.0, 24.012225532303315, 48.29045006426564, [-0.35363819004775493, -0.29226296698161564, -0.19961953895336082, 0.3214892636797772, 0.5177616740489182, 0.56953784145381, 0.6264916255991911, 0.7580548669750213, 0.8338603536725235, 1.220854943811942, 1.3429404381931362, 1.47723448201245, 1.624957930213695, 1.7874537232350647, 1.9661990955585713, 2.379100905625872, 2.6170109961884593, 3.1665833053880363], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 1.0, 1.0, 2.0]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1.json new file mode 100644 index 0000000000..a5600a356e --- /dev/null +++ b/tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1.json @@ -0,0 +1 @@ +[[400.0, 40, [-0.3584790755077172, 3.0267252195784047, 20.0, 24.012225532303315, 48.29045006426564, [-0.35363819004775493, -0.29226296698161564, -0.19961953895336082, 0.3214892636797772, 0.5177616740489182, 0.56953784145381, 0.6264916255991911, 0.7580548669750213, 0.8338603536725235, 1.220854943811942, 1.3429404381931362, 1.47723448201245, 1.624957930213695, 1.7874537232350647, 1.9661990955585713, 2.379100905625872, 2.6170109961884593, 3.1665833053880363], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 1.0, 1.0, 2.0]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1 b/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1 deleted file mode 100644 index 407c375d2f..0000000000 --- a/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1 +++ /dev/null @@ -1 +0,0 @@ -[[400.0, 40, [-2.599286228987632, 3.5098048900144323, 20.0, 10.792285491200078, 66.66796979177158, [-2.379100905625872, -1.9661990955585713, -1.624957930213695, -1.47723448201245, -1.109868130738129, -1.0089710279437536, -0.42790220995778355, -0.2195814928486969, 0.47069243095356195, 0.7580548669750213, 0.917246389039776, 1.3429404381931362, 1.624957930213695, 1.7874537232350647, 2.1628190051144287, 2.6170109961884593, 2.8787120958073054, 3.8315657995195243], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 1.0, 1.0, 2.0, 1.0, 1.0]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1.json b/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1.json new file mode 100644 index 0000000000..407c375d2f --- /dev/null +++ b/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1.json @@ -0,0 +1 @@ +[[400.0, 40, [-2.599286228987632, 3.5098048900144323, 20.0, 10.792285491200078, 66.66796979177158, [-2.379100905625872, -1.9661990955585713, -1.624957930213695, -1.47723448201245, -1.109868130738129, -1.0089710279437536, -0.42790220995778355, -0.2195814928486969, 0.47069243095356195, 0.7580548669750213, 0.917246389039776, 1.3429404381931362, 1.624957930213695, 1.7874537232350647, 2.1628190051144287, 2.6170109961884593, 2.8787120958073054, 3.8315657995195243], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 1.0, 1.0, 2.0, 1.0, 1.0]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2 b/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2 deleted file mode 100644 index 752b621ab0..0000000000 --- a/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2 +++ /dev/null @@ -1 +0,0 @@ -[[400.0, 40, [-0.8286852465281818, 2.0954239138728523, 20.0, 13.546880465642861, 24.14836803774091, [-0.7580548669750213, -0.38900200905253046, -0.06996543062044111, 0.07696197368248522, 0.19961953895336082, 0.2656936063469233, 0.29226296698161564, 0.5177616740489182, 0.7580548669750213, 0.917246389039776, 1.109868130738129, 1.220854943811942, 1.624957930213695, 2.1628190051144287], [2.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 2.0, 1.0, 1.0, 1.0, 2.0, 3.0]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2.json b/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2.json new file mode 100644 index 0000000000..752b621ab0 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2.json @@ -0,0 +1 @@ +[[400.0, 40, [-0.8286852465281818, 2.0954239138728523, 20.0, 13.546880465642861, 24.14836803774091, [-0.7580548669750213, -0.38900200905253046, -0.06996543062044111, 0.07696197368248522, 0.19961953895336082, 0.2656936063469233, 0.29226296698161564, 0.5177616740489182, 0.7580548669750213, 0.917246389039776, 1.109868130738129, 1.220854943811942, 1.624957930213695, 2.1628190051144287], [2.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 2.0, 1.0, 1.0, 1.0, 2.0, 3.0]]]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0 b/tensorflow/tensorboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0 deleted file mode 100644 index 7bccd27d07..0000000000 --- a/tensorflow/tensorboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0 +++ /dev/null @@ -1 +0,0 @@ -[{"wall_time": 1459200389.088045, "step": 0, "height": 4, "width": 4, "query": "run=run1&tag=im1%2Fimage%2F0&index=0"}] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0.json b/tensorflow/tensorboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0.json new file mode 100644 index 0000000000..814b4193c6 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0.json @@ -0,0 +1 @@ +[{"wall_time": 1459200389.088045, "width": 4, "height": 4, "step": 0, "query": "tag=im1%2Fimage%2F0&index=0&run=run1"}] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0 b/tensorflow/tensorboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0 deleted file mode 100644 index c6e164febf..0000000000 --- a/tensorflow/tensorboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0 +++ /dev/null @@ -1 +0,0 @@ -[{"wall_time": 1459200389.093653, "step": 0, "height": 4, "width": 4, "query": "run=run1&tag=im2%2Fimage%2F0&index=0"}] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0.json b/tensorflow/tensorboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0.json new file mode 100644 index 0000000000..0c2bdcfc79 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0.json @@ -0,0 +1 @@ +[{"wall_time": 1459200389.093653, "width": 4, "height": 4, "step": 0, "query": "tag=im2%2Fimage%2F0&index=0&run=run1"}] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0 b/tensorflow/tensorboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0 deleted file mode 100644 index ab3b30e736..0000000000 --- a/tensorflow/tensorboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0 +++ /dev/null @@ -1 +0,0 @@ -[{"wall_time": 1459200389.117463, "step": 0, "height": 4, "width": 4, "query": "run=run2&tag=im1%2Fimage%2F0&index=0"}] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0.json b/tensorflow/tensorboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0.json new file mode 100644 index 0000000000..3160aae366 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0.json @@ -0,0 +1 @@ +[{"wall_time": 1459200389.117463, "width": 4, "height": 4, "step": 0, "query": "tag=im1%2Fimage%2F0&index=0&run=run2"}] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/individualImage_run_run1_tag_im1_2Fimage_2F0_index_0 b/tensorflow/tensorboard/demo/data/individualImage_run_run1_tag_im1_2Fimage_2F0_index_0 deleted file mode 100644 index 346fd0076b..0000000000 Binary files a/tensorflow/tensorboard/demo/data/individualImage_run_run1_tag_im1_2Fimage_2F0_index_0 and /dev/null differ diff --git a/tensorflow/tensorboard/demo/data/individualImage_run_run1_tag_im2_2Fimage_2F0_index_0 b/tensorflow/tensorboard/demo/data/individualImage_run_run1_tag_im2_2Fimage_2F0_index_0 deleted file mode 100644 index 6c41906294..0000000000 Binary files a/tensorflow/tensorboard/demo/data/individualImage_run_run1_tag_im2_2Fimage_2F0_index_0 and /dev/null differ diff --git a/tensorflow/tensorboard/demo/data/individualImage_run_run2_tag_im1_2Fimage_2F0_index_0 b/tensorflow/tensorboard/demo/data/individualImage_run_run2_tag_im1_2Fimage_2F0_index_0 deleted file mode 100644 index 26d2d10aca..0000000000 Binary files a/tensorflow/tensorboard/demo/data/individualImage_run_run2_tag_im1_2Fimage_2F0_index_0 and /dev/null differ diff --git a/tensorflow/tensorboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run1.png b/tensorflow/tensorboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run1.png new file mode 100644 index 0000000000..346fd0076b Binary files /dev/null and b/tensorflow/tensorboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run1.png differ diff --git a/tensorflow/tensorboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run2.png b/tensorflow/tensorboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run2.png new file mode 100644 index 0000000000..26d2d10aca Binary files /dev/null and b/tensorflow/tensorboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run2.png differ diff --git a/tensorflow/tensorboard/demo/data/individualImage_tag_im2_2Fimage_2F0_index_0_run_run1.png b/tensorflow/tensorboard/demo/data/individualImage_tag_im2_2Fimage_2F0_index_0_run_run1.png new file mode 100644 index 0000000000..6c41906294 Binary files /dev/null and b/tensorflow/tensorboard/demo/data/individualImage_tag_im2_2Fimage_2F0_index_0_run_run1.png differ diff --git a/tensorflow/tensorboard/demo/data/runs b/tensorflow/tensorboard/demo/data/runs deleted file mode 100644 index 43ebf6d243..0000000000 --- a/tensorflow/tensorboard/demo/data/runs +++ /dev/null @@ -1 +0,0 @@ -{"run2": {"histograms": ["histo1", "histo2"], "images": ["im1/image/0"], "graph": true, "compressedHistograms": ["histo1", "histo2"], "scalars": ["foo/square", "bar/square", "foo/cos"]}, "run1": {"histograms": ["histo1"], "images": ["im2/image/0", "im1/image/0"], "graph": true, "compressedHistograms": ["histo1"], "scalars": ["foo/square", "bar/square", "foo/cos", "foo/sin"]}} \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/runs.json b/tensorflow/tensorboard/demo/data/runs.json new file mode 100644 index 0000000000..cae632cd41 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/runs.json @@ -0,0 +1 @@ +{"run2": {"histograms": ["histo1", "histo2"], "run_metadata": [], "scalars": ["foo/cos", "bar/square", "foo/square"], "graph": true, "images": ["im1/image/0"], "compressedHistograms": ["histo1", "histo2"]}, "run1": {"histograms": ["histo1"], "run_metadata": [], "scalars": ["foo/sin", "foo/cos", "bar/square", "foo/square"], "graph": true, "images": ["im2/image/0", "im1/image/0"], "compressedHistograms": ["histo1"]}} \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars b/tensorflow/tensorboard/demo/data/scalars deleted file mode 100644 index ea6676d6a3..0000000000 --- a/tensorflow/tensorboard/demo/data/scalars +++ /dev/null @@ -1 +0,0 @@ -{"run2": {"foo/square": [[0.0, 0, 0.0], [10.0, 1, 2.0], [20.0, 2, 8.0], [30.0, 3, 18.0], [40.0, 4, 32.0]], "bar/square": [[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]], "foo/cos": [[0.0, 0, 2.0], [10.0, 1, 1.0806045532226562], [20.0, 2, -0.832293689250946], [30.0, 3, -1.979984998703003], [40.0, 4, -1.3072872161865234]]}, "run1": {"foo/square": [[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]], "bar/square": [[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]], "foo/cos": [[0.0, 0, 1.0], [10.0, 1, 0.5403022766113281], [20.0, 2, -0.416146844625473], [30.0, 3, -0.9899924993515015], [40.0, 4, -0.6536436080932617]], "foo/sin": [[0.0, 0, 0.0], [10.0, 1, 0.8414709568023682], [20.0, 2, 0.9092974066734314], [30.0, 3, 0.14112000167369843], [40.0, 4, -0.756802499294281]]}} \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars.json b/tensorflow/tensorboard/demo/data/scalars.json new file mode 100644 index 0000000000..bc269395b6 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/scalars.json @@ -0,0 +1 @@ +{"run2": {"foo/cos": [[0.0, 0, 2.0], [10.0, 1, 1.0806045532226562], [20.0, 2, -0.832293689250946], [30.0, 3, -1.979984998703003], [40.0, 4, -1.3072872161865234]], "bar/square": [[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]], "foo/square": [[0.0, 0, 0.0], [10.0, 1, 2.0], [20.0, 2, 8.0], [30.0, 3, 18.0], [40.0, 4, 32.0]]}, "run1": {"foo/sin": [[0.0, 0, 0.0], [10.0, 1, 0.8414709568023682], [20.0, 2, 0.9092974066734314], [30.0, 3, 0.14112000167369843], [40.0, 4, -0.756802499294281]], "foo/cos": [[0.0, 0, 1.0], [10.0, 1, 0.5403022766113281], [20.0, 2, -0.416146844625473], [30.0, 3, -0.9899924993515015], [40.0, 4, -0.6536436080932617]], "bar/square": [[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]], "foo/square": [[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]}} \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_bar_2Fsquare b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_bar_2Fsquare deleted file mode 100644 index 6d584fb4a9..0000000000 --- a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_bar_2Fsquare +++ /dev/null @@ -1 +0,0 @@ -[[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_bar_2Fsquare.json b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_bar_2Fsquare.json new file mode 100644 index 0000000000..6d584fb4a9 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_bar_2Fsquare.json @@ -0,0 +1 @@ +[[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos deleted file mode 100644 index 025eaa16e9..0000000000 --- a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos +++ /dev/null @@ -1 +0,0 @@ -[[0.0, 0, 1.0], [10.0, 1, 0.5403022766113281], [20.0, 2, -0.416146844625473], [30.0, 3, -0.9899924993515015], [40.0, 4, -0.6536436080932617]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos.json b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos.json new file mode 100644 index 0000000000..025eaa16e9 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos.json @@ -0,0 +1 @@ +[[0.0, 0, 1.0], [10.0, 1, 0.5403022766113281], [20.0, 2, -0.416146844625473], [30.0, 3, -0.9899924993515015], [40.0, 4, -0.6536436080932617]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin deleted file mode 100644 index eae69dd78f..0000000000 --- a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin +++ /dev/null @@ -1 +0,0 @@ -[[0.0, 0, 0.0], [10.0, 1, 0.8414709568023682], [20.0, 2, 0.9092974066734314], [30.0, 3, 0.14112000167369843], [40.0, 4, -0.756802499294281]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin.json b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin.json new file mode 100644 index 0000000000..eae69dd78f --- /dev/null +++ b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin.json @@ -0,0 +1 @@ +[[0.0, 0, 0.0], [10.0, 1, 0.8414709568023682], [20.0, 2, 0.9092974066734314], [30.0, 3, 0.14112000167369843], [40.0, 4, -0.756802499294281]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare deleted file mode 100644 index 6d584fb4a9..0000000000 --- a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare +++ /dev/null @@ -1 +0,0 @@ -[[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare.json b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare.json new file mode 100644 index 0000000000..6d584fb4a9 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare.json @@ -0,0 +1 @@ +[[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare deleted file mode 100644 index 6d584fb4a9..0000000000 --- a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare +++ /dev/null @@ -1 +0,0 @@ -[[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare.json b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare.json new file mode 100644 index 0000000000..6d584fb4a9 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare.json @@ -0,0 +1 @@ +[[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos deleted file mode 100644 index dd3593f9d1..0000000000 --- a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos +++ /dev/null @@ -1 +0,0 @@ -[[0.0, 0, 2.0], [10.0, 1, 1.0806045532226562], [20.0, 2, -0.832293689250946], [30.0, 3, -1.979984998703003], [40.0, 4, -1.3072872161865234]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos.json b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos.json new file mode 100644 index 0000000000..dd3593f9d1 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos.json @@ -0,0 +1 @@ +[[0.0, 0, 2.0], [10.0, 1, 1.0806045532226562], [20.0, 2, -0.832293689250946], [30.0, 3, -1.979984998703003], [40.0, 4, -1.3072872161865234]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare deleted file mode 100644 index 0ff9ef0551..0000000000 --- a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare +++ /dev/null @@ -1 +0,0 @@ -[[0.0, 0, 0.0], [10.0, 1, 2.0], [20.0, 2, 8.0], [30.0, 3, 18.0], [40.0, 4, 32.0]] \ No newline at end of file diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare.json b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare.json new file mode 100644 index 0000000000..0ff9ef0551 --- /dev/null +++ b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare.json @@ -0,0 +1 @@ +[[0.0, 0, 0.0], [10.0, 1, 2.0], [20.0, 2, 8.0], [30.0, 3, 18.0], [40.0, 4, 32.0]] \ No newline at end of file diff --git a/tensorflow/tensorboard/scripts/serialize_tensorboard.py b/tensorflow/tensorboard/scripts/serialize_tensorboard.py index 8b5d5d71de..f62a04656f 100644 --- a/tensorflow/tensorboard/scripts/serialize_tensorboard.py +++ b/tensorflow/tensorboard/scripts/serialize_tensorboard.py @@ -58,6 +58,9 @@ tf.flags.DEFINE_boolean( FLAGS = tf.flags.FLAGS BAD_CHARACTERS = "#%&{}\\/<>*? $!'\":@+`|=" +DEFAULT_SUFFIX = '.json' +IMAGE_SUFFIX = '.png' +GRAPH_SUFFIX = '.pbtxt' def Url(route, params): @@ -85,13 +88,13 @@ class TensorBoardStaticSerializer(object): EnsureDirectoryExists(os.path.join(target_path, 'data')) self.path = target_path - def GetAndSave(self, url, unzip=False): + def GetAndSave(self, url, save_suffix, unzip=False): """GET the given url. Serialize the result at clean path version of url.""" self.connection.request('GET', '/data/' + url, headers={'content-type': 'text/plain'}) response = self.connection.getresponse() - destination = self.path + '/data/' + Clean(url) + destination = self.path + '/data/' + Clean(url) + save_suffix if response.status != 200: raise IOError(url) @@ -109,7 +112,7 @@ class TensorBoardStaticSerializer(object): def GetRouteAndSave(self, route, params=None): """GET given route and params. Serialize the result. Return as JSON.""" url = Url(route, params) - return json.loads(self.GetAndSave(url)) + return json.loads(self.GetAndSave(url, DEFAULT_SUFFIX)) def Run(self): """Serialize everything from a TensorBoard backend.""" @@ -127,14 +130,14 @@ class TensorBoardStaticSerializer(object): # in this case, tags is a bool which specifies if graph is present. if tags: url = Url('graph', {'run': run}) - self.GetAndSave(url, unzip=True) + self.GetAndSave(url, GRAPH_SUFFIX, unzip=True) elif tag_type == 'images': for t in tags: images = self.GetRouteAndSave('images', {'run': run, 'tag': t}) for im in images: url = 'individualImage?' + im['query'] # pull down the images themselves. - self.GetAndSave(url) + self.GetAndSave(url, IMAGE_SUFFIX) else: for t in tags: # Save this, whatever it is :) -- cgit v1.2.3