Merge branch 'master' into patch-1

Author: tafsiri

.gitignore

@@ -26,6 +26,14 @@ deps/
 dist/
 tfjs-layers/integration_tests/tfjs2keras/test-data/
 tfjs-layers/integration/typescript/yarn.lock
+
+# Ignore the src, binding, scripts of tfjs-node-gpu since it is copied over when
+# building.
+/tfjs-node-gpu/src
+/tfjs-node-gpu/binding
+/tfjs-node-gpu/scripts
+/tfjs-node-gpu/binding.gyp
+
 lib/
 local.log
 node_modules/

cloudbuild.yml

@@ -11,6 +11,9 @@ steps:
   id: 'diff'
   args: ['diff']
   waitFor: ['yarn']
+  env:
+  - 'COMMIT_SHA=$COMMIT_SHA'
+  - 'BRANCH_NAME=$BRANCH_NAME'
 
 # Core.
 - name: 'gcr.io/cloud-builders/gcloud'
@@ -68,13 +71,20 @@ steps:
   args: ['./scripts/run-build.sh', 'tfjs-react-native']
   waitFor: ['diff']
 
-# Node.
+# Node CPU.
 - name: 'gcr.io/cloud-builders/gcloud'
   entrypoint: 'bash'
   id: 'tfjs-node'
   args: ['./scripts/run-build.sh', 'tfjs-node']
   waitFor: ['diff']
 
+# Node GPU.
+- name: 'gcr.io/cloud-builders/gcloud'
+  entrypoint: 'bash'
+  id: 'tfjs-node-gpu'
+  args: ['./scripts/run-build.sh', 'tfjs-node-gpu']
+  waitFor: ['diff']
+
 # Integration tests
 - name: 'node:10'
   dir: 'tfjs-core'

package.json

@@ -4,6 +4,7 @@
     "chalk": "~2.4.2",
     "shelljs": "~0.8.3",
     "ts-node": "~4.1.0",
+    "tslint": "~5.20.0",
     "typescript": "3.5.3"
   },
   "scripts": {

scripts/diff.js

@@ -15,6 +15,7 @@
 // =============================================================================
 
 const {exec} = require('./test-util');
+const shell = require('shelljs');
 const {readdirSync, statSync, writeFileSync} = require('fs');
 const {join} = require('path');
 const fs = require('fs');
@@ -30,9 +31,45 @@ const dirs = readdirSync('.').filter(f => {
   return f !== 'node_modules' && f !== '.git' && statSync(f).isDirectory();
 });
 
-exec(
-    `git clone --depth=1 --single-branch ` +
-    `https://github.com/tensorflow/tfjs ${CLONE_PATH}`);
+let commitSha = process.env['COMMIT_SHA'];
+let branchName = process.env['BRANCH_NAME'];
+// If commit sha or branch name are null we are running this locally and are in
+// a git repository.
+if (commitSha == null) {
+  commitSha = exec(`git rev-parse HEAD`).stdout.trim();
+}
+if (branchName == null) {
+  branchName = exec(`git rev-parse --abbrev-ref HEAD`).stdout.trim();
+}
+console.log('commitSha: ', commitSha);
+console.log('branchName: ', branchName);
+
+// We cannot do --depth=1 here because we need to check out an old merge base.
+// We cannot do --single-branch here because we need multiple branches.
+exec(`git clone https://github.com/tensorflow/tfjs ${CLONE_PATH}`);
+
+console.log();  // Break up the console for readability.
+
+shell.cd(CLONE_PATH);
+
+// If we cannot check out the commit then this PR is coming from a fork.
+const res = shell.exec(`git checkout ${commitSha}`, {silent: true});
+const isPullRequestFromFork = res.code !== 0;
+
+// Only checkout the merge base if the pull requests comes from a
+// tensorflow/tfjs branch. Otherwise clone master and diff against master.
+if (!isPullRequestFromFork) {
+  console.log('PR is coming from tensorflow/tfjs. Finding the merge base...');
+  exec(`git checkout ${branchName}`);
+  const mergeBase = exec(`git merge-base master ${branchName}`).stdout.trim();
+  exec(`git fetch origin ${mergeBase}`);
+  exec(`git checkout ${mergeBase}`);
+  console.log('mergeBase: ', mergeBase);
+} else {
+  console.log('PR is coming from a fork. Diffing against master.');
+}
+shell.cd('..');
+console.log();  // Break up the console for readability.
 
 let triggerAllBuilds = false;
 let whitelistDiffOutput = [];
@@ -45,11 +82,11 @@ filesWhitelistToTriggerBuild.forEach(fileToTriggerBuild => {
   }
 });
 
