learning_model 1.0.38 → 1.0.39

package/lib/utils/tf.ts

@@ -0,0 +1,94 @@
+import * as tf from '@tensorflow/tfjs';
+
+export function isTensor(c: any): c is tf.Tensor {
+  return typeof c.dataId === 'object' && typeof c.shape === 'object';
+}
+
+export async function loadModel(): Promise<tf.LayersModel>  {
+  const trainLayerV1 = 'conv_pw_13_relu';
+  const trainLayerV2 = 'out_relu';
+
+  var mobileNetVersion = 2;
+  const modelURL = mobileNetURL(mobileNetVersion);
+  const load_model = await tf.loadLayersModel(modelURL);
+  
+  if (mobileNetVersion == 1) {
+    const layer = load_model.getLayer(trainLayerV1);
+    const truncatedModel = tf.model({
+      inputs: load_model.inputs, 
+      outputs: layer.output
+    })
+    const model = tf.sequential();
+    model.add(truncatedModel);
+    model.add(tf.layers.flatten());
+    return model;
+  } else {
+    const layer = load_model.getLayer(trainLayerV2);
+    const truncatedModel = tf.model({
+      inputs: load_model.inputs, 
+      outputs: layer.output
+    })
+    const model = tf.sequential();
+    model.add(truncatedModel);
+    model.add(tf.layers.globalAveragePooling2d({})); // go from shape [7, 7, 1280] to [1280]
+    return model;
+  }
+}
+
+export function mobileNetURL(version: number): string {
+  if (version == 1) {
+    return "https://storage.googleapis.com/tfjs-models/tfjs/mobilenet_v1_1.0_224/model.json";
+  } 
+  return "https://storage.googleapis.com/teachable-machine-models/mobilenet_v2_weights_tf_dim_ordering_tf_kernels_1.0_224_no_top/model.json";
+}
+
+export function imageToTensor(data: any): tf.Tensor3D {
+  let tensor: tf.Tensor3D;
+
+  if (data instanceof tf.Tensor) {
+      tensor = data;
+  } else {
+     // MobileNet 모델 로드
+      tensor = tf.browser.fromPixels(data);
+  }
+  return tensor;
+}
+
+export function capture(rasterElement: HTMLImageElement | HTMLVideoElement | HTMLCanvasElement, grayscale?: boolean) {
+  return tf.tidy(() => {
+    const pixels = tf.browser.fromPixels(rasterElement);
+
+    // crop the image so we're using the center square
+    const cropped = cropTensor(pixels, grayscale);
+
+    // Expand the outer most dimension so we have a batch size of 1
+    const batchedImage = cropped.expandDims(0);
+
+    // Normalize the image between -1 and a1. The image comes in between 0-255
+    // so we divide by 127 and subtract 1.
+    return batchedImage.toFloat().div(tf.scalar(127)).sub(tf.scalar(1));
+  });
+}
+
+export function cropTensor( img: tf.Tensor3D, grayscaleModel?: boolean, grayscaleInput?: boolean ) : tf.Tensor3D {
+  const size = Math.min(img.shape[0], img.shape[1]);
+  const centerHeight = img.shape[0] / 2;
+  const beginHeight = centerHeight - (size / 2);
+  const centerWidth = img.shape[1] / 2;
+  const beginWidth = centerWidth - (size / 2);
+  
+  if (grayscaleModel && !grayscaleInput) {
+    //cropped rgb data
+    let grayscale_cropped = img.slice([beginHeight, beginWidth, 0], [size, size, 3]);
+    
+    grayscale_cropped = grayscale_cropped.reshape([size * size, 1, 3])
+    const rgb_weights = [0.2989, 0.5870, 0.1140]
+    grayscale_cropped = tf.mul(grayscale_cropped, rgb_weights)
+    grayscale_cropped = grayscale_cropped.reshape([size, size, 3]);
+
+    grayscale_cropped = tf.sum(grayscale_cropped, -1)
+    grayscale_cropped = tf.expandDims(grayscale_cropped, -1)
+    return grayscale_cropped;
+  }
+  return img.slice([beginHeight, beginWidth, 0], [size, size, 3]);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "learning_model",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "description": "learning model develop",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/learning/util.d.ts

@@ -1,2 +0,0 @@
-import * as tf from '@tensorflow/tfjs';
-export declare function ImageToTensor(data: any): tf.Tensor3D;

package/dist/learning/util.js

@@ -1,40 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageToTensor = void 0;
-const tf = __importStar(require("@tensorflow/tfjs"));
-function ImageToTensor(data) {
-    let tensor;
-    console.log('data', data instanceof tf.Tensor, typeof data);
-    if (data instanceof tf.Tensor) {
-        tensor = data;
-    }
-    else {
-        // MobileNet 모델 로드
-        tensor = tf.browser.fromPixels(data);
-    }
-    return tensor;
-}
-exports.ImageToTensor = ImageToTensor;

package/dist/lib/learning/util.d.ts

@@ -1,2 +0,0 @@
-import * as tf from '@tensorflow/tfjs';
-export declare function ImageToTensor(data: any): tf.Tensor3D;

package/lib/learning/util.ts

@@ -1,16 +0,0 @@
-import * as tf from '@tensorflow/tfjs';
-
-export function ImageToTensor(data: any): tf.Tensor3D {
-    let tensor: tf.Tensor3D;
-
-    console.log('data', data instanceof tf.Tensor, typeof data);
-    if (data instanceof tf.Tensor) {
-        tensor = data;
-    } else {
-       // MobileNet 모델 로드
-        tensor = tf.browser.fromPixels(data);
-    }
-
-    return tensor;
-}
-