upgrade deeplab to 3.0.0-rc.1 (#563)

Author: tafsiri

cloudbuild.yml

@@ -39,7 +39,7 @@ steps:
 - name: 'gcr.io/cloud-builders/gcloud'
   entrypoint: 'bash'
   id: 'deeplab'
-  args: ['./scripts/run-build.sh', 'deep-lab']
+  args: ['./scripts/run-build.sh', 'deeplab']
   waitFor: ['diff']
 
 # KNN Classifier.

deeplab/cloudbuild.yml

@@ -8,7 +8,7 @@ steps:
 
 # Install tfjs dependencies.
 - name: 'node:10'
-  dir: 'universal-sentence-encoder'
+  dir: 'deeplab'
   entrypoint: 'yarn'
   id: 'yarn'
   args: ['install']
@@ -24,15 +24,15 @@ steps:
 
 # Build.
 - name: 'node:10'
-  dir: 'universal-sentence-encoder'
+  dir: 'deeplab'
   entrypoint: 'yarn'
   id: 'build'
   args: ['build']
   waitFor: ['yarn']
 
 # Run tests.
 - name: 'node:10'
-  dir: 'universal-sentence-encoder'
+  dir: 'deeplab'
   entrypoint: 'yarn'
   id: 'test'
   args: ['test']

deeplab/demo/README.md

@@ -4,6 +4,8 @@ This demo allows you to try out semantic segmentation on a couple of preset imag
 
 ## Setup
 
+Run `yarn build-npm` in the 'deeplab' folder.
+
 Change the directory to the `demo` folder:
 
 ```sh

deeplab/demo/package.json

@@ -9,13 +9,14 @@
     "node": ">=8.9.0"
   },
   "dependencies": {
-    "@tensorflow-models/deeplab": "0.1.0",
-    "@tensorflow/tfjs-converter": "1.3.1",
-    "@tensorflow/tfjs-core": "1.3.1",
+    "@tensorflow-models/deeplab": "file:../dist",
+    "@tensorflow/tfjs-converter": "^3.0.0-rc.1",
+    "@tensorflow/tfjs-core": "^3.0.0-rc.1",
+    "@tensorflow/tfjs-backend-webgl": "^3.0.0-rc.1",
     "bulma": "^0.7.5"
   },
   "scripts": {
-    "watch": "cross-env NODE_ENV=development parcel src/index.html --no-hmr",
+    "watch": "cross-env NODE_ENV=development parcel src/index.html --no-hmr --open",
     "build": "cross-env NODE_ENV=production parcel build src/index.html --no-minify --public-url ./",
     "lint": "eslint .",
     "link-local": "yalc add --link @tensorflow-models/deeplab"

deeplab/demo/src/index.js

@@ -16,6 +16,7 @@
  */
 
 import 'bulma/css/bulma.css';
+import '@tensorflow/tfjs-backend-webgl';
 
 import {load} from '@tensorflow-models/deeplab';
 import * as tf from '@tensorflow/tfjs-core';
@@ -134,7 +135,7 @@ const runPrediction = (modelName, input, initialisationStart) => {
     model.segment(input).then((output) => {
       displaySegmentationMap(modelName, output);
       status(`Ran in ${
-        ((performance.now() - initialisationStart) / 1000).toFixed(2)} s`);
+          ((performance.now() - initialisationStart) / 1000).toFixed(2)} s`);
     });
   });
 };
