benchmarks: security fix and minor improvements (#363)

- Upgrade parcel-bundler to fix security issue
- Add .babelrc
- Remove the loading of weights (just load topology)
- Add navigator.userAgent to benchmarks page

DEV

integration_tests/benchmarks/.babelrc

@@ -0,0 +1,19 @@
+
+{
+  "presets": [
+    [
+      "env",
+      {
+        "esmodules": false,
+        "targets": {
+          "browsers": [
+            "> 3%"
+          ]
+        }
+      }
+    ]
+  ],
+  "plugins": [
+    "transform-runtime"
+  ]
+}

integration_tests/benchmarks/index.html

@@ -42,6 +42,9 @@ <h1>TensorFlow.js Layers: Benchmarks Demo</h1>
   <div>
     Benchmark timestamp:<span class="metadata" id="benchmark-timestamp"></span>
   </div>
+  <div>
+    navigator.userAgent:<span class="metadata" id="navigator-userAgent"></span>
+  </div>
   <div>
     TensorFlow.js Core version:<span class="metadata" id="tfjs-core-version"></span>
   </div>

integration_tests/benchmarks/index.js

@@ -15,7 +15,10 @@ import * as ui from './ui';
 async function runBenchmark(artifactsDir, modelName, config) {
   const modelPath = artifactsDir + modelName + '/';
   console.log('Loading model "' + modelName + '" and benchmark data...');
-  const model = await tfl.loadModel(modelPath + 'model.json');
+  // Note: currently we load only the topology. The weight values don't matter
+  // for the benchmarks and are initialized according to the initializer.
+  const modelJSON = await (await fetch(modelPath + 'model.json')).json();
+  const model = await tfl.models.modelFromJSON(modelJSON['modelTopology']);
   console.log('Done loading model "' + modelName + '" and benchmark data.');
 
   const benchmarkData = await (await fetch(modelPath + 'data.json')).json();
@@ -140,7 +143,7 @@ function getRunAllBenchmarks(artifactsDir, benchmarks) {
       ui.status(
           'Running model (' + (i + 1) + ' of ' + benchmarks.models.length +
           '): "' + modelName +
-          '" ... (Please wait patiently. Do NOT click anything.)');
+          '" ... (Please wait patiently. Do NOT click or scroll anything.)');
       await tfc.nextFrame();
       console.log('Benchmarking model: ' + modelName);
       const result =
@@ -153,7 +156,7 @@ function getRunAllBenchmarks(artifactsDir, benchmarks) {
 }
 
 async function setupBenchmarks() {
-  const artifactsDir = './dist/data/';
+  const artifactsDir = 'data/';
 
   console.log('Loading benchmarks...');
   const url = 'http:' + artifactsDir + 'benchmarks.json';

integration_tests/benchmarks/package.json

@@ -10,23 +10,23 @@
   },
   "dependencies": {
     "@tensorflow/tfjs-core": "^0.13.8",
-    "@tensorflow/tfjs-layers": "../../dist",
-    "vega-embed": "~3.0.0"
+    "@tensorflow/tfjs-layers": "../../dist"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production parcel build index.html --no-minify --public-url ./",
-    "watch": "NODE_ENV=development parcel --no-hmr --open index.html",
+    "watch": "NODE_ENV=development parcel index.html --no-hmr --open",
     "lint": "eslint ./*.js"
   },
   "devDependencies": {
+    "babel-core": "^6.26.3",
     "babel-plugin-transform-runtime": "~6.23.0",
     "babel-polyfill": "~6.26.0",
     "babel-preset-env": "~1.6.1",
     "clang-format": "~1.2.2",
     "cross-env": "^5.1.6",
     "eslint": "~4.19.1",
     "http-server": "~0.10.0",
-    "parcel-bundler": "~1.6.2"
+    "parcel-bundler": "~1.10.3"
   },
   "babel": {
     "presets": [

integration_tests/benchmarks/ui.js

@@ -17,6 +17,7 @@ export function status(statusText) {
 
 export function setMetadata(metadata) {
   document.getElementById('benchmark-timestamp').textContent = new Date().toISOString();
+  document.getElementById('navigator-userAgent').textContent = navigator.userAgent;
   document.getElementById('pyKerasVersion').textContent = metadata.keras_version;
   document.getElementById('tfVersion').textContent = metadata.tensorflow_version;
   document.getElementById('tfUsesGPU').textContent = metadata.tensorflow_uses_gpu;
@@ -37,7 +38,7 @@ export function addResult(modelName, result) {
       result.originalData.train_epochs > 0 ?
       result.originalData.train_epochs : 'N/A';
   row += '<td>' + trainEpochsStr + '</td>';
-  const originalTrainTimeStr = 
+  const originalTrainTimeStr =
       result.originalData.train_epochs > 0 ?
       (result.originalData.train_time * 1e3).toFixed(1) : 'N/A';
   row += '<td>' + originalTrainTimeStr + '</td>';