Merge branch 'master' into update-karma-version

scripts/package_dependencies.json

@@ -4,6 +4,9 @@
   "tfjs-converter": ["tfjs-core"],
   "tfjs-layers": ["tfjs-core"],
   "tfjs-data": ["tfjs-core", "tfjs-layers"],
+  "tfjs": ["tfjs-core", "tfjs-converter", "tfjs-layers", "tfjs-data"],
+  "tfjs-node": ["tfjs", "tfjs-core"],
+  "tfjs-node-gpu": ["tfjs", "tfjs-core"],
   "tfjs-backend-wasm": ["tfjs-core"],
   "tfjs-backend-cpu": ["tfjs-core"],
   "tfjs-backend-webgl": ["tfjs-core"]

tfjs-backend-wasm/scripts/build-ci.sh

@@ -16,12 +16,22 @@
 
 set -e
 
-# Install emsdk
 git clone --depth=1 --single-branch https://github.com/emscripten-core/emsdk.git
+
 cd emsdk
 # Need to tell emsdk where to write the .emscripten file.
 export HOME='/root'
-./emsdk install 1.39.1
+
+# Install emsdk with up to 1 retry.
+for i in $(seq 0 1)
+do
+  # Wait for 15 seconds then retry.
+  [ $i -gt 0 ] && echo "Retry in 15 seconds, count: $i" && sleep 15
+  # If install is successful, $? will hold 0 and execution will break from the
+  # loop.
+  ./emsdk install 1.39.1 && break
+done
+
 ./emsdk activate 1.39.1
 source ./emsdk_env.sh
 cd ..

tfjs-backend-webgpu/package.json

