scalars: commit chart changes in batch

tensorboard/components_polymer3/tf_backend/requestManager.ts

@@ -92,6 +92,12 @@ export class RequestOptions {
   }
 }
 
+// Form data for a POST request as a convenient multidict interface.
+// A raw string value is equivalent to a singleton array.
+export interface PostData {
+  [key: string]: string | string[];
+}
+
 export class RequestManager {
   private _queue: ResolveReject[];
   private _maxRetries: number;
@@ -108,12 +114,7 @@ export class RequestManager {
    * postData is provided, this request will use POST, not GET. This is an
    * object mapping POST keys to string values.
    */
-  public request(
-    url: string,
-    postData?: {
-      [key: string]: string;
-    }
-  ): Promise<any> {
+  public request(url: string, postData?: PostData): Promise<any> {
     const requestOptions = requestOptionsFromPostData(postData);
     return this.requestWithOptions(url, requestOptions);
   }
@@ -272,9 +273,7 @@ function buildXMLHttpRequest(
   return req;
 }
 
-function requestOptionsFromPostData(postData?: {
-  [key: string]: string;
-}): RequestOptions {
+function requestOptionsFromPostData(postData?: PostData): RequestOptions {
   const result = new RequestOptions();
   if (!postData) {
     result.methodType = HttpMethodType.GET;
@@ -285,13 +284,12 @@ function requestOptionsFromPostData(postData?: {
   return result;
 }
 
-function formDataFromDictionary(postData: {[key: string]: string}) {
+function formDataFromDictionary(postData: PostData) {
   const formData = new FormData();
-  for (let postKey in postData) {
-    if (postKey) {
-      // The linter requires 'for in' loops to be filtered by an if
-      // condition.
-      formData.append(postKey, postData[postKey]);
+  for (const [key, maybeValues] of Object.entries(postData)) {
+    const values = Array.isArray(maybeValues) ? maybeValues : [maybeValues];
+    for (const value of values) {
+      formData.append(key, value);
     }
   }
   return formData;

tensorboard/components_polymer3/tf_line_chart_data_loader/tf-line-chart-data-loader.ts

@@ -207,6 +207,7 @@ class _TfLineChartDataLoader<ScalarMetadata>
   _maybeRenderedInBadState: boolean = false;
 
   onLoadFinish() {
+    this.commitChanges();
     if (this.dataToLoad.length > 0 && this._resetDomainOnNextLoad) {
       // (Don't unset _resetDomainOnNextLoad when we didn't
       // load any runs: this has the effect that if all our

tensorboard/plugins/scalar/http_api.md

@@ -61,3 +61,25 @@ instead be in CSV format:
     1443856985.705543,1448,0.7461960315704346
     1443857105.704628,3438,0.5427092909812927
     1443857225.705133,5417,0.5457325577735901
+
+## `/data/plugin/scalars/scalars_multirun` (POST)
+
+Accepts form-encoded POST data with a (required) singleton key `tag` and a
+repeated key `runs`. Returns a JSON object mapping run names to arrays of the
+form returned by `/data/plugin/scalars/scalars`. A run will only be present in
+the output if there actually exists data for that run-tag combination. If there
+is no data for some or all of the run-tag combinations, no error is raised, but
+the response may lack runs requested in the input or be an empty object
+entirely.
+
+Example:
+
+    {
+      "train": [
+        [1443856985.705543, 1448, 0.7461960315704346],
+        [1443857105.704628, 3438, 0.5427092909812927]
+      ],
+      "test": [
+        [1443857225.705133, 5417, 0.5457325577735901],
+      ]
+    }

tensorboard/plugins/scalar/polymer3/tf_scalar_dashboard/tf-scalar-card.ts

@@ -225,16 +225,19 @@ export class TfScalarCard extends PolymerElement {
 
   // This function is called when data is received from the backend.
   @property({type: Object})
-  _loadDataCallback: object = (scalarChart, datum, data) => {
-    const formattedData = data.map((datum) => ({
+  _loadDataCallback: object = (scalarChart, item, maybeData) => {
+    if (maybeData == null) {
+      console.error('Failed to load data for:', item);
+      return;
+    }
+    const formattedData = maybeData.map((datum) => ({
       wall_time: new Date(datum[0] * 1000),
       step: datum[1],
       scalar: datum[2],
     }));
-    const name = this._getSeriesNameFromDatum(datum);
-    scalarChart.setSeriesMetadata(name, datum);
+    const name = this._getSeriesNameFromDatum(item);
+    scalarChart.setSeriesMetadata(name, item);
     scalarChart.setSeriesData(name, formattedData);
-    scalarChart.commitChanges();
   };
 
   @property({type: Object})
@@ -257,19 +260,33 @@ export class TfScalarCard extends PolymerElement {
   // this.requestManager.request(
   //      this.getDataLoadUrl({tag, run, experiment})
   @property({type: Object})
-  requestData: RequestDataCallback<RunTagItem, ScalarDatum[]> = (
+  requestData: RequestDataCallback<RunTagItem, ScalarDatum[] | null> = (
     items,
     onLoad,
     onFinish
   ) => {
     const router = getRouter();
-    const baseUrl = router.pluginRoute('scalars', '/scalars');
+    const url = router.pluginRoute('scalars', '/scalars_multirun');
+    const runsByTag = new Map<string, string[]>();
+    for (const {tag, run} of items) {
+      let runs = runsByTag.get(tag);
+      if (runs == null) {
+        runsByTag.set(tag, (runs = []));
+      }
+      runs.push(run);
+    }
     Promise.all(
-      items.map((item) => {
-        const url = addParams(baseUrl, {tag: item.tag, run: item.run});
-        return this.requestManager
-          .request(url)
-          .then((data) => void onLoad({item, data}));
+      Array.from(runsByTag.entries()).map(([tag, runs]) => {
+        return this.requestManager.request(url, {tag, runs}).then((allData) => {
+          for (const run of runs) {
+            const item = {tag, run};
+            if (Object.prototype.hasOwnProperty.call(allData, run)) {
+              onLoad({item, data: allData[run]});
+            } else {
+              onLoad({item, data: null});
+            }
+          }
+        });
       })
     ).finally(() => void onFinish());
   };

tensorboard/plugins/scalar/scalars_plugin.py

@@ -26,6 +26,7 @@
 
 import six
 from six import StringIO
+import werkzeug.exceptions
 from werkzeug import wrappers
 
 from tensorboard import errors
@@ -64,6 +65,7 @@ def __init__(self, context):
     def get_plugin_apps(self):
         return {
             "/scalars": self.scalars_route,
+            "/scalars_multirun": self.scalars_multirun_route,
             "/tags": self.tags_route,
         }
 
@@ -115,6 +117,21 @@ def scalars_impl(self, ctx, tag, run, experiment, output_format):
         else:
             return (values, "application/json")
 
+    def scalars_multirun_impl(self, ctx, tag, runs, experiment):
+        """Result of the form `(body, mime_type)`."""
+        all_scalars = self._data_provider.read_scalars(
+            ctx,
+            experiment_id=experiment,
+            plugin_name=metadata.PLUGIN_NAME,
+            downsample=self._downsample_to,
+            run_tag_filter=provider.RunTagFilter(runs=runs, tags=[tag]),
+        )
+        body = {
+            run: [(x.wall_time, x.step, x.value) for x in run_data[tag]]
+            for (run, run_data) in all_scalars.items()
+        }
+        return (body, "application/json")
+
     @wrappers.Request.application
     def tags_route(self, request):
         ctx = plugin_util.context(request.environ)
@@ -140,3 +157,20 @@ def scalars_route(self, request):
             ctx, tag, run, experiment, output_format
         )
         return http_util.Respond(request, body, mime_type)
+
+    @wrappers.Request.application
+    def scalars_multirun_route(self, request):
+        """Given a tag and list of runs, return dict of ScalarEvent arrays."""
+        if request.method != "POST":
+            raise werkzeug.exceptions.MethodNotAllowed(["POST"])
+        tag = request.form.get("tag")
+        runs = request.form.getlist("runs")
+        if tag is None:
+            raise errors.InvalidArgumentError("tag must be specified")
+
+        ctx = plugin_util.context(request.environ)
+        experiment = plugin_util.experiment_id(request.environ)
+        (body, mime_type) = self.scalars_multirun_impl(
+            ctx, tag, runs, experiment
+        )
+        return http_util.Respond(request, body, mime_type)

tensorboard/plugins/scalar/scalars_plugin_test.py

@@ -58,6 +58,8 @@ class ScalarsPluginTest(tf.test.TestCase):
 
     _RUN_WITH_LEGACY_SCALARS = "_RUN_WITH_LEGACY_SCALARS"
     _RUN_WITH_SCALARS = "_RUN_WITH_SCALARS"
+    _RUN_WITH_SCALARS_2 = "_RUN_WITH_SCALARS_2"
+    _RUN_WITH_SCALARS_3 = "_RUN_WITH_SCALARS_3"
     _RUN_WITH_HISTOGRAM = "_RUN_WITH_HISTOGRAM"
 
     def load_plugin(self, run_names):
@@ -99,6 +101,20 @@ def generate_run(self, logdir, run_name):
                         display_name=self._DISPLAY_NAME,
                         description=self._DESCRIPTION,
                     ).numpy()
+                elif run_name == self._RUN_WITH_SCALARS_2:
+                    summ = summary.op(
+                        self._SCALAR_TAG,
+                        2 * tf.reduce_sum(data),
+                        display_name=self._DISPLAY_NAME,
+                        description=self._DESCRIPTION,
+                    ).numpy()
+                elif run_name == self._RUN_WITH_SCALARS_3:
+                    summ = summary.op(
+                        self._SCALAR_TAG,
+                        3 * tf.reduce_sum(data),
+                        display_name=self._DISPLAY_NAME,
+                        description=self._DESCRIPTION,
+                    ).numpy()
                 elif run_name == self._RUN_WITH_HISTOGRAM:
                     summ = tf.compat.v1.summary.histogram(
                         self._HISTOGRAM_TAG, data
@@ -191,6 +207,85 @@ def test_scalars_with_histogram(self):
         )
         self.assertEqual(404, response.status_code)
 
+    def test_scalars_multirun(self):
+        server = self.load_server(
+            [
+                self._RUN_WITH_SCALARS,
+                self._RUN_WITH_SCALARS_2,
+                self._RUN_WITH_SCALARS_3,
+            ]
+        )
+        response = server.post(
+            "/data/plugin/scalars/scalars_multirun",
+            data={
+                "tag": "%s/scalar_summary" % self._SCALAR_TAG,
+                "runs": [
+                    self._RUN_WITH_SCALARS,
+                    # skip _RUN_WITH_SCALARS_2
+                    self._RUN_WITH_SCALARS_3,
+                    self._RUN_WITH_HISTOGRAM,  # no data for this tag; okay
+                    "nonexistent_run",  # no data at all; okay
+                ],
+            },
+        )
+        self.assertEqual(200, response.status_code)
+        self.assertEqual("application/json", response.headers["Content-Type"])
+        data = json.loads(response.get_data())
+        self.assertCountEqual(
+            [self._RUN_WITH_SCALARS, self._RUN_WITH_SCALARS_3], data
+        )
+        self.assertLen(data[self._RUN_WITH_SCALARS], self._STEPS)
+        self.assertLen(data[self._RUN_WITH_SCALARS_3], self._STEPS)
+        self.assertNotEqual(
+            data[self._RUN_WITH_SCALARS][0][2],
+            data[self._RUN_WITH_SCALARS_3][0][2],
+        )
+
+    def test_scalars_multirun_single_run(self):
+        # Checks for any problems with singleton arrays.
+        server = self.load_server(
+            [
+                self._RUN_WITH_SCALARS,
+                self._RUN_WITH_SCALARS_2,
+                self._RUN_WITH_SCALARS_3,
+            ]
+        )
+        response = server.post(
+            "/data/plugin/scalars/scalars_multirun",
+            data={
+                "tag": "%s/scalar_summary" % self._SCALAR_TAG,
+                "runs": [self._RUN_WITH_SCALARS],
+            },
+        )
+        self.assertEqual(200, response.status_code)
+        self.assertEqual("application/json", response.headers["Content-Type"])
+        data = json.loads(response.get_data())
+        self.assertCountEqual([self._RUN_WITH_SCALARS], data)
+        self.assertLen(data[self._RUN_WITH_SCALARS], self._STEPS)
+
+    def test_scalars_multirun_no_tag(self):
+        server = self.load_server([self._RUN_WITH_SCALARS])
+        response = server.post(
+            "/data/plugin/scalars/scalars_multirun",
+            data={"runs": [self._RUN_WITH_SCALARS, self._RUN_WITH_SCALARS_2]},
+        )
+        self.assertEqual(400, response.status_code)
+        self.assertIn(
+            "tag must be specified", response.get_data().decode("utf-8")
+        )
+
+    def test_scalars_multirun_bad_method(self):
+        server = self.load_server([self._RUN_WITH_SCALARS])
+        response = server.get(
+            "/data/plugin/scalars/scalars_multirun",
+            query_string={
+                "tag": "%s/scalar_summary" % self._SCALAR_TAG,
+                "runs": [self._RUN_WITH_SCALARS, self._RUN_WITH_SCALARS_3,],
+            },
+        )
+        self.assertEqual(405, response.status_code)
+        self.assertEqual(response.headers["Allow"], "POST")
+
     def test_active_with_legacy_scalars(self):
         plugin = self.load_plugin([self._RUN_WITH_LEGACY_SCALARS])
         self.assertFalse(plugin.is_active())