@@ -166,7 +167,7 @@ const runDeeplab = async (modelName) => {
     deeplab[modelName] = load({base: modelName, quantizationBytes});
     await deeplab[modelName];
     status(`Loaded the model in ${
-      ((performance.now() - loadingStart) / 1000).toFixed(2)} s`);
+        ((performance.now() - loadingStart) / 1000).toFixed(2)} s`);
   }
   const predictionStart = performance.now();
   if (input.complete && input.naturalHeight !== 0) {

deeplab/demo/yarn.lock

@@ -887,26 +887,43 @@
     "@parcel/utils" "^1.11.0"
     physical-cpu-count "^2.0.0"
 
-"@tensorflow-models/[email protected]":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow-models/deeplab/-/deeplab-0.1.0.tgz#79e492210d557acb1cd78bc267a25bb978116729"
-  integrity sha512-duAOo9QiZrh0JnxGkojIyK5qU7j4XRZw7lC7kkLjuDPioe7kdGoXwGyj6WpcTWjyrzGZAvDxI0xBsC/PrgXQsA==
+"@tensorflow-models/deeplab@file:../dist":
+  version "0.0.0"
 
-"@tensorflow/[email protected]":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.3.1.tgz#4e08e07621f43690a0b69c345cd63bc1f6974879"
-  integrity sha512-8IHzcIZwqCofcRBhaCTN6W73m2RGdBDH6BEORf0KDdbgbz4DouItVcKX692PrA8gchY+Xy8ZHMpj93PcAOs17g==
+"@tensorflow/[email protected]":
+  version "3.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-3.0.0-rc.1.tgz#b02e05706b2d91ab601e7eb397b6ea60ac0a9e2e"
+  integrity sha512-9+13fs3vVpfOpDY+Aa/JXdda2SuBN/clxxoNYIX3pMY0GAGwpUaAkSECLuOOhnngHcl9pxuaJtgqrCcrq+A3/A==
+  dependencies:
+    "@types/seedrandom" "2.4.27"
+    seedrandom "2.4.3"
 
-"@tensorflow/[email protected]":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.3.1.tgz#89e3253f320233120ee24d4ae62fca65c315580f"
-  integrity sha512-X4MKhpg1gLEZetKUMeQNW6diP3gbFFddeF6UT816sH8jOenX/8x2HnVmANpNnUxCTPhDniY3V9zhBWwbl13+Yg==
+"@tensorflow/tfjs-backend-webgl@^3.0.0-rc.1":
+  version "3.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-3.0.0-rc.1.tgz#21aacedcef687d2bb075c7951ac9e4f57faa79e6"
+  integrity sha512-qEjtL/71HflBHJgWXhtj+8BVYB9Q+NHw282QGWi9QLA9SlWe3BRJhbGCaD28/Ddl+mSzBWFQnK+sKdZ04LL1Sg==
+  dependencies:
+    "@tensorflow/tfjs-backend-cpu" "3.0.0-rc.1"
+    "@types/offscreencanvas" "~2019.3.0"
+    "@types/seedrandom" "2.4.27"
+    "@types/webgl-ext" "0.0.30"
+    "@types/webgl2" "0.0.5"
+    seedrandom "2.4.3"
+
+"@tensorflow/tfjs-converter@^3.0.0-rc.1":
+  version "3.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-3.0.0-rc.1.tgz#a15eb72ade80f7ae0e6403020763be0c5af6f2f7"
+  integrity sha512-vVezwsDtrqM9CGDU+9c1WvPbLB5Odi9uiyEUHZEXMgNnPZ9Ix8a7RFOL7Y+8uBsI3B5wmLrWJuUNeyxUjA7yiA==
+
+"@tensorflow/tfjs-core@^3.0.0-rc.1":
+  version "3.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-3.0.0-rc.1.tgz#0b5316871eef2a4c8aa149d154e6ea6bbc7b631e"
+  integrity sha512-h9a0TyWNJFqgmyfSklwI2q0SC93WFr8FBHwHorvsfm2mDK0ZrSs6bhWqa44tWRJjCrJNRq9J4GoTZQM292RTwg==
   dependencies:
     "@types/offscreencanvas" "~2019.3.0"
     "@types/seedrandom" "2.4.27"
     "@types/webgl-ext" "0.0.30"
-    "@types/webgl2" "0.0.4"
-    node-fetch "~2.1.2"
+    node-fetch "~2.6.1"
     seedrandom "2.4.3"
 
 "@types/offscreencanvas@~2019.3.0":
@@ -929,10 +946,10 @@
   resolved "https://registry.yarnpkg.com/@types/webgl-ext/-/webgl-ext-0.0.30.tgz#0ce498c16a41a23d15289e0b844d945b25f0fb9d"
   integrity sha512-LKVgNmBxN0BbljJrVUwkxwRYqzsAEPcZOe6S2T6ZaBDIrFp0qu4FNlpc5sM1tGbXUYFgdVQIoeLk1Y1UoblyEg==
 
-"@types/[email protected].4":
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/@types/webgl2/-/webgl2-0.0.4.tgz#c3b0f9d6b465c66138e84e64cb3bdf8373c2c279"
-  integrity sha512-PACt1xdErJbMUOUweSrbVM7gSIYm1vTncW2hF6Os/EeWi6TXYAYMPp+8v6rzHmypE5gHrxaxZNXgMkJVIdZpHw==
+"@types/[email protected].5":
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/@types/webgl2/-/webgl2-0.0.5.tgz#dd925e20ab8ace80eb4b1e46fda5b109c508fb0d"
+  integrity sha512-oGaKsBbxQOY5+aJFV3KECDhGaXt+yZJt2y/OZsnQGLRkH6Fvr7rv4pCt3SRH1somIHfej/c4u7NSpCyd9x+1Ow==
 
 abab@^2.0.0:
   version "2.0.0"
@@ -3805,10 +3822,10 @@ node-addon-api@^1.6.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.1.tgz#cf813cd69bb8d9100f6bdca6755fc268f54ac492"
   integrity sha512-2+DuKodWvwRTrCfKOeR24KIc5unKjOh8mz17NCzVnHWfjAdDqbfbjqh7gUT+BkXBRQM52+xCHciKWonJ3CbJMQ==
 
-node-fetch@~2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5"
-  integrity sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=
+node-fetch@~2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
 node-forge@^0.7.1:
   version "0.7.6"

deeplab/package.json

@@ -13,14 +13,14 @@
     "url": "https://github.com/tensorflow/tfjs-models"
   },
   "peerDependencies": {
-    "@tensorflow/tfjs-converter": "^1.2.5",
-    "@tensorflow/tfjs-core": "^1.2.5"
+    "@tensorflow/tfjs-converter": "^3.0.0-rc.1",
+    "@tensorflow/tfjs-core": "^3.0.0-rc.1"
   },
   "devDependencies": {
-    "@tensorflow/tfjs-converter": "^1.3.1",
-    "@tensorflow/tfjs-core": "^1.3.1",
+    "@tensorflow/tfjs-converter": "^3.0.0-rc.1",
+    "@tensorflow/tfjs-core": "^3.0.0-rc.1",
+    "@tensorflow/tfjs-backend-cpu": "^3.0.0-rc.1",
     "@types/jasmine": "~3.3.15",
-    "canvas": "^2.5.0",
     "clang-format": "^1.2.4",
     "jasmine": "^3.2.0",
     "jasmine-core": "~3.4.0",
@@ -29,14 +29,14 @@
     "rollup-plugin-node-resolve": "~5.2.0",
     "rollup-plugin-terser": "^5.1.1",
     "rollup-plugin-typescript2": "~0.22.0",
-    "ts-node": "~8.3.0",
+    "ts-node": "~5.0.0",
     "tslint": "~5.18.0",
     "typescript": "3.5.3",
     "yalc": "~1.0.0-pre.32"
   },
   "scripts": {
     "build": "rimraf dist && tsc",
-    "test": "ts-node --project tsconfig.test.json run_tests.ts",
+    "test": "ts-node --skip-ignore --project tsconfig.test.json run_tests.ts",
     "publish-local": "yarn build && rollup -c && yalc push",
     "build-npm": "yarn build && rollup -c",
     "lint": "tslint -p . -t verbose"

deeplab/run_tests.ts

@@ -18,4 +18,6 @@
 import * as jasmine_util from '@tensorflow/tfjs-core/dist/jasmine_util';
 import {runTests} from '../test_util';
 
+import '@tensorflow/tfjs-backend-cpu';
+
 runTests(jasmine_util);

deeplab/src/deeplab_test.ts

@@ -17,7 +17,6 @@
 import * as tf from '@tensorflow/tfjs-core';
 // tslint:disable-next-line: no-imports-from-dist
 import {describeWithFlags, NODE_ENVS,} from '@tensorflow/tfjs-core/dist/jasmine_util';
-import {createCanvas} from 'canvas';
 import {load} from '.';
 
 describeWithFlags('SemanticSegmentation', NODE_ENVS, () => {
@@ -46,12 +45,4 @@ describeWithFlags('SemanticSegmentation', NODE_ENVS, () => {
     expect(Object.keys(legend)).toContain('background');
   });
 
-  it('SemanticSegmentation produces a valid segmentation of an empty canvas',
-     async () => {
-       const model = await load();
-       const x = createCanvas(200, 200);
-       // tslint:disable-next-line: no-any
-       const {legend} = await model.segment((x as any) as HTMLCanvasElement);
-       expect(Object.keys(legend)).toContain('background');
-     });
 });

deeplab/src/index.ts

@@ -119,7 +119,7 @@ export class SemanticSegmentation {
    */
   public predict(input: DeepLabInput): tf.Tensor2D {
     return tf.tidy(() => {
-      const data = toInputTensor(input);
+      const data = tf.cast(toInputTensor(input), 'int32');
       return tf.squeeze(this.model.execute(data) as tf.Tensor);
     });
   }

deeplab/src/utils.ts

@@ -138,8 +138,8 @@ export function toInputTensor(input: DeepLabInput) {
     const resizeRatio = config['CROP_SIZE'] / Math.max(width, height);
     const targetHeight = Math.round(height * resizeRatio);
     const targetWidth = Math.round(width * resizeRatio);
-    return tf.image.resizeBilinear(image, [targetHeight, targetWidth])
-        .expandDims(0);
+    return tf.expandDims(
+      tf.image.resizeBilinear(image, [targetHeight, targetWidth]));
   });
 }