update default gender model

pull/70/head
Vladimir Mandic 2021-02-24 09:57:33 -05:00
parent 5b43242db9
commit 2730ca020e
23 changed files with 101 additions and 92 deletions

View File

@ -18,7 +18,7 @@ const myConfig = {
mesh: { modelPath: 'file://models/facemesh.json' },
iris: { modelPath: 'file://models/iris.json' },
age: { modelPath: 'file://models/age-ssrnet-imdb.json' },
gender: { modelPath: 'file://models/gender-ssrnet-imdb.json' },
gender: { modelPath: 'file://models/gender.json' },
emotion: { modelPath: 'file://models/emotion-large.json' },
},
body: { modelPath: 'file://models/posenet.json' },

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,7 @@
{
"inputs": {
"dist/human.esm.js": {
"bytes": 1347010,
"bytes": 1347011,
"imports": []
},
"demo/draw.js": {
@ -43,14 +43,15 @@
"imports": [],
"exports": [],
"inputs": {},
"bytes": 2022011
"bytes": 2055789
},
"dist/demo-browser-index.js": {
"imports": [],
"exports": [],
"entryPoint": "demo/browser.js",
"inputs": {
"dist/human.esm.js": {
"bytesInOutput": 1339534
"bytesInOutput": 1339535
},
"demo/draw.js": {
"bytesInOutput": 6241
@ -65,7 +66,7 @@
"bytesInOutput": 17389
}
},
"bytes": 1388004
"bytes": 1388005
}
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
dist/human.esm.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

9
dist/human.esm.json vendored
View File

@ -417,7 +417,7 @@
"imports": []
},
"package.json": {
"bytes": 2560,
"bytes": 2561,
"imports": []
},
"src/human.ts": {
@ -499,13 +499,14 @@
"imports": [],
"exports": [],
"inputs": {},
"bytes": 1924674
"bytes": 1957830
},
"dist/human.esm.js": {
"imports": [],
"exports": [
"default"
],
"entryPoint": "src/human.ts",
"inputs": {
"src/blazeface/facemesh.ts": {
"bytesInOutput": 1445
@ -619,10 +620,10 @@
"bytesInOutput": 55295
},
"package.json": {
"bytesInOutput": 2572
"bytesInOutput": 2573
}
},
"bytes": 1347010
"bytes": 1347011
}
}
}

View File

@ -417,7 +417,7 @@
"imports": []
},
"package.json": {
"bytes": 2560,
"bytes": 2561,
"imports": []
},
"src/human.ts": {
@ -499,11 +499,12 @@
"imports": [],
"exports": [],
"inputs": {},
"bytes": 1924685
"bytes": 1957841
},
"dist/human.ts": {
"imports": [],
"exports": [],
"entryPoint": "src/human.ts",
"inputs": {
"src/blazeface/facemesh.ts": {
"bytesInOutput": 1445
@ -617,10 +618,10 @@
"bytesInOutput": 55295
},
"package.json": {
"bytesInOutput": 2572
"bytesInOutput": 2573
}
},
"bytes": 1347052
"bytes": 1347053
}
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
dist/human.node.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -417,7 +417,7 @@
"imports": []
},
"package.json": {
"bytes": 2560,
"bytes": 2561,
"imports": []
},
"src/human.ts": {
@ -499,11 +499,12 @@
"imports": [],
"exports": [],
"inputs": {},
"bytes": 705259
"bytes": 706784
},
"dist/human.node-gpu.js": {
"imports": [],
"exports": [],
"entryPoint": "src/human.ts",
"inputs": {
"dist/tfjs.esm.js": {
"bytesInOutput": 551
@ -617,10 +618,10 @@
"bytesInOutput": 55295
},
"package.json": {
"bytesInOutput": 2569
"bytesInOutput": 2570
}
},
"bytes": 276557
"bytes": 276558
}
}
}

2
dist/human.ts vendored

File diff suppressed because one or more lines are too long

2
dist/human.ts.map vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

3
dist/tfjs.esm.json vendored
View File

