enhanced typing exports

CHANGELOG.md

@@ -9,8 +9,9 @@
   
 ## Changelog
   
-### **HEAD -> main** 2021/10/21 mandic00@live.com
+### **HEAD -> main** 2021/10/22 mandic00@live.com
 
+- add optional autodetected custom wasm path
 
 ### **2.3.6** 2021/10/21 mandic00@live.com
 

build.json

@@ -33,6 +33,8 @@
     "global": {
       "target": "es2018",
       "sourcemap": false,
+      "treeShaking": true,
+      "ignoreAnnotations": true,
       "banner": { "js": "/*\n  Human\n  homepage: <https://github.com/vladmandic/human>\n  author: <https://github.com/vladmandic>'\n*/\n" }
     },
     "targets": [

dist/human.custom.esm.js

@@ -701,7 +701,7 @@ __export(tfjs_esm_exports, {
   zeros: () => zeros,
   zerosLike: () => zerosLike
 });
-var __require2 = /* @__PURE__ */ ((x) => typeof __require !== "undefined" ? __require : typeof Proxy !== "undefined" ? new Proxy(x, {
+var __require2 = ((x) => typeof __require !== "undefined" ? __require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof __require !== "undefined" ? __require : a)[b]
 }) : x)(function(x) {
   if (typeof __require !== "undefined")
@@ -715,7 +715,7 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __markAsModule2 = (target) => __defProp2(target, "__esModule", { value: true });
-var __require22 = /* @__PURE__ */ ((x) => typeof __require2 !== "undefined" ? __require2 : typeof Proxy !== "undefined" ? new Proxy(x, {
+var __require22 = ((x) => typeof __require2 !== "undefined" ? __require2 : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof __require2 !== "undefined" ? __require2 : a)[b]
 }) : x)(function(x) {
   if (typeof __require2 !== "undefined")

dist/human.esm-nobundle.js

@@ -220,16 +220,19 @@ var config = {
 // dist/tfjs.esm.js
 var tfjs_esm_exports = {};
 __export(tfjs_esm_exports, {
+  GraphModel: () => GraphModel,
+  OptimizerConstructors: () => OptimizerConstructors,
+  Tensor: () => Tensor,
   version: () => version9
 });
 __reExport(tfjs_esm_exports, dist_star);
 __reExport(tfjs_esm_exports, dist_star2);
 __reExport(tfjs_esm_exports, dist_star3);
-__reExport(tfjs_esm_exports, dist_star4);
 import * as dist_star from "@tensorflow/tfjs/dist/index.js";
 import * as dist_star2 from "@tensorflow/tfjs-backend-webgl/dist/index.js";
 import * as dist_star3 from "@tensorflow/tfjs-backend-wasm/dist/index.js";
-import * as dist_star4 from "@tensorflow/tfjs-backend-webgpu/dist/index.js";
+import { Tensor } from "@tensorflow/tfjs/dist/index.js";
+import { GraphModel } from "@tensorflow/tfjs-converter/dist/index";
 var version = "3.10.0";
 var version2 = "3.10.0";
 var version3 = "3.10.0";
@@ -248,6 +251,7 @@ var version9 = {
   "tfjs-backend-webgl": version7,
   "tfjs-backend-wasm": version8
 };
+var OptimizerConstructors = {};
 
 // src/image/imagefxshaders.ts
 var vertexIdentity = `
@@ -964,10 +968,10 @@ function process2(input, config3, getTensor = true) {
       log("input is missing");
     return { tensor: null, canvas: null };
   }
-  if (!(input instanceof tfjs_esm_exports.Tensor) && !(typeof Image !== "undefined" && input instanceof Image) && !(typeof env.Canvas !== "undefined" && input instanceof env.Canvas) && !(typeof globalThis.Canvas !== "undefined" && input instanceof globalThis.Canvas) && !(typeof ImageData !== "undefined" && input instanceof ImageData) && !(typeof ImageBitmap !== "undefined" && input instanceof ImageBitmap) && !(typeof HTMLImageElement !== "undefined" && input instanceof HTMLImageElement) && !(typeof HTMLMediaElement !== "undefined" && input instanceof HTMLMediaElement) && !(typeof HTMLVideoElement !== "undefined" && input instanceof HTMLVideoElement) && !(typeof HTMLCanvasElement !== "undefined" && input instanceof HTMLCanvasElement) && !(typeof OffscreenCanvas !== "undefined" && input instanceof OffscreenCanvas)) {
+  if (!(input instanceof Tensor) && !(typeof Image !== "undefined" && input instanceof Image) && !(typeof env.Canvas !== "undefined" && input instanceof env.Canvas) && !(typeof globalThis.Canvas !== "undefined" && input instanceof globalThis.Canvas) && !(typeof ImageData !== "undefined" && input instanceof ImageData) && !(typeof ImageBitmap !== "undefined" && input instanceof ImageBitmap) && !(typeof HTMLImageElement !== "undefined" && input instanceof HTMLImageElement) && !(typeof HTMLMediaElement !== "undefined" && input instanceof HTMLMediaElement) && !(typeof HTMLVideoElement !== "undefined" && input instanceof HTMLVideoElement) && !(typeof HTMLCanvasElement !== "undefined" && input instanceof HTMLCanvasElement) && !(typeof OffscreenCanvas !== "undefined" && input instanceof OffscreenCanvas)) {
     throw new Error("input type is not recognized");
   }
-  if (input instanceof tfjs_esm_exports.Tensor) {
+  if (input instanceof Tensor) {
     if (input["isDisposedInternal"]) {
       throw new Error("input tensor is disposed");
     } else if (!input.shape || input.shape.length !== 4 || input.shape[0] !== 1 || input.shape[3] !== 3) {
@@ -5687,7 +5691,7 @@ async function load9(config3) {
 function enhance(input) {
   const image25 = tfjs_esm_exports.tidy(() => {
     const tensor3 = input.image || input.tensor || input;
-    if (!(tensor3 instanceof tfjs_esm_exports.Tensor))
+    if (!(tensor3 instanceof Tensor))
       return null;
     const box4 = [[0.05, 0.15, 0.85, 0.85]];
     if (!(model9 == null ? void 0 : model9.inputs[0].shape))
@@ -12713,7 +12717,7 @@ var Human = class {
         return null;
       if (!input)
         return "input is not defined";
-      if (this.env.node && !(input instanceof tfjs_esm_exports.Tensor))
+      if (this.env.node && !(input instanceof Tensor))
         return "input must be a tensor";
       try {
         this.tf.getBackend();

package.json

@@ -86,5 +86,8 @@
     "tslib": "^2.3.1",
     "typedoc": "0.22.6",
     "typescript": "4.4.4"
+  },
+  "dependencies": {
+    "long": "^4.0.0"
   }
 }

src/segmentation/segmentation.ts

@@ -56,7 +56,7 @@ export async function process(input: Input, background: Input | undefined, confi
   } else {
     t.data = tf.image.resizeBilinear(t.squeeze, [height, width]); // model selfie has a single channel that we can use directly
   }
-  const data = Array.from(await t.data.data());
+  const data = Array.from(await t.data.data()) as number[];
 
   if (env.node && !env.Canvas && (typeof ImageData === 'undefined')) {
     if (config.debug) log('canvas support missing');

src/tfjs/types.ts

@@ -11,3 +11,8 @@ export { Tensor } from '@tensorflow/tfjs-core/dist/index';
  * @external
  */
 export { GraphModel } from '@tensorflow/tfjs-converter/dist/index';
+
+/** Tensorflow Long type
+ * @external
+ */
+export { Long } from 'long';

test/build.log

@@ -1,26 +1,26 @@
-2021-10-22 08:57:52 INFO:  @vladmandic/human version 2.4.0 
+2021-10-22 13:34:33 INFO:  @vladmandic/human version 2.4.0 
-2021-10-22 08:57:52 INFO:  User: vlado Platform: linux Arch: x64 Node: v16.10.0 
+2021-10-22 13:34:33 INFO:  User: vlado Platform: linux Arch: x64 Node: v16.10.0 
-2021-10-22 08:57:52 INFO:  Application: {"name":"@vladmandic/human","version":"2.4.0"} 
+2021-10-22 13:34:33 INFO:  Application: {"name":"@vladmandic/human","version":"2.4.0"} 
-2021-10-22 08:57:52 INFO:  Environment: {"profile":"production","config":"build.json","package":"package.json","tsconfig":true,"eslintrc":true,"git":true} 
+2021-10-22 13:34:33 INFO:  Environment: {"profile":"production","config":"build.json","package":"package.json","tsconfig":true,"eslintrc":true,"git":true} 
-2021-10-22 08:57:52 INFO:  Toolchain: {"build":"0.6.2","esbuild":"0.13.8","typescript":"4.4.4","typedoc":"0.22.6","eslint":"8.0.1"} 
+2021-10-22 13:34:33 INFO:  Toolchain: {"build":"0.6.2","esbuild":"0.13.8","typescript":"4.4.4","typedoc":"0.22.6","eslint":"8.0.1"} 
-2021-10-22 08:57:52 INFO:  Build: {"profile":"production","steps":["clean","compile","typings","typedoc","lint","changelog"]} 
+2021-10-22 13:34:33 INFO:  Build: {"profile":"production","steps":["clean","compile","typings","typedoc","lint","changelog"]} 
-2021-10-22 08:57:52 STATE: Clean: {"locations":["dist/*","types/*","typedoc/*"]} 
+2021-10-22 13:34:33 STATE: Clean: {"locations":["dist/*","types/*","typedoc/*"]} 
-2021-10-22 08:57:52 STATE: Compile: {"name":"tfjs/nodejs/cpu","format":"cjs","platform":"node","input":"tfjs/tf-node.ts","output":"dist/tfjs.esm.js","files":1,"inputBytes":102,"outputBytes":1275} 
+2021-10-22 13:34:33 STATE: Compile: {"name":"tfjs/nodejs/cpu","format":"cjs","platform":"node","input":"tfjs/tf-node.ts","output":"dist/tfjs.esm.js","files":1,"inputBytes":102,"outputBytes":1275} 
-2021-10-22 08:57:52 STATE: Compile: {"name":"human/nodejs/cpu","format":"cjs","platform":"node","input":"src/human.ts","output":"dist/human.node.js","files":54,"inputBytes":523520,"outputBytes":436010} 
+2021-10-22 13:34:33 STATE: Compile: {"name":"human/nodejs/cpu","format":"cjs","platform":"node","input":"src/human.ts","output":"dist/human.node.js","files":54,"inputBytes":523578,"outputBytes":436010} 
-2021-10-22 08:57:52 STATE: Compile: {"name":"tfjs/nodejs/gpu","format":"cjs","platform":"node","input":"tfjs/tf-node-gpu.ts","output":"dist/tfjs.esm.js","files":1,"inputBytes":110,"outputBytes":1283} 
+2021-10-22 13:34:33 STATE: Compile: {"name":"tfjs/nodejs/gpu","format":"cjs","platform":"node","input":"tfjs/tf-node-gpu.ts","output":"dist/tfjs.esm.js","files":1,"inputBytes":110,"outputBytes":1283} 
-2021-10-22 08:57:52 STATE: Compile: {"name":"human/nodejs/gpu","format":"cjs","platform":"node","input":"src/human.ts","output":"dist/human.node-gpu.js","files":54,"inputBytes":523528,"outputBytes":436014} 
+2021-10-22 13:34:33 STATE: Compile: {"name":"human/nodejs/gpu","format":"cjs","platform":"node","input":"src/human.ts","output":"dist/human.node-gpu.js","files":54,"inputBytes":523586,"outputBytes":436014} 
-2021-10-22 08:57:53 STATE: Compile: {"name":"tfjs/nodejs/wasm","format":"cjs","platform":"node","input":"tfjs/tf-node-wasm.ts","output":"dist/tfjs.esm.js","files":1,"inputBytes":149,"outputBytes":1350} 
+2021-10-22 13:34:33 STATE: Compile: {"name":"tfjs/nodejs/wasm","format":"cjs","platform":"node","input":"tfjs/tf-node-wasm.ts","output":"dist/tfjs.esm.js","files":1,"inputBytes":149,"outputBytes":1350} 
-2021-10-22 08:57:53 STATE: Compile: {"name":"human/nodejs/wasm","format":"cjs","platform":"node","input":"src/human.ts","output":"dist/human.node-wasm.js","files":54,"inputBytes":523595,"outputBytes":436086} 
+2021-10-22 13:34:33 STATE: Compile: {"name":"human/nodejs/wasm","format":"cjs","platform":"node","input":"src/human.ts","output":"dist/human.node-wasm.js","files":54,"inputBytes":523653,"outputBytes":436086} 
-2021-10-22 08:57:53 STATE: Compile: {"name":"tfjs/browser/version","format":"esm","platform":"browser","input":"tfjs/tf-version.ts","output":"dist/tfjs.version.js","files":1,"inputBytes":1063,"outputBytes":1652} 
+2021-10-22 13:34:33 STATE: Compile: {"name":"tfjs/browser/version","format":"esm","platform":"browser","input":"tfjs/tf-version.ts","output":"dist/tfjs.version.js","files":1,"inputBytes":1063,"outputBytes":1652} 
-2021-10-22 08:57:53 STATE: Compile: {"name":"tfjs/browser/esm/nobundle","format":"esm","platform":"browser","input":"tfjs/tf-browser.ts","output":"dist/tfjs.esm.js","files":2,"inputBytes":2156,"outputBytes":864} 
+2021-10-22 13:34:33 STATE: Compile: {"name":"tfjs/browser/esm/nobundle","format":"esm","platform":"browser","input":"tfjs/tf-browser.ts","output":"dist/tfjs.esm.js","files":2,"inputBytes":2365,"outputBytes":1030} 
-2021-10-22 08:57:53 STATE: Compile: {"name":"human/browser/esm/nobundle","format":"esm","platform":"browser","input":"src/human.ts","output":"dist/human.esm-nobundle.js","files":54,"inputBytes":523109,"outputBytes":437917} 
+2021-10-22 13:34:33 STATE: Compile: {"name":"human/browser/esm/nobundle","format":"esm","platform":"browser","input":"src/human.ts","output":"dist/human.esm-nobundle.js","files":54,"inputBytes":523333,"outputBytes":437997} 
-2021-10-22 08:57:53 STATE: Compile: {"name":"tfjs/browser/esm/custom","format":"esm","platform":"browser","input":"tfjs/tf-custom.ts","output":"dist/tfjs.esm.js","files":2,"inputBytes":2572202,"outputBytes":2491641} 
+2021-10-22 13:34:33 STATE: Compile: {"name":"tfjs/browser/esm/custom","format":"esm","platform":"browser","input":"tfjs/tf-custom.ts","output":"dist/tfjs.esm.js","files":2,"inputBytes":2572202,"outputBytes":2491625} 
-2021-10-22 08:57:54 STATE: Compile: {"name":"human/browser/esm/custom","format":"esm","platform":"browser","input":"src/human.ts","output":"dist/human.custom.esm.js","files":54,"inputBytes":3013886,"outputBytes":2933074} 
+2021-10-22 13:34:34 STATE: Compile: {"name":"human/browser/esm/custom","format":"esm","platform":"browser","input":"src/human.ts","output":"dist/human.custom.esm.js","files":54,"inputBytes":3013928,"outputBytes":2933042} 
-2021-10-22 08:57:55 STATE: Compile: {"name":"tfjs/browser/esm/bundle","format":"esm","platform":"browser","input":"tfjs/tf-browser.ts","output":"dist/tfjs.esm.js","files":8,"inputBytes":2156,"outputBytes":2779919} 
+2021-10-22 13:34:35 STATE: Compile: {"name":"tfjs/browser/esm/bundle","format":"esm","platform":"browser","input":"tfjs/tf-browser.ts","output":"dist/tfjs.esm.js","files":8,"inputBytes":2365,"outputBytes":2411315} 
-2021-10-22 08:57:55 STATE: Compile: {"name":"human/browser/iife/bundle","format":"iife","platform":"browser","input":"src/human.ts","output":"dist/human.js","files":54,"inputBytes":3302164,"outputBytes":1636204} 
+2021-10-22 13:34:35 STATE: Compile: {"name":"human/browser/iife/bundle","format":"iife","platform":"browser","input":"src/human.ts","output":"dist/human.js","files":54,"inputBytes":2933618,"outputBytes":1431470} 
-2021-10-22 08:57:56 STATE: Compile: {"name":"human/browser/esm/bundle","format":"esm","platform":"browser","input":"src/human.ts","output":"dist/human.esm.js","files":54,"inputBytes":3302164,"outputBytes":3007059} 
+2021-10-22 13:34:36 STATE: Compile: {"name":"human/browser/esm/bundle","format":"esm","platform":"browser","input":"src/human.ts","output":"dist/human.esm.js","files":54,"inputBytes":2933618,"outputBytes":2674673} 
-2021-10-22 08:58:16 STATE: Typings: {"input":"src/human.ts","output":"types","files":16} 
+2021-10-22 13:34:56 STATE: Typings: {"input":"src/human.ts","output":"types","files":16} 
-2021-10-22 08:58:23 STATE: TypeDoc: {"input":"src/human.ts","output":"typedoc","objects":36,"generated":true} 
+2021-10-22 13:35:03 STATE: TypeDoc: {"input":"src/human.ts","output":"typedoc","objects":36,"generated":true} 
-2021-10-22 08:59:08 STATE: Lint: {"locations":["*.json","src/**/*.ts","test/**/*.js","demo/**/*.js"],"files":90,"errors":0,"warnings":0} 
+2021-10-22 13:35:46 STATE: Lint: {"locations":["*.json","src/**/*.ts","test/**/*.js","demo/**/*.js"],"files":90,"errors":0,"warnings":0} 
-2021-10-22 08:59:08 STATE: ChangeLog: {"repository":"https://github.com/vladmandic/human","branch":"main","output":"CHANGELOG.md"} 
+2021-10-22 13:35:46 STATE: ChangeLog: {"repository":"https://github.com/vladmandic/human","branch":"main","output":"CHANGELOG.md"} 
-2021-10-22 08:59:08 INFO:  Done... 
+2021-10-22 13:35:46 INFO:  Done... 

tfjs/tf-browser.ts

@@ -9,7 +9,11 @@ export * from '@tensorflow/tfjs-backend-webgl/dist/index.js';
 export * from '@tensorflow/tfjs-backend-wasm/dist/index.js';
 
 // add webgpu to bundle, experimental
-export * from '@tensorflow/tfjs-backend-webgpu/dist/index.js';
+// export * from '@tensorflow/tfjs-backend-webgpu/dist/index.js';
 
 // export versions, overrides version object from @tensorflow/tfjs
 export { version } from '../dist/tfjs.version.js';
+
+// export utility types used by Human
+export { Tensor } from '@tensorflow/tfjs/dist/index.js';
+export { GraphModel } from '@tensorflow/tfjs-converter/dist/index';

tsconfig.json

@@ -5,7 +5,7 @@
     "moduleResolution": "node",
     "outDir": "types",
     "baseUrl": "./",
-    "paths": { "tslib": ["node_modules/tslib/tslib.d.ts"] },
+    "paths": { "tslib": ["./node_modules/tslib/tslib.d.ts"] },
     "allowJs": true,
     "allowSyntheticDefaultImports": false,
     "allowUnreachableCode": false,
@@ -14,7 +14,7 @@
     "declaration": true,
     "declarationMap": true,
     "emitDecoratorMetadata": true,
-    "esModuleInterop": false,
+    "esModuleInterop": true,
     "exactOptionalPropertyTypes": true,
     "experimentalDecorators": true,
     "forceConsistentCasingInFileNames": true,

types/dist/tfjs.esm.d.ts

@@ -1099,6 +1099,7 @@ export var Optimizer: {
     };
     fromConfig(cls: any, config: any): any;
 };
+declare var OptimizerConstructors2: {};
 export var Pack: string;
 export var PadV2: string;
 export var Pool: string;
@@ -2154,12 +2155,11 @@ declare var version3: string;
 declare var version: string;
 declare var version2: string;
 declare var version8: string;
-declare var version5: string;
+declare var version6: string;
 export namespace webgl {
     export { forceHalfFloat };
 }
 declare var webgl_util_exports: {};
-declare var webgpu_exports: {};
 export function where(...args: any[]): any;
 export namespace where { }
 export function whereAsync(condition: any): Promise<any>;
@@ -2573,5 +2573,5 @@ declare var OptimizerConstructors: {
         getClassName(): any;
     };
 };
-export { add2 as add, backend_util_exports as backend_util, browser_exports as browser, exports_constraints_exports as constraints, dist_exports as data, device_util_exports as device_util, fused_ops_exports as fused, gather_nd_util_exports as gather_util, gpgpu_util_exports as gpgpu_util, exports_initializers_exports as initializers, io_exports as io, isFinite2 as isFinite, isNaN2 as isNaN, kernel_impls_exports as kernel_impls, exports_layers_exports as layers, log5 as log, math_exports as math, exports_metrics_exports as metrics, exports_models_exports as models, ones2 as ones, print2 as print, exports_regularizers_exports as regularizers, round2 as round, scatter_nd_util_exports as scatter_util, serialization_exports as serialization, slice_util_exports as slice_util, sum2 as sum, tanh2 as tanh, tensor_util_exports as tensor_util, test_util_exports as test_util, util_exports as util, version92 as version, version3 as version_converter, version as version_core, version2 as version_layers, version8 as version_wasm, version5 as version_webgl, webgl_util_exports as webgl_util, webgpu_exports as webgpu };
+export { OptimizerConstructors2 as OptimizerConstructors, add2 as add, backend_util_exports as backend_util, browser_exports as browser, exports_constraints_exports as constraints, dist_exports as data, device_util_exports as device_util, fused_ops_exports as fused, gather_nd_util_exports as gather_util, gpgpu_util_exports as gpgpu_util, exports_initializers_exports as initializers, io_exports as io, isFinite2 as isFinite, isNaN2 as isNaN, kernel_impls_exports as kernel_impls, exports_layers_exports as layers, log5 as log, math_exports as math, exports_metrics_exports as metrics, exports_models_exports as models, ones2 as ones, print2 as print, exports_regularizers_exports as regularizers, round2 as round, scatter_nd_util_exports as scatter_util, serialization_exports as serialization, slice_util_exports as slice_util, sum2 as sum, tanh2 as tanh, tensor_util_exports as tensor_util, test_util_exports as test_util, util_exports as util, version92 as version, version3 as version_converter, version as version_core, version2 as version_layers, version8 as version_wasm, version6 as version_webgl, webgl_util_exports as webgl_util };
 //# sourceMappingURL=tfjs.esm.d.ts.map

types/src/tfjs/types.d.ts

@@ -9,4 +9,8 @@ export { Tensor } from '@tensorflow/tfjs-core/dist/index';
  * @external
  */
 export { GraphModel } from '@tensorflow/tfjs-converter/dist/index';
+/** Tensorflow Long type
+ * @external
+ */
+export { Long } from 'long';
 //# sourceMappingURL=types.d.ts.map

types/src/tfjs/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/tfjs/types.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC;;;GAGG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE1D;;;GAGG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/tfjs/types.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC;;;GAGG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE1D;;;GAGG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAEnE;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC"}