@@ -10,18 +10,21 @@
   "scripts": {
     "publish-local": "rimraf dist/ && yarn build && rollup -c && yalc push",
     "publish-npm": "./scripts/publish-npm.sh",
+    "build-backend-webgl": "cd ../tfjs-backend-webgl && yarn && yarn build",
     "build-core": "cd ../tfjs-core && yarn && yarn build",
-    "build": "yarn build-core && rimraf dist/ && tsc",
+    "build-deps": "yarn build-core && yarn build-backend-webgl",
+    "build": "yarn build-deps && rimraf dist/ && tsc",
     "link-local": "yalc link",
     "unlink-local": "yalc remove",
     "lint": "tslint -p . -t verbose",
     "test": "karma start --browsers=chrome_webgpu --excludeTest='src/benchmark_ops_test.ts'",
     "test-ci": "./scripts/test-ci.sh",
-    "benchmark": "karma start --grep=benchmark --browsers=chrome_webgpu"
+    "benchmark": "yarn build && karma start --grep=benchmark --browsers=chrome_webgpu"
   },
   "license": "Apache-2.0",
   "devDependencies": {
     "@tensorflow/tfjs-core": "link:../tfjs-core",
+    "@tensorflow/tfjs-backend-webgl": "link:../tfjs-backend-webgl",
     "@types/jasmine": "~2.5.53",
     "clang-format": "~1.2.2",
     "http-server": "~0.10.0",

tfjs-backend-webgpu/src/setup_test.ts

@@ -15,6 +15,8 @@
  * =============================================================================
  */
 
+import '@tensorflow/tfjs-backend-webgl';
+
 // tslint:disable-next-line: no-imports-from-dist
 import {setTestEnvs} from '@tensorflow/tfjs-core/dist/jasmine_util';
 

tfjs-core/src/device_util.ts

@@ -15,15 +15,23 @@
  * =============================================================================
  */
 
+// tslint:disable-next-line:no-any
+export function isNavigatorDefined(): boolean {
+  return typeof navigator !== 'undefined' && navigator != null;
+}
+
 export function isMobile(): boolean {
-  // tslint:disable-next-line:no-any
-  const a = navigator.userAgent || navigator.vendor || (window as any).opera;
-  // tslint:disable-next-line:max-line-length
-  return /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i
-             .test(a) ||
-      // tslint:disable-next-line:max-line-length
-      /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i
-          .test(a.substr(0, 4));
+  if (isNavigatorDefined()) {
+    // tslint:disable-next-line:no-any
+    const a = navigator.userAgent || navigator.vendor || (window as any).opera;
+    // tslint:disable-next-line:max-line-length
+    return /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i
+               .test(a) ||
+        // tslint:disable-next-line:max-line-length
+        /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i
+            .test(a.substr(0, 4));
+  }
+  return false;
 }
 
 export function isBrowser(): boolean {

tfjs-core/src/device_util_test.ts

@@ -0,0 +1,31 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =============================================================================
+ */
+
+import * as device_util from './device_util';
+import {ALL_ENVS, describeWithFlags} from './jasmine_util';
+
+describeWithFlags('isMobile', ALL_ENVS, () => {
+  it('should not fail when navigator is not set', () => {
+    spyOn(device_util, 'isNavigatorDefined').and.returnValue(false);
+    expect(device_util.isMobile()).toBeFalsy();
+  });
+
+  it('should not fail when navigator is set', () => {
+    spyOn(device_util, 'isNavigatorDefined').and.returnValue(true);
+    expect(() => device_util.isMobile()).not.toThrow();
+  });
+});

tfjs-core/src/tests.ts

@@ -20,6 +20,7 @@
 import './browser_util_test';
 import './buffer_test';
 import './debug_mode_test';
+import './device_util_test';
 import './engine_test';
 import './environment_test';
 import './flags_test';

tfjs-node/src/image_test.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2019 Google Inc. All Rights Reserved.
+ * Copyright 2020 Google Inc. All Rights Reserved.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,10 +14,12 @@
  * limitations under the License.
  * =============================================================================
  */
-
-import {memory, setBackend, test_util} from '@tensorflow/tfjs';
+import {memory, registerBackend, setBackend, test_util} from '@tensorflow/tfjs';
+// tslint:disable-next-line: no-imports-from-dist
+import {TestKernelBackend} from '@tensorflow/tfjs-core/dist/jasmine_util';
 import * as fs from 'fs';
 import {promisify} from 'util';
+
 import {getImageType, ImageType} from './image';
 import * as tf from './index';
 
@@ -221,14 +223,18 @@ describe('decode images', () => {
 
   it('throw error if backend is not tensorflow', async done => {
     try {
-      setBackend('cpu');
+      const testBackend = new TestKernelBackend();
+      registerBackend('fake', () => testBackend);
+      setBackend('fake');
+
       const uint8array = await getUint8ArrayFromImage(
           'test_objects/images/image_png_test.png');
       tf.node.decodeImage(uint8array);
       done.fail();
     } catch (err) {
       expect(err.message)
-          .toBe('Expect the current backend to be "tensorflow", but got "cpu"');
+          .toBe(
+              'Expect the current backend to be "tensorflow", but got "fake"');
       setBackend('tensorflow');
       done();
     }

tfjs-node/src/nodejs_kernel_backend_test.ts

@@ -16,6 +16,9 @@
  */
 
 import * as tf from '@tensorflow/tfjs';
+// tslint:disable-next-line: no-imports-from-dist
+import {TestKernelBackend} from '@tensorflow/tfjs-core/dist/jasmine_util';
+
 import {createTensorsTypeOpAttr, createTypeOpAttr, ensureTensorflowBackend, getTFDType, nodeBackend, NodeJSKernelBackend} from './nodejs_kernel_backend';
 
 describe('delayed upload', () => {
@@ -74,12 +77,16 @@ describe('Exposes Backend for internal Op execution.', () => {
 
   it('throw error if backend is not tensorflow', async done => {
     try {
-      tf.setBackend('cpu');
+      const testBackend = new TestKernelBackend();
+      tf.registerBackend('fake', () => testBackend);
+      tf.setBackend('fake');
+
       ensureTensorflowBackend();
       done.fail();
     } catch (err) {
       expect(err.message)
-          .toBe('Expect the current backend to be "tensorflow", but got "cpu"');
+          .toBe(
+              'Expect the current backend to be "tensorflow", but got "fake"');
       tf.setBackend('tensorflow');
       done();
     }

tfjs-node/src/run_tests.ts

@@ -35,8 +35,12 @@ process.on('unhandledRejection', e => {
   throw e;
 });
 
-jasmine_util.setTestEnvs(
-    [{name: 'test-tensorflow', backendName: 'tensorflow', flags: {}}]);
+jasmine_util.setTestEnvs([{
+  name: 'test-tensorflow',
+  backendName: 'tensorflow',
+  flags: {},
+  isDataSync: true
+}]);
 
 const IGNORE_LIST: string[] = [
   // Always ignore version tests:
@@ -90,11 +94,11 @@ if (process.platform === 'win32') {
       'maxPool test-tensorflow {} [x=[3,3,1] f=[2,2] s=1 ignores NaNs');
 }
 
-const coreTests = 'node_modules/@tensorflow/tfjs-core/dist/**/*_test.js';
-const nodeTests = 'src/**/*_test.ts';
-
 const runner = new jasmineCtor();
-runner.loadConfig({spec_files: [coreTests, nodeTests], random: false});
+runner.loadConfig({spec_files: ['src/**/*_test.ts'], random: false});
+// Also import tests from core.
+// tslint:disable-next-line: no-imports-from-dist
+import '@tensorflow/tfjs-core/dist/tests';
 
 if (process.env.JASMINE_SEED) {
   runner.seed(process.env.JASMINE_SEED);