-// Break up the console for readability.
-console.log();
+console.log();  // Break up the console for readability.
 
 let triggeredBuilds = [];
 dirs.forEach(dir => {
+  shell.rm('-f', `${dir}/diff`);
   const diffOutput = diff(`${dir}/`);
   if (diffOutput !== '') {
     console.log(`${dir} has modified files.`);
@@ -65,16 +102,17 @@ dirs.forEach(dir => {
   }
 });
 
-// Break up the console for readability.
-console.log();
+console.log();  // Break up the console for readability.
 
-// Filter the triggered builds to log by whether a cloudbuild.yml file exists
-// for that directory.
+// Filter the triggered builds to log by whether a cloudbuild.yml file
+// exists for that directory.
 triggeredBuilds = triggeredBuilds.filter(
     triggeredBuild => fs.existsSync(triggeredBuild + '/cloudbuild.yml'));
 console.log('Triggering builds for ', triggeredBuilds.join(', '));
 
 function diff(fileOrDirName) {
-  const diffCmd = `diff -rq ${CLONE_PATH}/${fileOrDirName} ./${fileOrDirName}`;
+  const diffCmd = `diff -rq ` +
+      `${CLONE_PATH}/${fileOrDirName} ` +
+      `${fileOrDirName}`;
   return exec(diffCmd, {silent: true}, true).stdout.trim();
 }

scripts/publish-npm.sh

@@ -62,7 +62,7 @@ fi
 ./scripts/make-version.js $1
 
 cd $1
-yarn build-npm
+yarn build-npm for-publish
 cd ..
 
 ./scripts/tag-version.js $1

tfjs-automl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tensorflow/tfjs-automl",
-  "version": "0.0.1-alpha.0",
+  "version": "0.0.1-alpha.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/tf-automl.esm.js",

tfjs-automl/src/version.ts

@@ -1,5 +1,5 @@
 /** @license See the LICENSE file. */
 
 // This code is auto-generated, do not modify this file!
-const version = '0.0.1-alpha.0';
+const version = '0.0.1-alpha.1';
 export {version};

tfjs-backend-webgpu/benchmarks/main.css

@@ -111,9 +111,8 @@ h2 {
 }
 
 .color {
-  border-radius: 50%;
-  width: 10px;
-  height: 10px;
+  width: 20px;
+  height: 2px;
   display: inline-block;
   vertical-align: middle;
 }

tfjs-backend-webgpu/benchmarks/main.js

@@ -16,24 +16,52 @@
  */
 
 const swatches = {
-  'webgpu_min': '#FCA521',
+  'webgpu_min': '#F1523E',
   'webgpu_mean': '#F1523E',
-  'webgl_min': '#03A698',
-  'webgl_mean': '#025952'
+  'webgl_min': '#3f51b5',
+  'webgl_mean': '#3f51b5'
 };
 
+const strokes = {
+  'webgpu_min': '2',
+  'webgpu_mean': '0',
+  'webgl_min': '2',
+  'webgl_mean': '0'
+};
+
+const MAX_NUM_LOGS = 50;
 const START_LOGGING_DATE = '2019-08-16';
 const startDate = moment(START_LOGGING_DATE, 'YYYY-MM-DD');
 const endDate = moment();
 const files = [];
 let dateFormats = [];
-const daysElapsed = endDate.diff(startDate, 'd')
-for (let i = 0; i <= daysElapsed; i++) {
+const daysElapsed = endDate.diff(startDate, 'd');
+let interval = 1;
+
+while (daysElapsed / interval > MAX_NUM_LOGS) {
+  interval += 1;
+}
+
+for (let i = 0; i <= daysElapsed; i += interval) {
   const current = startDate.clone().add(i, 'days');
   files.push(`${current.format('MM_DD_YYYY')}`);
   dateFormats.push(current.format('M/DD'));
 }
 
+function getSwatchBackground(swatch, stroke) {
+  let background = swatch;
+  if (stroke > 0) {
+    background = `repeating-linear-gradient(
+      to right,
+      ${swatch},
+      ${swatch} 2px,
+      white 2px,
+      white 4px
+    );`;
+  }
+  return background;
+}
+
 Promise
     .all(files.map(
         d =>
@@ -143,16 +171,19 @@ Promise
               }
 
               const xIncrement = chartWidth / (test.entries.length - 1);
-
               const template =  // template trendlines
                   `<div class='test'>
             <h4 class='test-name'>${test.name}</h4>
             <div class='legend'>${
                       Object.keys(params)
                           .map((param, i) => {
                             return `<div class='swatch'>
-                                <div class='color' style='background-color:
-                                ${swatches[param]}'></div> <div class='label'>${
+                                <div class='color' style='background:
+                                ${
+                                getSwatchBackground(
+                                    swatches[param],
+                                    strokes
+                                        [param])}'></div> <div class='label'>${
                                 param}</div>
                               </div>`;
                           })
@@ -165,8 +196,9 @@ Promise
               <svg data-index=${i} class='graph' width='${
                       chartWidth}' height='${chartHeight}'>${
                       Object.keys(params).map(
-                          (param,
-                           i) => `<path stroke='${swatches[param]}' d='M${
+                          (param, i) => `<path stroke-dasharray='${
+                              strokes[param]}' stroke='${
+                              swatches[param]}' d='M${
                               params[param]
                                   .map(
                                       (d, i) => `${i * xIncrement},${
@@ -229,8 +261,9 @@ Promise
                     .params
                     .map(
                         (d, i) => {return `<div class='label-wrapper'>
-                          <div class='color' style='background-color: ${
-                            swatches[d.name]}'></div>
+                          <div class='color' style='background: ${
+                            getSwatchBackground(
+                                swatches[d.name], strokes[d.name])}'></div>
                           <div class='label'>${d.ms}</div>
                         </div>`})
                     .join(' ')}

tfjs-backend-webgpu/cloudbuild.yml

@@ -1,18 +1,25 @@
 steps:
 # Install common dependencies.
 - name: 'node:10'
-  dir: 'tfjs-backend-webgpu'
   id: 'yarn-common'
   entrypoint: 'yarn'
   args: ['install']
 
 # Install webgpu dependencies.
+- name: 'node:10'
+  dir: 'tfjs-backend-webgpu'
+  id: 'yarn'
+  entrypoint: 'yarn'
+  args: ['install']
+  waitFor: ['yarn-common']
+
+# Run tests.
 - name: 'node:10'
   dir: 'tfjs-backend-webgpu'
   entrypoint: 'yarn'
   id: 'test-webgpu'
   args: ['test-ci']
-  waitFor: ['yarn-common']
+  waitFor: ['yarn']
 
 # General configuration
 timeout: 1800s