From 2dba5ceb5b2de881562eb8af501c6c566eb798c1 Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Mon, 14 Jun 2021 08:16:10 -0400
Subject: [PATCH] reorganize demos

---
 CHANGELOG.md                                        |  2 +-
 README.md                                           |  8 ++++----
 demo/{ => facematch}/facematch.js                   | 10 ++++++----
 demo/{facematch-faces.json => facematch/faces.json} |  0
 demo/{facematch.html => facematch/index.html}       | 10 +++++-----
 demo/{ => nodejs}/node-multiprocess-worker.js       |  2 +-
 demo/{ => nodejs}/node-multiprocess.js              |  5 ++++-
 demo/{ => nodejs}/node-video.js                     |  4 ++--
 demo/{ => nodejs}/node-webcam.js                    |  4 ++--
 demo/{ => nodejs}/node.js                           |  2 +-
 package.json                                        |  6 +++---
 wiki                                                |  2 +-
 12 files changed, 30 insertions(+), 25 deletions(-)
 rename demo/{ => facematch}/facematch.js (96%)
 rename demo/{facematch-faces.json => facematch/faces.json} (100%)
 rename demo/{facematch.html => facematch/index.html} (84%)
 rename demo/{ => nodejs}/node-multiprocess-worker.js (95%)
 rename demo/{ => nodejs}/node-multiprocess.js (95%)
 rename demo/{ => nodejs}/node-video.js (94%)
 rename demo/{ => nodejs}/node-webcam.js (94%)
 rename demo/{ => nodejs}/node.js (98%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f9da4b6..b9eca3b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ Repository: **<git+https://github.com/vladmandic/human.git>**
 
 ## Changelog
 
-### **HEAD -> main** 2021/06/09 mandic00@live.com
+### **HEAD -> main** 2021/06/11 mandic00@live.com
 
 - add body segmentation sample
 
diff --git a/README.md b/README.md
index a796b37e..4fc17a72 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ Check out [**Live Demo**](https://vladmandic.github.io/human/demo/index.html) ap
 ## Demos
 
 - [**Main Application**](https://vladmandic.github.io/human/demo/index.html)
-- [**Face Extraction, Description, Identification and Matching**](https://vladmandic.github.io/human/demo/facematch.html)
-- [**Face Extraction and 3D Rendering**](https://vladmandic.github.io/human/demo/face3d.html)
+- [**Face Extraction, Description, Identification and Matching**](https://vladmandic.github.io/human/demo/facematch/index.html)
+- [**Face Extraction and 3D Rendering**](https://vladmandic.github.io/human/demo/face3d/index.html)
 - [**Details on Demo Applications**](https://github.com/vladmandic/human/wiki/Demos)
 
 ## Project pages
@@ -134,14 +134,14 @@ All options as presented in the demo application...
 Extracts all faces from provided input images,  
 sorts them by similarity to selected face  
 and optionally matches detected face with database of known people to guess their names
-> [demo/facematch.html](demo/facematch.html)  
+> [demo/facematch](demo/facematch/index.html)  
 
 ![Face Matching](assets/screenshot-facematch.jpg)
 
 <br>
 
 **Face3D OpenGL Rendering:**  
-> [demo/face3d.html](demo/face3d.html)
+> [demo/face3d](demo/face3d/index.html)
 
 ![Face Matching](assets/screenshot-face3d.jpg)
 
diff --git a/demo/facematch.js b/demo/facematch/facematch.js
similarity index 96%
rename from demo/facematch.js
rename to demo/facematch/facematch.js
index cd4d2982..768bac56 100644
--- a/demo/facematch.js
+++ b/demo/facematch/facematch.js
@@ -6,13 +6,15 @@
  * Demo for face descriptor analysis and face simmilarity analysis
  */
 
-import Human from '../dist/human.esm.js';
+import Human from '../../dist/human.esm.js';
 
 const userConfig = {
   backend: 'wasm',
   async: false,
   warmup: 'none',
   debug: true,
+  modelBasePath: '../../models/',
+  wasmPath: 'https://cdn.jsdelivr.net/npm/@tensorflow/tfjs-backend-wasm@3.7.0/dist/',
   face: {
     enabled: true,
     detector: { rotation: true, return: true },
@@ -49,8 +51,8 @@ function log(...msg) {
 async function getFaceDB() {
   // download db with known faces
   try {
-    let res = await fetch('/demo/facematch-faces.json');
-    if (!res || !res.ok) res = await fetch('/human/demo/facematch-faces.json');
+    let res = await fetch('/demo/facematch/faces.json');
+    if (!res || !res.ok) res = await fetch('/human/demo/facematch/faces.json');
     db = (res && res.ok) ? await res.json() : [];
     for (const rec of db) {
       rec.embedding = rec.embedding.map((a) => parseFloat(a.toFixed(4)));
@@ -147,7 +149,7 @@ async function process(index, image) {
   return new Promise((resolve) => {
     const img = new Image(128, 128);
     img.onload = () => { // must wait until image is loaded
-      human.detect(img).then(async (res) => {
+      human.detect(img, userConfig).then(async (res) => {
         await faces(index, res, image); // then wait until image is analyzed
         log('Add image:', index + 1, image, 'faces:', res.face.length);
         document.getElementById('images').appendChild(img); // and finally we can add it
diff --git a/demo/facematch-faces.json b/demo/facematch/faces.json
similarity index 100%
rename from demo/facematch-faces.json
rename to demo/facematch/faces.json
diff --git a/demo/facematch.html b/demo/facematch/index.html
similarity index 84%
rename from demo/facematch.html
rename to demo/facematch/index.html
index e5eff3c1..38d33a27 100644
--- a/demo/facematch.html
+++ b/demo/facematch/index.html
@@ -9,12 +9,12 @@
     <meta name="description" content="Human: 3D Face Detection, Body Pose, Hand & Finger Tracking, Iris Tracking, Age & Gender Prediction, Emotion Prediction & Gesture Recognition; Author: Vladimir Mandic <https://github.com/vladmandic>">
     <meta name="msapplication-tooltip" content="Human: 3D Face Detection, Body Pose, Hand & Finger Tracking, Iris Tracking, Age & Gender Prediction, Emotion Prediction & Gesture Recognition; Author: Vladimir Mandic <https://github.com/vladmandic>">
     <meta name="theme-color" content="#000000">
-    <link rel="manifest" href="./manifest.webmanifest">
-    <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
-    <link rel="apple-touch-icon" href="../assets/icon.png">
-    <script src="./facematch.js" type="module"></script>
+    <link rel="manifest" href="../manifest.webmanifest">
+    <link rel="shortcut icon" href="../../favicon.ico" type="image/x-icon">
+    <link rel="apple-touch-icon" href="../../assets/icon.png">
+    <script src="facematch/facematch.js" type="module"></script>
     <style>
-      @font-face { font-family: 'Lato'; font-display: swap; font-style: normal; font-weight: 100; src: local('Lato'), url('../assets/lato-light.woff2') }
+      @font-face { font-family: 'Lato'; font-display: swap; font-style: normal; font-weight: 100; src: local('Lato'), url('../../assets/lato-light.woff2') }
       html { font-family: 'Lato', 'Segoe UI'; font-size: 24px; font-variant: small-caps; }
       body { margin: 0; background: black; color: white; overflow-x: hidden; }
       img { object-fit: contain; }
diff --git a/demo/node-multiprocess-worker.js b/demo/nodejs/node-multiprocess-worker.js
similarity index 95%
rename from demo/node-multiprocess-worker.js
rename to demo/nodejs/node-multiprocess-worker.js
index 47430aa6..8558ff1c 100644
--- a/demo/node-multiprocess-worker.js
+++ b/demo/nodejs/node-multiprocess-worker.js
@@ -11,7 +11,7 @@ const log = require('@vladmandic/pilogger');
 // workers actual import tfjs and faceapi modules
 // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
 const tf = require('@tensorflow/tfjs-node');
-const Human = require('../dist/human.node.js').default; // or const Human = require('../dist/human.node-gpu.js').default;
+const Human = require('../../dist/human.node.js').default; // or const Human = require('../dist/human.node-gpu.js').default;
 
 let human = null;
 
diff --git a/demo/node-multiprocess.js b/demo/nodejs/node-multiprocess.js
similarity index 95%
rename from demo/node-multiprocess.js
rename to demo/nodejs/node-multiprocess.js
index f56b2a9e..0c23aedb 100644
--- a/demo/node-multiprocess.js
+++ b/demo/nodejs/node-multiprocess.js
@@ -13,6 +13,7 @@ const log = require('@vladmandic/pilogger'); // this is my simple logger with fe
 const child_process = require('child_process');
 // note that main process import faceapi or tfjs at all
 
+const workerFile = 'demo/nodejs/node-multiprocess-worker.js';
 const imgPathRoot = './assets'; // modify to include your sample images
 const numWorkers = 4; // how many workers will be started
 const workers = []; // this holds worker processes
@@ -68,10 +69,12 @@ async function main() {
   log.state('Enumerated images:', imgPathRoot, numImages);
 
   t[0] = process.hrtime.bigint();
+  t[1] = process.hrtime.bigint();
+  t[2] = process.hrtime.bigint();
   // manage worker processes
   for (let i = 0; i < numWorkers; i++) {
     // create worker process
-    workers[i] = await child_process.fork('demo/node-multiprocess-worker.js', ['special']);
+    workers[i] = await child_process.fork(workerFile, ['special']);
     // parse message that worker process sends back to main
     // if message is ready, dispatch next image in queue
     // if message is processing result, just print how many faces were detected
diff --git a/demo/node-video.js b/demo/nodejs/node-video.js
similarity index 94%
rename from demo/node-video.js
rename to demo/nodejs/node-video.js
index e7a12580..92a806e7 100644
--- a/demo/node-video.js
+++ b/demo/nodejs/node-video.js
@@ -19,7 +19,7 @@ const Pipe2Jpeg = require('pipe2jpeg');
 // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
 const tf = require('@tensorflow/tfjs-node'); // or const tf = require('@tensorflow/tfjs-node-gpu');
 // load specific version of Human library that matches TensorFlow mode
-const Human = require('../dist/human.node.js').default; // or const Human = require('../dist/human.node-gpu.js').default;
+const Human = require('../../dist/human.node.js').default; // or const Human = require('../dist/human.node-gpu.js').default;
 
 let count = 0; // counter
 let busy = false; // busy flag
@@ -27,7 +27,7 @@ const inputFile = './test.mp4';
 
 const humanConfig = {
   backend: 'tensorflow',
-  modelBasePath: 'file://node_modules/@vladmandic/human/models/',
+  modelBasePath: 'file://models/',
   debug: false,
   async: true,
   filter: { enabled: false },
diff --git a/demo/node-webcam.js b/demo/nodejs/node-webcam.js
similarity index 94%
rename from demo/node-webcam.js
rename to demo/nodejs/node-webcam.js
index d19e1ffe..a55bfded 100644
--- a/demo/node-webcam.js
+++ b/demo/nodejs/node-webcam.js
@@ -14,7 +14,7 @@ const nodeWebCam = require('node-webcam');
 // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
 const tf = require('@tensorflow/tfjs-node'); // or const tf = require('@tensorflow/tfjs-node-gpu');
 // load specific version of Human library that matches TensorFlow mode
-const Human = require('../dist/human.node.js').default; // or const Human = require('../dist/human.node-gpu.js').default;
+const Human = require('../../dist/human.node.js').default; // or const Human = require('../dist/human.node-gpu.js').default;
 
 // options for node-webcam
 const optionsCamera = {
@@ -25,7 +25,7 @@ const optionsCamera = {
 // options for human
 const optionsHuman = {
   backend: 'tensorflow',
-  modelBasePath: 'file://node_modules/@vladmandic/human/models/',
+  modelBasePath: 'file://models/',
 };
 
 const camera = nodeWebCam.create(optionsCamera);
diff --git a/demo/node.js b/demo/nodejs/node.js
similarity index 98%
rename from demo/node.js
rename to demo/nodejs/node.js
index 6a09eee2..3a5d5002 100644
--- a/demo/node.js
+++ b/demo/nodejs/node.js
@@ -13,7 +13,7 @@ const fetch = require('node-fetch').default;
 const tf = require('@tensorflow/tfjs-node'); // or const tf = require('@tensorflow/tfjs-node-gpu');
 
 // load specific version of Human library that matches TensorFlow mode
-const Human = require('../dist/human.node.js').default; // or const Human = require('../dist/human.node-gpu.js').default;
+const Human = require('../../dist/human.node.js').default; // or const Human = require('../dist/human.node-gpu.js').default;
 
 let human = null;
 
diff --git a/package.json b/package.json
index c4746645..fdf71b71 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "url": "git+https://github.com/vladmandic/human.git"
   },
   "scripts": {
-    "start": "node --trace-warnings --unhandled-rejections=strict --trace-uncaught demo/node.js",
+    "start": "node --trace-warnings --unhandled-rejections=strict --trace-uncaught demo/nodejs/node.js",
     "dev": "node --trace-warnings --unhandled-rejections=strict --trace-uncaught server/serve.js",
     "build": "node --trace-warnings --unhandled-rejections=strict --trace-uncaught server/build.js",
     "lint": "eslint src server demo test",
@@ -82,8 +82,8 @@
     "node-fetch": "^2.6.1",
     "rimraf": "^3.0.2",
     "seedrandom": "^3.0.5",
-    "simple-git": "^2.39.1",
-    "tslib": "^2.2.0",
+    "simple-git": "^2.40.0",
+    "tslib": "^2.3.0",
     "typedoc": "^0.21.0-beta.2",
     "typescript": "4.3.2"
   }
diff --git a/wiki b/wiki
index 9e92e5ee..d270e2eb 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 9e92e5eec1e60b5ea58dbf1c4bbc67c828bcf673
+Subproject commit d270e2eb172e90acefb4e3be22260e3ad6a03ab1