Upgrade tfjs (#427)

* significant TFJS upgrade

* adding scripting test

Author: GantMan

__tests__/regressionCheck.ts

@@ -1,25 +1,24 @@
-import * as tf from '@tensorflow/tfjs'
-import { load } from '../src/index'
-const fs = require('fs');
-const jpeg = require('jpeg-js');
-
+import * as tf from "@tensorflow/tfjs";
+import { load } from "../src/index";
+import { exec } from "child_process";
+const fs = require("fs");
+const jpeg = require("jpeg-js");
 
 // Fix for JEST
-const globalAny: any = global
-globalAny.fetch = require('node-fetch')
-const timeoutMS = 10000
-const NUMBER_OF_CHANNELS = 3
-
+const globalAny: any = global;
+globalAny.fetch = require("node-fetch");
+const timeoutMS = 10000;
+const NUMBER_OF_CHANNELS = 3;
 
 const readImage = (path: string) => {
-  const buf = fs.readFileSync(path)
-  const pixels = jpeg.decode(buf, true)
-  return pixels
-}
+  const buf = fs.readFileSync(path);
+  const pixels = jpeg.decode(buf, true);
+  return pixels;
+};
 
 // @ts-ignore
 const imageByteArray = (image, numChannels: number) => {
-  const pixels = image.data
+  const pixels = image.data;
   const numPixels = image.width * image.height;
   const values = new Int32Array(numPixels * numChannels);
 
@@ -29,22 +28,43 @@ const imageByteArray = (image, numChannels: number) => {
     }
   }
 
-  return values
-}
+  return values;
+};
 
 // @ts-ignore
 const imageToInput = (image, numChannels: number) => {
-  const values = imageByteArray(image, numChannels)
-  const outShape = [image.height, image.width, numChannels] as [number, number, number];
-  const input = tf.tensor3d(values, outShape, 'int32');
-
-  return input
-}
-
-it("Snapshots", async () => {
-  const model = await load()
-  const logo = readImage(`${__dirname}/../_art/nsfwjs_logo.jpg`)
-  const input = imageToInput(logo, NUMBER_OF_CHANNELS)
-  const predictions = await model.classify(input)
-  expect(predictions).toMatchSnapshot()
-}, timeoutMS)
+  const values = imageByteArray(image, numChannels);
+  const outShape = [image.height, image.width, numChannels] as [
+    number,
+    number,
+    number
+  ];
+  const input = tf.tensor3d(values, outShape, "int32");
+
+  return input;
+};
+
+it(
+  "Snapshots",
+  async () => {
+    const model = await load();
+    const logo = readImage(`${__dirname}/../_art/nsfwjs_logo.jpg`);
+    const input = imageToInput(logo, NUMBER_OF_CHANNELS);
+    const predictions = await model.classify(input);
+    expect(predictions).toMatchSnapshot();
+  },
+  timeoutMS
+);
+
+it(
+  "Bundles and minifies",
+  (done) => {
+    const cmd = "yarn scriptbundle && yarn minbundle";
+    exec(cmd, (err) => {
+      if (err) done.fail("Failed to bundle and minify");
+      // All good!
+      done();
+    });
+  },
+  timeoutMS * 6
+);

example/minimal_demo/index.html

@@ -1,26 +1,26 @@
 <!-- Load TensorFlow.js. This is required -->
 <script
-  src="https://unpkg.com/@tensorflow/tfjs@1.2.8"
+  src="https://unpkg.com/@tensorflow/tfjs@2.6.0"
   type="text/javascript"
 ></script>
-<script src="https://unpkg.com/nsfwjs@2.1.0" type="text/javascript"></script>
+<script src="https://unpkg.com/nsfwjs@2.3.0" type="text/javascript"></script>
 
 <!-- For testing: Load from local bundle `yarn scriptbundle && yarn minbundle` -->
 <!-- <script src="../../dist/nsfwjs.min.js"></script> -->
 
 <script>
   // const nsfwjs = require('nsfwjs')
-  const img = new Image()
-  img.crossOrigin = 'anonymous'
+  const img = new Image();
+  img.crossOrigin = "anonymous";
   // some image here
-  img.src = 'https://i.imgur.com/Kwxetau.jpg'
+  img.src = "https://i.imgur.com/Kwxetau.jpg";
 
   // Load the model.
-  nsfwjs.load().then(model => {
+  nsfwjs.load().then((model) => {
     // Classify the image.
-    model.classify(img).then(predictions => {
-      console.log('Predictions', predictions)
-    })
-  })
+    model.classify(img).then((predictions) => {
+      console.log("Predictions", predictions);
+    });
+  });
 </script>
 <pre>Checkout console.log output for results!</pre>

example/nsfw_demo/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@tensorflow/tfjs": "^1.7.4",
+    "@tensorflow/tfjs": "^2.6.0",
     "nsfwjs": "../../",
     "react": "^16.8.1",
     "react-dom": "^16.8.1",