diff options
-rw-r--r-- | tensorflow/tensorboard/components/tf-backend/router.ts | 20 | ||||
-rw-r--r-- | tensorflow/tensorboard/components/tf-backend/test/backendTests.ts | 9 | ||||
-rw-r--r-- | tensorflow/tensorboard/components/tf-backend/test/data/compressedHistograms_run_run1_tag_histo1.json (renamed from tensorflow/tensorboard/components/tf-backend/test/data/compressedHistograms_run_run1_tag_histo1) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/components/tf-backend/test/data/histograms_run_run1_tag_histo1.json (renamed from tensorflow/tensorboard/components/tf-backend/test/data/histograms_run_run1_tag_histo1) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/components/tf-backend/test/data/images_run_run1_tag_im1.json (renamed from tensorflow/tensorboard/components/tf-backend/test/data/images_run_run1_tag_im1) | 2 | ||||
-rw-r--r-- | tensorflow/tensorboard/components/tf-backend/test/data/individualImage_index_0_tag_im1_run_run1.png (renamed from tensorflow/tensorboard/components/tf-backend/test/data/individualImage_index_0_tag_im1_run_run1) | bin | 42 -> 42 bytes | |||
-rw-r--r-- | tensorflow/tensorboard/components/tf-backend/test/data/runs.json (renamed from tensorflow/tensorboard/components/tf-backend/test/data/runs) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/components/tf-backend/test/data/scalars.json (renamed from tensorflow/tensorboard/components/tf-backend/test/data/scalars) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/components/tf-backend/test/data/scalars_run_run1_tag_cross_entropy__281_29.json (renamed from tensorflow/tensorboard/components/tf-backend/test/data/scalars_run_run1_tag_cross_entropy__281_29) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1.json (renamed from tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1.json (renamed from tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2.json (renamed from tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/graph_run_run1.pbtxt (renamed from tensorflow/tensorboard/demo/data/graph_run_run1) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/graph_run_run2.pbtxt (renamed from tensorflow/tensorboard/demo/data/graph_run_run2) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1.json (renamed from tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1.json (renamed from tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2.json (renamed from tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0 | 1 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0.json | 1 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0 | 1 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0.json | 1 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0 | 1 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0.json | 1 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run1.png (renamed from tensorflow/tensorboard/demo/data/individualImage_run_run1_tag_im1_2Fimage_2F0_index_0) | bin | 118 -> 118 bytes | |||
-rw-r--r-- | tensorflow/tensorboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run2.png (renamed from tensorflow/tensorboard/demo/data/individualImage_run_run2_tag_im1_2Fimage_2F0_index_0) | bin | 120 -> 120 bytes | |||
-rw-r--r-- | tensorflow/tensorboard/demo/data/individualImage_tag_im2_2Fimage_2F0_index_0_run_run1.png (renamed from tensorflow/tensorboard/demo/data/individualImage_run_run1_tag_im2_2Fimage_2F0_index_0) | bin | 120 -> 120 bytes | |||
-rw-r--r-- | tensorflow/tensorboard/demo/data/runs | 1 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/runs.json | 1 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/scalars | 1 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/scalars.json | 1 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/scalars_run_run1_tag_bar_2Fsquare.json (renamed from tensorflow/tensorboard/demo/data/scalars_run_run1_tag_bar_2Fsquare) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos.json (renamed from tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin.json (renamed from tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare.json (renamed from tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare.json (renamed from tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos.json (renamed from tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare.json (renamed from tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare) | 0 | ||||
-rw-r--r-- | tensorflow/tensorboard/scripts/serialize_tensorboard.py | 13 |
38 files changed, 34 insertions, 20 deletions
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.json index 8b4c088392..8b4c088392 100644 --- 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.json 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.json index a5600a356e..a5600a356e 100644 --- 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.json 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.json index a42c30686c..fd2a96b62f 100644 --- 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.json @@ -1 +1 @@ -[{"wall_time": 0, "step": 0, "query": "index=0&tag=im1&run=run1", "width": 1, "height": 1}]
\ No newline at end of file +[{"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.png Binary files differindex f191b280ce..f191b280ce 100644 --- 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.png diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/runs b/tensorflow/tensorboard/components/tf-backend/test/data/runs.json index 6d10a675b0..6d10a675b0 100644 --- a/tensorflow/tensorboard/components/tf-backend/test/data/runs +++ b/tensorflow/tensorboard/components/tf-backend/test/data/runs.json diff --git a/tensorflow/tensorboard/components/tf-backend/test/data/scalars b/tensorflow/tensorboard/components/tf-backend/test/data/scalars.json index bc9d3353d5..bc9d3353d5 100644 --- a/tensorflow/tensorboard/components/tf-backend/test/data/scalars +++ b/tensorflow/tensorboard/components/tf-backend/test/data/scalars.json 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.json index 97b0062f0f..97b0062f0f 100644 --- 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.json diff --git a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1 b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1.json index 6ae6fbf880..6ae6fbf880 100644 --- a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1 +++ b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run1_tag_histo1.json diff --git a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1 b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1.json index 3ad520c568..3ad520c568 100644 --- a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1 +++ b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo1.json diff --git a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2 b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2.json index a3802ba236..a3802ba236 100644 --- a/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2 +++ b/tensorflow/tensorboard/demo/data/compressedHistograms_run_run2_tag_histo2.json diff --git a/tensorflow/tensorboard/demo/data/graph_run_run1 b/tensorflow/tensorboard/demo/data/graph_run_run1.pbtxt index 2a6af32840..2a6af32840 100644 --- a/tensorflow/tensorboard/demo/data/graph_run_run1 +++ b/tensorflow/tensorboard/demo/data/graph_run_run1.pbtxt diff --git a/tensorflow/tensorboard/demo/data/graph_run_run2 b/tensorflow/tensorboard/demo/data/graph_run_run2.pbtxt index a5a4d65d5c..a5a4d65d5c 100644 --- a/tensorflow/tensorboard/demo/data/graph_run_run2 +++ b/tensorflow/tensorboard/demo/data/graph_run_run2.pbtxt diff --git a/tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1 b/tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1.json index a5600a356e..a5600a356e 100644 --- a/tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1 +++ b/tensorflow/tensorboard/demo/data/histograms_run_run1_tag_histo1.json diff --git a/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1 b/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1.json index 407c375d2f..407c375d2f 100644 --- a/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1 +++ b/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo1.json diff --git a/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2 b/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2.json index 752b621ab0..752b621ab0 100644 --- a/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2 +++ b/tensorflow/tensorboard/demo/data/histograms_run_run2_tag_histo2.json 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_tag_im1_2Fimage_2F0_index_0_run_run1.png Binary files differindex 346fd0076b..346fd0076b 100644 --- a/tensorflow/tensorboard/demo/data/individualImage_run_run1_tag_im1_2Fimage_2F0_index_0 +++ b/tensorflow/tensorboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run1.png diff --git a/tensorflow/tensorboard/demo/data/individualImage_run_run2_tag_im1_2Fimage_2F0_index_0 b/tensorflow/tensorboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run2.png Binary files differindex 26d2d10aca..26d2d10aca 100644 --- a/tensorflow/tensorboard/demo/data/individualImage_run_run2_tag_im1_2Fimage_2F0_index_0 +++ b/tensorflow/tensorboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run2.png diff --git a/tensorflow/tensorboard/demo/data/individualImage_run_run1_tag_im2_2Fimage_2F0_index_0 b/tensorflow/tensorboard/demo/data/individualImage_tag_im2_2Fimage_2F0_index_0_run_run1.png Binary files differindex 6c41906294..6c41906294 100644 --- a/tensorflow/tensorboard/demo/data/individualImage_run_run1_tag_im2_2Fimage_2F0_index_0 +++ b/tensorflow/tensorboard/demo/data/individualImage_tag_im2_2Fimage_2F0_index_0_run_run1.png 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.json index 6d584fb4a9..6d584fb4a9 100644 --- a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_bar_2Fsquare +++ b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_bar_2Fsquare.json diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos.json index 025eaa16e9..025eaa16e9 100644 --- a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos +++ b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fcos.json diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin.json index eae69dd78f..eae69dd78f 100644 --- a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin +++ b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsin.json diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare.json index 6d584fb4a9..6d584fb4a9 100644 --- a/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare +++ b/tensorflow/tensorboard/demo/data/scalars_run_run1_tag_foo_2Fsquare.json diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare.json index 6d584fb4a9..6d584fb4a9 100644 --- a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare +++ b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_bar_2Fsquare.json diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos.json index dd3593f9d1..dd3593f9d1 100644 --- a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos +++ b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fcos.json diff --git a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare.json index 0ff9ef0551..0ff9ef0551 100644 --- a/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare +++ b/tensorflow/tensorboard/demo/data/scalars_run_run2_tag_foo_2Fsquare.json 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 :) |