@ -25495,7 +25495,7 @@
"imports": [],
"exports": [],
"inputs": {},
"bytes": 1209141
"bytes": 1241171
},
"dist/tfjs.esm.js": {
"imports": [],
@ -25974,6 +25974,7 @@
"zeros",
"zerosLike"
],
"entryPoint": "src/tfjs/tf-browser.ts",
"inputs": {
"(disabled):node_modules/node-fetch/browser.js": {
"bytesInOutput": 18

104
package-lock.json generated
View File

@ -406,13 +406,13 @@
"dev": true
},
"@typescript-eslint/eslint-plugin": {
"version": "4.15.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.1.tgz",
"integrity": "sha512-yW2epMYZSpNJXZy22Biu+fLdTG8Mn6b22kR3TqblVk50HGNV8Zya15WAXuQCr8tKw4Qf1BL4QtI6kv6PCkLoJw==",
"version": "4.15.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.2.tgz",
"integrity": "sha512-uiQQeu9tWl3f1+oK0yoAv9lt/KXO24iafxgQTkIYO/kitruILGx3uH+QtIAHqxFV+yIsdnJH+alel9KuE3J15Q==",
"dev": true,
"requires": {
"@typescript-eslint/experimental-utils": "4.15.1",
"@typescript-eslint/scope-manager": "4.15.1",
"@typescript-eslint/experimental-utils": "4.15.2",
"@typescript-eslint/scope-manager": "4.15.2",
"debug": "^4.1.1",
"functional-red-black-tree": "^1.0.1",
"lodash": "^4.17.15",
@ -448,28 +448,28 @@
}
},
"@typescript-eslint/experimental-utils": {
"version": "4.15.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.1.tgz",
"integrity": "sha512-9LQRmOzBRI1iOdJorr4jEnQhadxK4c9R2aEAsm7WE/7dq8wkKD1suaV0S/JucTL8QlYUPU1y2yjqg+aGC0IQBQ==",
"version": "4.15.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.2.tgz",
"integrity": "sha512-Fxoshw8+R5X3/Vmqwsjc8nRO/7iTysRtDqx6rlfLZ7HbT8TZhPeQqbPjTyk2RheH3L8afumecTQnUc9EeXxohQ==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.3",
"@typescript-eslint/scope-manager": "4.15.1",
"@typescript-eslint/types": "4.15.1",
"@typescript-eslint/typescript-estree": "4.15.1",
"@typescript-eslint/scope-manager": "4.15.2",
"@typescript-eslint/types": "4.15.2",
"@typescript-eslint/typescript-estree": "4.15.2",
"eslint-scope": "^5.0.0",
"eslint-utils": "^2.0.0"
}
},
"@typescript-eslint/parser": {
"version": "4.15.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.15.1.tgz",
"integrity": "sha512-V8eXYxNJ9QmXi5ETDguB7O9diAXlIyS+e3xzLoP/oVE4WCAjssxLIa0mqCLsCGXulYJUfT+GV70Jv1vHsdKwtA==",
"version": "4.15.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.15.2.tgz",
"integrity": "sha512-SHeF8xbsC6z2FKXsaTb1tBCf0QZsjJ94H6Bo51Y1aVEZ4XAefaw5ZAilMoDPlGghe+qtq7XdTiDlGfVTOmvA+Q==",
"dev": true,
"requires": {
"@typescript-eslint/scope-manager": "4.15.1",
"@typescript-eslint/types": "4.15.1",
"@typescript-eslint/typescript-estree": "4.15.1",
"@typescript-eslint/scope-manager": "4.15.2",
"@typescript-eslint/types": "4.15.2",
"@typescript-eslint/typescript-estree": "4.15.2",
"debug": "^4.1.1"
},
"dependencies": {
@ -491,29 +491,29 @@
}
},
"@typescript-eslint/scope-manager": {
"version": "4.15.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.15.1.tgz",
"integrity": "sha512-ibQrTFcAm7yG4C1iwpIYK7vDnFg+fKaZVfvyOm3sNsGAerKfwPVFtYft5EbjzByDJ4dj1WD8/34REJfw/9wdVA==",
"version": "4.15.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.15.2.tgz",
"integrity": "sha512-Zm0tf/MSKuX6aeJmuXexgdVyxT9/oJJhaCkijv0DvJVT3ui4zY6XYd6iwIo/8GEZGy43cd7w1rFMiCLHbRzAPQ==",
"dev": true,
"requires": {
"@typescript-eslint/types": "4.15.1",
"@typescript-eslint/visitor-keys": "4.15.1"
"@typescript-eslint/types": "4.15.2",
"@typescript-eslint/visitor-keys": "4.15.2"
}
},
"@typescript-eslint/types": {
"version": "4.15.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.15.1.tgz",
"integrity": "sha512-iGsaUyWFyLz0mHfXhX4zO6P7O3sExQpBJ2dgXB0G5g/8PRVfBBsmQIc3r83ranEQTALLR3Vko/fnCIVqmH+mPw==",
"version": "4.15.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.15.2.tgz",
"integrity": "sha512-r7lW7HFkAarfUylJ2tKndyO9njwSyoy6cpfDKWPX6/ctZA+QyaYscAHXVAfJqtnY6aaTwDYrOhp+ginlbc7HfQ==",
"dev": true
},
"@typescript-eslint/typescript-estree": {
"version": "4.15.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.1.tgz",
"integrity": "sha512-z8MN3CicTEumrWAEB2e2CcoZa3KP9+SMYLIA2aM49XW3cWIaiVSOAGq30ffR5XHxRirqE90fgLw3e6WmNx5uNw==",
"version": "4.15.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.2.tgz",
"integrity": "sha512-cGR8C2g5SPtHTQvAymEODeqx90pJHadWsgTtx6GbnTWKqsg7yp6Eaya9nFzUd4KrKhxdYTTFBiYeTPQaz/l8bw==",
"dev": true,
"requires": {
"@typescript-eslint/types": "4.15.1",
"@typescript-eslint/visitor-keys": "4.15.1",
"@typescript-eslint/types": "4.15.2",
"@typescript-eslint/visitor-keys": "4.15.2",
"debug": "^4.1.1",
"globby": "^11.0.1",
"is-glob": "^4.0.1",
@ -548,12 +548,12 @@
}
},
"@typescript-eslint/visitor-keys": {
"version": "4.15.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.1.tgz",
"integrity": "sha512-tYzaTP9plooRJY8eNlpAewTOqtWW/4ff/5wBjNVaJ0S0wC4Gpq/zDVRTJa5bq2v1pCNQ08xxMCndcvR+h7lMww==",
"version": "4.15.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.2.tgz",
"integrity": "sha512-TME1VgSb7wTwgENN5KVj4Nqg25hP8DisXxNBojM4Nn31rYaNDIocNm5cmjOFfh42n7NVERxWrDFoETO/76ePyg==",
"dev": true,
"requires": {
"@typescript-eslint/types": "4.15.1",
"@typescript-eslint/types": "4.15.2",
"eslint-visitor-keys": "^2.0.0"
}
},
@ -1026,9 +1026,9 @@
}
},
"esbuild": {
"version": "0.8.50",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.8.50.tgz",
"integrity": "sha512-oidFLXssA7IccYzkqLVZSqNJDwDq8Mh/vqvrW+3fPWM7iUiC5O2bCllhnO8+K9LlyL/2Z6n+WwRJAz9fqSIVRg==",
"version": "0.8.51",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.8.51.tgz",
"integrity": "sha512-MVIom8fgL1+B6iGqWtrG7QJ1gqd64BycxounlsX1kR/IcIITaSlTo7gghKpg4a+bnxkpo0dwcikuvk4MVSA9ww==",
"dev": true
},
"escalade": {
@ -2211,14 +2211,14 @@
}
},
"object.values": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz",
"integrity": "sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==",
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz",
"integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==",
"dev": true,
"requires": {
"call-bind": "^1.0.0",
"call-bind": "^1.0.2",
"define-properties": "^1.1.3",
"es-abstract": "^1.18.0-next.1",
"es-abstract": "^1.18.0-next.2",
"has": "^1.0.3"
}
},
@ -2572,20 +2572,20 @@
"dev": true
},
"simple-git": {
"version": "2.35.1",
"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.35.1.tgz",
"integrity": "sha512-Y5/hXf5ivfMziWRNGhVsbiG+1h4CkTW2qVC3dRidLuSZYAPFbLCPP1d7rgiL40lgRPhPTBuhVzNJAV9glWstEg==",
"version": "2.35.2",
"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.35.2.tgz",
"integrity": "sha512-UjOKsrz92Bx7z00Wla5V6qLSf5X2XSp0sL2gzKw1Bh7iJfDPDaU7gK5avIup0yo1/sMOSUMQer2b9GcnF6nmTQ==",
"dev": true,
"requires": {
"@kwsites/file-exists": "^1.1.1",
"@kwsites/promise-deferred": "^1.1.1",
"debug": "^4.3.1"
"debug": "^4.3.2"
},
"dependencies": {
"debug": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"version": "4.3.2",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
"dev": true,
"requires": {
"ms": "2.1.2"
@ -2837,9 +2837,9 @@
"dev": true
},
"typescript": {
"version": "4.3.0-dev.20210221",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.0-dev.20210221.tgz",
"integrity": "sha512-XmZXakfRX7wuViUlU1k6E21gp+aQ+eIOgahlhXRaakuv4mkK3fEs+hA93/cucOlRwpDU9R/UgN5UuU4CDr9wag==",
"version": "4.3.0-dev.20210224",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.0-dev.20210224.tgz",
"integrity": "sha512-A6+di4zjFtFspmmuxnXjkYYeaXFr7Bf4t8MsTciBvBJ1OoxeHtJJEAnJjhcIl/qiZlC2Yv5TXGAI56GFwBnmqw==",
"dev": true
},
"uri-js": {

View File

@ -34,12 +34,12 @@
"@tensorflow/tfjs-node": "^3.1.0",
"@tensorflow/tfjs-node-gpu": "^3.1.0",
"@types/node": "^14.14.31",
"@typescript-eslint/eslint-plugin": "^4.15.1",
"@typescript-eslint/parser": "^4.15.1",
"@typescript-eslint/eslint-plugin": "^4.15.2",
"@typescript-eslint/parser": "^4.15.2",
"@vladmandic/pilogger": "^0.2.14",
"chokidar": "^3.5.1",
"dayjs": "^1.10.4",
"esbuild": "^0.8.50",
"esbuild": "^0.8.51",
"eslint": "^7.20.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-plugin-import": "^2.22.1",
@ -48,9 +48,9 @@
"eslint-plugin-promise": "^4.3.1",
"rimraf": "^3.0.2",
"seedrandom": "^3.0.5",
"simple-git": "^2.35.1",
"simple-git": "^2.35.2",
"tslib": "^2.1.0",
"typescript": "^4.3.0-dev.20210221"
"typescript": "^4.3.0-dev.20210224"
},
"scripts": {
"start": "node --trace-warnings --unhandled-rejections=strict --trace-uncaught --no-deprecation src/node.js",

View File

@ -1,4 +1,6 @@
const console = require('console');
const process = require('process');
// const URL = require('url');
const tf = require('@tensorflow/tfjs-node');
const Human = require('../dist/human.node').default; // this resolves to project root which is '@vladmandic/human'
@ -29,8 +31,9 @@ const config = {
mesh: { modelPath: 'file://models/facemesh.json' },
iris: { modelPath: 'file://models/iris.json' },
age: { modelPath: 'file://models/age-ssrnet-imdb.json' },
gender: { modelPath: 'file://models/gender-ssrnet-imdb.json' },
gender: { modelPath: 'file://models/gender.json' },
emotion: { modelPath: 'file://models/emotion-large.json' },
embedding: { modelPath: 'file://models/mobilefacenet.json' },
},
body: { modelPath: 'file://models/posenet.json' },
hand: {
@ -41,9 +44,10 @@ const config = {
async function main() {
await tf.ready();
const human = new Human();
const human = new Human(config);
logger.info('Human:', human.version);
logger.info('Default Configuration', human.config);
logger.info('Current folder:', process.env.PWD);
logger.info('Active Configuration', human.config);
logger.info('TFJS Version:', tf.version_core, 'Backend:', tf.getBackend());
logger.info('TFJS Flags:', tf.env().features);
logger.info('Loading models:');

2
wiki

@ -1 +1 @@
Subproject commit 7eb9edfc234ba9501361d39290fcccee7fb39ec7
Subproject commit 2467ce59d465b68a5970aa67c34f8b643df4b3ce