mirror of https://github.com/vladmandic/human
improved debug logging
Vladimir Mandic
parent
379447ed00
commit
1e19ac3864
212
demo/menu.js
212
demo/menu.js
|
|
@ -1,86 +1,108 @@
|
|||
let instance = 0;
|
||||
let CSScreated = false;
|
||||
|
||||
let theme = {
|
||||
background: 'darkslategray',
|
||||
hover: 'lightgray',
|
||||
itemBackground: 'black',
|
||||
itemColor: 'white',
|
||||
buttonBackground: 'lightblue',
|
||||
buttonHover: 'lightgreen',
|
||||
checkboxOn: 'lightgreen',
|
||||
checkboxOff: 'lightcoral',
|
||||
rangeBackground: 'lightblue',
|
||||
rangeLabel: 'white',
|
||||
};
|
||||
|
||||
function createCSS() {
|
||||
if (CSScreated) return;
|
||||
const css = `
|
||||
.menu { position: fixed; top: 0rem; right: 0; width: fit-content; padding: 0 0.8rem 0 0.8rem; line-height: 1.8rem; z-index: 10; max-height: calc(100% - 4rem); box-shadow: 0 0 8px dimgrey; background: darkslategray; border-radius: 1rem; }
|
||||
.menu:hover { box-shadow: 0 0 8px lightgrey; }
|
||||
.menu { position: fixed; top: 0rem; right: 0; width: fit-content; padding: 0 0.8rem 0 0.8rem; line-height: 1.8rem; z-index: 10; max-height: calc(100% - 4rem);
|
||||
box-shadow: 0 0 8px dimgrey; background: ${theme.background}; border-radius: 1rem; border-color: black; border-style: solid; border-width: thin; }
|
||||
|
||||
.menu:hover { box-shadow: 0 0 8px ${theme.hover}; }
|
||||
.menu-container { display: block; max-height: 100vh; }
|
||||
.menu-container-fadeout { max-height: 0; overflow: hidden; transition: max-height, 0.5s ease; }
|
||||
.menu-container-fadein { max-height: 100vh; overflow: hidden; transition: max-height, 0.5s ease; }
|
||||
.menu-item { display: flex; white-space: nowrap; background: darkslategray; padding: 0.2rem; width: max-content; }
|
||||
.menu-item { display: flex; white-space: nowrap; padding: 0.2rem; width: max-content; cursor: default; }
|
||||
.menu-title { text-align: right; cursor: pointer; }
|
||||
.menu-hr { margin: 0.2rem; border: 1px solid rgba(0, 0, 0, 0.5); }
|
||||
.menu-hr { margin: 0.2rem; border: 1px solid rgba(0, 0, 0, 0.5) }
|
||||
.menu-label { padding: 0; }
|
||||
|
||||
.menu-list { margin-right: 0.8rem; }
|
||||
select:focus { outline: none; }
|
||||
.menu-list-item { background: black; color: white; border: none; padding: 0.2rem; font-family: inherit; font-variant: inherit; border-radius: 1rem; }
|
||||
.menu-list-item { background: ${theme.itemBackground}; color: ${theme.itemColor}; border: none; padding: 0.2rem; font-family: inherit; font-variant: inherit; border-radius: 1rem; }
|
||||
|
||||
.menu-chart-title { align-items: center; }
|
||||
.menu-chart-canvas { background: transparent; height: 40px; width: 180px; margin: 0.2rem 0.2rem 0.2rem 1rem; }
|
||||
.menu-chart-title { padding: 0; font-size: 0.8rem; font-weight: 800; align-items: center}
|
||||
.menu-chart-canvas { background: transparent; margin: 0.2rem 0 0.2rem 0.6rem; }
|
||||
|
||||
.menu-button { border: 0; background: lightblue; width: -webkit-fill-available; padding: 8px; margin: 8px 0 8px 0; cursor: pointer; box-shadow: 4px 4px 4px 0 dimgrey; border-radius: 1rem; justify-content: center; }
|
||||
.menu-button:hover { background: lightgreen; box-shadow: 4px 4px 4px 0 black; }
|
||||
.menu-button { border: 0; background: ${theme.buttonBackground}; width: -webkit-fill-available; padding: 8px; margin: 8px 0 8px 0; cursor: pointer; box-shadow: 4px 4px 4px 0 dimgrey; border-radius: 1rem; justify-content: center; }
|
||||
.menu-button:hover { background: ${theme.buttonHover}; box-shadow: 4px 4px 4px 0 black; }
|
||||
.menu-button:focus { outline: none; }
|
||||
|
||||
.menu-checkbox { width: 2.8rem; height: 1rem; background: black; margin: 0.5rem 0.8rem 0 0; position: relative; border-radius: 1rem; }
|
||||
.menu-checkbox:after { content: 'OFF'; color: lightcoral; position: absolute; right: 0.2rem; top: -0.4rem; font-weight: 800; font-size: 0.5rem; }
|
||||
.menu-checkbox:before { content: 'ON'; color: lightgreen; position: absolute; left: 0.3rem; top: -0.4rem; font-weight: 800; font-size: 0.5rem; }
|
||||
.menu-checkbox-label { width: 1.3rem; height: 0.8rem; cursor: pointer; position: absolute; top: 0.1rem; left: 0.1rem; z-index: 1; background: lightcoral; border-radius: 1rem; transition: left 0.6s ease; }
|
||||
.menu-checkbox { width: 2.8rem; height: 1rem; background: ${theme.itemBackground}; margin: 0.5rem 0.8rem 0 0; position: relative; border-radius: 1rem; }
|
||||
.menu-checkbox:after { content: 'OFF'; color: ${theme.checkboxOff}; position: absolute; right: 0.2rem; top: -0.4rem; font-weight: 800; font-size: 0.5rem; }
|
||||
.menu-checkbox:before { content: 'ON'; color: ${theme.checkboxOn}; position: absolute; left: 0.3rem; top: -0.4rem; font-weight: 800; font-size: 0.5rem; }
|
||||
.menu-checkbox-label { width: 1.3rem; height: 0.8rem; cursor: pointer; position: absolute; top: 0.1rem; left: 0.1rem; z-index: 1; background: ${theme.checkboxOff}; border-radius: 1rem; transition: left 0.6s ease; }
|
||||
input[type=checkbox] { visibility: hidden; }
|
||||
input[type=checkbox]:checked + label { left: 1.4rem; background: lightgreen; }
|
||||
input[type=checkbox]:checked + label { left: 1.4rem; background: ${theme.checkboxOn}; }
|
||||
|
||||
.menu-range { margin: 0 0.8rem 0 0; width: 5rem; background: transparent; color: lightblue; }
|
||||
.menu-range:before { content: attr(value); color: white; margin: 0 0.4rem 0 0; font-weight: 800; font-size: 0.6rem; position: relative; top: 0.3rem; }
|
||||
.menu-range { margin: 0 0.8rem 0 0; width: 5rem; background: transparent; color: ${theme.rangeBackground}; }
|
||||
.menu-range:before { content: attr(value); color: ${theme.rangeLabel}; margin: 0 0.4rem 0 0; font-weight: 800; font-size: 0.6rem; position: relative; top: 0.3rem; }
|
||||
input[type=range] { -webkit-appearance: none; }
|
||||
input[type=range]::-webkit-slider-runnable-track { width: 100%; height: 1rem; cursor: pointer; background: black; border-radius: 1rem; border: 1px; }
|
||||
input[type=range]::-webkit-slider-thumb { border: 1px solid #000000; margin-top: 0.05rem; height: 0.9rem; width: 1.5rem; border-radius: 1rem; background: lightblue; cursor: pointer; -webkit-appearance: none; }
|
||||
input[type=range]::-webkit-slider-runnable-track { width: 100%; height: 1rem; cursor: pointer; background: ${theme.itemBackground}; border-radius: 1rem; border: 1px; }
|
||||
input[type=range]::-webkit-slider-thumb { border: 1px solid #000000; margin-top: 0.05rem; height: 0.9rem; width: 1.5rem; border-radius: 1rem; background: ${theme.rangeBackground}; cursor: pointer; -webkit-appearance: none; }
|
||||
`;
|
||||
|
||||
function createCSS() {
|
||||
const el = document.createElement('style');
|
||||
el.innerHTML = css;
|
||||
document.getElementsByTagName('head')[0].appendChild(el);
|
||||
}
|
||||
|
||||
function createMenu(parent, title, position = { top: null, left: null, bottom: null, right: null }) {
|
||||
const el = document.createElement('div');
|
||||
el.id = `menu-${instance}`;
|
||||
el.className = 'menu';
|
||||
if (position) {
|
||||
if (position.top) el.style.top = position.top;
|
||||
if (position.bottom) el.style.bottom = position.bottom;
|
||||
if (position.left) el.style.left = position.left;
|
||||
if (position.right) el.style.right = position.right;
|
||||
}
|
||||
|
||||
const elContainer = document.createElement('div');
|
||||
elContainer.id = `menu-container-${instance}`;
|
||||
elContainer.className = 'menu-container menu-container-fadein';
|
||||
|
||||
const elTitle = document.createElement('div');
|
||||
elTitle.className = 'menu-title';
|
||||
elTitle.id = `menu-title-${instance}`;
|
||||
elTitle.innerHTML = title;
|
||||
el.appendChild(elTitle);
|
||||
elTitle.addEventListener('click', () => {
|
||||
elContainer.classList.toggle('menu-container-fadeout');
|
||||
elContainer.classList.toggle('menu-container-fadein');
|
||||
});
|
||||
el.appendChild(elContainer);
|
||||
if (typeof parent === 'object') parent.appendChild(el);
|
||||
else document.getElementById(parent).appendChild(el);
|
||||
return [el, elContainer];
|
||||
CSScreated = true;
|
||||
}
|
||||
|
||||
class Menu {
|
||||
constructor(parent, title, position) {
|
||||
constructor(parent, title, position, userTheme) {
|
||||
if (userTheme) theme = { ...theme, ...userTheme };
|
||||
createCSS();
|
||||
[this.menu, this.container] = createMenu(parent, title, position);
|
||||
this.createMenu(parent, title, position);
|
||||
this.id = 0;
|
||||
this.instance = instance;
|
||||
instance++;
|
||||
this._maxFPS = 0;
|
||||
this.hidden = 0;
|
||||
this.chartFGcolor = 'lightblue';
|
||||
this.chartBGcolor = 'lightgray';
|
||||
}
|
||||
|
||||
createMenu(parent, title = '', position = { top: null, left: null, bottom: null, right: null }) {
|
||||
this.menu = document.createElement('div');
|
||||
this.menu.id = `menu-${instance}`;
|
||||
this.menu.className = 'menu';
|
||||
if (position) {
|
||||
if (position.top) this.menu.style.top = position.top;
|
||||
if (position.bottom) this.menu.style.bottom = position.bottom;
|
||||
if (position.left) this.menu.style.left = position.left;
|
||||
if (position.right) this.menu.style.right = position.right;
|
||||
}
|
||||
|
||||
this.container = document.createElement('div');
|
||||
this.container.id = `menu-container-${instance}`;
|
||||
this.container.className = 'menu-container menu-container-fadein';
|
||||
|
||||
if (title !== '') {
|
||||
const elTitle = document.createElement('div');
|
||||
elTitle.className = 'menu-title';
|
||||
elTitle.id = `menu-title-${instance}`;
|
||||
elTitle.innerHTML = title;
|
||||
this.menu.appendChild(elTitle);
|
||||
elTitle.addEventListener('click', () => {
|
||||
this.container.classList.toggle('menu-container-fadeout');
|
||||
this.container.classList.toggle('menu-container-fadein');
|
||||
this.menu.style.borderStyle = this.container.classList.contains('menu-container-fadeout') ? 'none' : 'solid';
|
||||
});
|
||||
}
|
||||
this.menu.appendChild(this.container);
|
||||
if (typeof parent === 'object') parent.appendChild(this.menu);
|
||||
else document.getElementById(parent).appendChild(this.menu);
|
||||
}
|
||||
|
||||
get newID() {
|
||||
|
|
@ -100,7 +122,37 @@ class Menu {
|
|||
return this.menu.offsetHeight;
|
||||
}
|
||||
|
||||
async addTitle(title) {
|
||||
hide() {
|
||||
if (this.container.classList.contains('menu-container-fadein')) {
|
||||
this.container.classList.toggle('menu-container-fadeout');
|
||||
this.container.classList.toggle('menu-container-fadein');
|
||||
}
|
||||
}
|
||||
|
||||
visible() {
|
||||
return (this.container.classList.contains('menu-container-fadein'));
|
||||
}
|
||||
|
||||
toggle(evt) {
|
||||
this.container.classList.toggle('menu-container-fadeout');
|
||||
this.container.classList.toggle('menu-container-fadein');
|
||||
if (this.container.classList.contains('menu-container-fadein') && evt) {
|
||||
const x = evt.x || (evt.touches && evt.touches[0] ? evt.touches[0].pageX : null);
|
||||
const y = evt.y || (evt.touches && evt.touches[0] ? evt.touches[0].pageY : null);
|
||||
if (x) this.menu.style.left = `${x - 105}px`;
|
||||
if (y) this.menu.style.top = '5.5rem'; // `${evt.y + 55}px`;
|
||||
if (this.menu.offsetLeft < 0) this.menu.style.left = 0;
|
||||
if ((this.menu.offsetLeft + this.menu.offsetWidth) > window.innerWidth) {
|
||||
this.menu.style.left = null;
|
||||
this.menu.style.right = 0;
|
||||
}
|
||||
this.menu.style.borderStyle = 'solid';
|
||||
} else {
|
||||
this.menu.style.borderStyle = 'none';
|
||||
}
|
||||
}
|
||||
|
||||
addTitle(title) {
|
||||
const el = document.createElement('div');
|
||||
el.className = 'menu-title';
|
||||
el.id = this.newID;
|
||||
|
|
@ -110,12 +162,12 @@ class Menu {
|
|||
this.hidden = !this.hidden;
|
||||
const all = document.getElementsByClassName('menu');
|
||||
for (const item of all) {
|
||||
item.style.display = this.hidden ? 'none' : 'flex';
|
||||
item.style.display = this.hidden ? 'none' : 'block';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
async addLabel(title) {
|
||||
addLabel(title) {
|
||||
const el = document.createElement('div');
|
||||
el.className = 'menu-item menu-label';
|
||||
el.id = this.newID;
|
||||
|
|
@ -123,7 +175,7 @@ class Menu {
|
|||
this.container.appendChild(el);
|
||||
}
|
||||
|
||||
async addBool(title, object, variable, callback) {
|
||||
addBool(title, object, variable, callback) {
|
||||
const el = document.createElement('div');
|
||||
el.className = 'menu-item';
|
||||
el.innerHTML = `<div class="menu-checkbox"><input class="menu-checkbox" type="checkbox" id="${this.newID}" ${object[variable] ? 'checked' : ''}/><label class="menu-checkbox-label" for="${this.ID}"></label></div>${title}`;
|
||||
|
|
@ -152,24 +204,19 @@ class Menu {
|
|||
});
|
||||
}
|
||||
|
||||
async addRange(title, object, variable, min, max, step, callback) {
|
||||
addRange(title, object, variable, min, max, step, callback) {
|
||||
const el = document.createElement('div');
|
||||
el.className = 'menu-item';
|
||||
const arr = Array.isArray(variable);
|
||||
el.innerHTML = `<input class="menu-range" type="range" id="${this.newID}" min=${min} max=${max} step=${step} value=${arr ? object[variable[0]] : object[variable]}>${title}`;
|
||||
el.innerHTML = `<input class="menu-range" type="range" id="${this.newID}" min="${min}" max="${max}" step="${step}" value="${object[variable]}">${title}`;
|
||||
this.container.appendChild(el);
|
||||
el.addEventListener('change', (evt) => {
|
||||
const int = parseInt(evt.target.value) === parseFloat(evt.target.value);
|
||||
const val = Array.isArray(variable) ? variable : [variable];
|
||||
for (const item of val) {
|
||||
object[item] = int ? parseInt(evt.target.value) : parseFloat(evt.target.value);
|
||||
}
|
||||
object[variable] = evt.target.value;
|
||||
evt.target.setAttribute('value', evt.target.value);
|
||||
if (callback) callback(evt.target.value);
|
||||
});
|
||||
}
|
||||
|
||||
async addHTML(html) {
|
||||
addHTML(html) {
|
||||
const el = document.createElement('div');
|
||||
el.className = 'menu-item';
|
||||
el.id = this.newID;
|
||||
|
|
@ -177,7 +224,7 @@ class Menu {
|
|||
this.container.appendChild(el);
|
||||
}
|
||||
|
||||
async addButton(titleOn, titleOff, callback) {
|
||||
addButton(titleOn, titleOff, callback) {
|
||||
const el = document.createElement('button');
|
||||
el.className = 'menu-item menu-button';
|
||||
el.style.fontFamily = document.body.style.fontFamily;
|
||||
|
|
@ -194,25 +241,28 @@ class Menu {
|
|||
});
|
||||
}
|
||||
|
||||
async addValue(title, val) {
|
||||
addValue(title, val, suffix = '') {
|
||||
const el = document.createElement('div');
|
||||
el.className = 'menu-item';
|
||||
el.id = title;
|
||||
el.innerText = `${title}: ${val}`;
|
||||
this.contaner.appendChild(el);
|
||||
el.id = `menu-val-${title}`;
|
||||
el.innerText = `${title}: ${val}${suffix}`;
|
||||
this.container.appendChild(el);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line class-methods-use-this
|
||||
async updateValue(title, val) {
|
||||
const el = document.getElementById(title);
|
||||
el.innerText = `${title}: ${val}`;
|
||||
updateValue(title, val, suffix = '') {
|
||||
const el = document.getElementById(`menu-val-${title}`);
|
||||
if (el) el.innerText = `${title}: ${val}${suffix}`;
|
||||
else this.addValue(title, val);
|
||||
}
|
||||
|
||||
async addChart(title, id) {
|
||||
addChart(title, id, width = 200, height = 40, fgColor, bgColor) {
|
||||
if (fgColor) this.chartFGcolor = fgColor;
|
||||
if (bgColor) this.chartBGcolor = bgColor;
|
||||
const el = document.createElement('div');
|
||||
el.className = 'menu-item menu-chart-title';
|
||||
el.id = this.newID;
|
||||
el.innerHTML = `${title}<canvas id="menu-canvas-${id}" class="menu-chart-canvas" width="180px" height="40px"></canvas>`;
|
||||
el.innerHTML = `<font color=${this.chartFGcolor}>${title}</font><canvas id="menu-canvas-${id}" class="menu-chart-canvas" width="${width}px" height="${height}px"></canvas>`;
|
||||
this.container.appendChild(el);
|
||||
}
|
||||
|
||||
|
|
@ -222,20 +272,20 @@ class Menu {
|
|||
const canvas = document.getElementById(`menu-canvas-${id}`);
|
||||
if (!canvas) return;
|
||||
const ctx = canvas.getContext('2d');
|
||||
ctx.fillStyle = 'darkslategray';
|
||||
ctx.fillStyle = this.chartBGcolor;
|
||||
ctx.fillRect(0, 0, canvas.width, canvas.height);
|
||||
const width = canvas.width / values.length;
|
||||
const max = 1 + Math.max(...values);
|
||||
const height = canvas.height / max;
|
||||
for (const i in values) {
|
||||
const gradient = ctx.createLinearGradient(0, (max - values[i]) * height, 0, 0);
|
||||
gradient.addColorStop(0.1, 'lightblue');
|
||||
gradient.addColorStop(0.4, 'darkslategray');
|
||||
gradient.addColorStop(0.1, this.chartFGcolor);
|
||||
gradient.addColorStop(0.4, this.chartBGcolor);
|
||||
ctx.fillStyle = gradient;
|
||||
ctx.fillRect(i * width, 0, width - 4, canvas.height);
|
||||
ctx.fillStyle = 'black';
|
||||
ctx.font = '12px "Segoe UI"';
|
||||
ctx.fillText(Math.round(values[i]), i * width, canvas.height - 2, width);
|
||||
ctx.fillStyle = this.chartBGcolor;
|
||||
ctx.font = `${width / 1.4}px "Segoe UI"`;
|
||||
ctx.fillText(Math.round(values[i]), i * width + 1, canvas.height - 1, width - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5777,7 +5777,7 @@ var require_config = __commonJS((exports) => {
|
|||
var require_package = __commonJS((exports, module) => {
|
||||
module.exports = {
|
||||
name: "@vladmandic/human",
|
||||
version: "0.5.1",
|
||||
version: "0.5.2",
|
||||
description: "human: 3D Face Detection, Iris Tracking and Age & Gender Prediction",
|
||||
sideEffects: false,
|
||||
main: "dist/human.node.js",
|
||||
|
|
@ -5918,7 +5918,7 @@ class Human {
|
|||
}
|
||||
log(...msg) {
|
||||
if (msg && this.config.console)
|
||||
console.log(...msg);
|
||||
console.log("Human:", ...msg);
|
||||
}
|
||||
analyze(...msg) {
|
||||
if (!this.analyzeMemoryLeaks)
|
||||
|
|
@ -5958,19 +5958,15 @@ class Human {
|
|||
this.models.emotion = await emotion.load(this.config);
|
||||
}
|
||||
}
|
||||
async resetBackend(backendName) {
|
||||
async checkBackend() {
|
||||
if (tf.getBackend() !== this.config.backend) {
|
||||
this.state = "backend";
|
||||
if (backendName in tf.engine().registry) {
|
||||
this.log("Human library setting backend:", this.config.backend);
|
||||
this.config.backend = backendName;
|
||||
const backendFactory = tf.findBackendFactory(backendName);
|
||||
tf.removeBackend(backendName);
|
||||
tf.registerBackend(backendName, backendFactory);
|
||||
await tf.setBackend(backendName);
|
||||
if (this.config.backend in tf.engine().registry) {
|
||||
this.log("Setting backend:", this.config.backend);
|
||||
await tf.setBackend(this.config.backend);
|
||||
await tf.ready();
|
||||
} else {
|
||||
this.log("Human library backend not registred:", backendName);
|
||||
this.log("Backend not registred:", this.config.backend);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6067,10 +6063,10 @@ class Human {
|
|||
return new Promise(async (resolve) => {
|
||||
const timeStart = now();
|
||||
timeStamp = now();
|
||||
await this.resetBackend(this.config.backend);
|
||||
await this.checkBackend();
|
||||
perf.backend = Math.trunc(now() - timeStamp);
|
||||
if (first) {
|
||||
this.log("Human library starting");
|
||||
this.log("Starting");
|
||||
this.log("Configuration:", this.config);
|
||||
this.log("Flags:", tf.ENV.flags);
|
||||
first = false;
|
||||
|
|
@ -6107,7 +6103,7 @@ class Human {
|
|||
perf.face = Math.trunc(now() - timeStamp);
|
||||
for (const face of faces) {
|
||||
if (!face.image || face.image.isDisposedInternal) {
|
||||
this.log("face object is disposed:", face.image);
|
||||
this.log("Face object is disposed:", face.image);
|
||||
continue;
|
||||
}
|
||||
this.state = "run:agegender";
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -116,7 +116,7 @@
|
|||
"imports": []
|
||||
},
|
||||
"src/human.js": {
|
||||
"bytes": 13144,
|
||||
"bytes": 13072,
|
||||
"imports": [
|
||||
{
|
||||
"path": "src/facemesh/facemesh.js"
|
||||
|
|
@ -260,7 +260,7 @@
|
|||
"dist/human.esm-nobundle.js.map": {
|
||||
"imports": [],
|
||||
"inputs": {},
|
||||
"bytes": 250346
|
||||
"bytes": 250207
|
||||
},
|
||||
"dist/human.esm-nobundle.js": {
|
||||
"imports": [],
|
||||
|
|
@ -356,13 +356,13 @@
|
|||
"bytesInOutput": 3012
|
||||
},
|
||||
"src/human.js": {
|
||||
"bytesInOutput": 11781
|
||||
"bytesInOutput": 11537
|
||||
},
|
||||
"src/human.js": {
|
||||
"bytesInOutput": 0
|
||||
}
|
||||
},
|
||||
"bytes": 156244
|
||||
"bytes": 156000
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72826,7 +72826,7 @@ var require_config = __commonJS((exports) => {
|
|||
var require_package = __commonJS((exports, module) => {
|
||||
module.exports = {
|
||||
name: "@vladmandic/human",
|
||||
version: "0.5.1",
|
||||
version: "0.5.2",
|
||||
description: "human: 3D Face Detection, Iris Tracking and Age & Gender Prediction",
|
||||
sideEffects: false,
|
||||
main: "dist/human.node.js",
|
||||
|
|
@ -72967,7 +72967,7 @@ class Human {
|
|||
}
|
||||
log(...msg) {
|
||||
if (msg && this.config.console)
|
||||
console.log(...msg);
|
||||
console.log("Human:", ...msg);
|
||||
}
|
||||
analyze(...msg) {
|
||||
if (!this.analyzeMemoryLeaks)
|
||||
|
|
@ -73007,19 +73007,15 @@ class Human {
|
|||
this.models.emotion = await emotion.load(this.config);
|
||||
}
|
||||
}
|
||||
async resetBackend(backendName) {
|
||||
async checkBackend() {
|
||||
if (tf.getBackend() !== this.config.backend) {
|
||||
this.state = "backend";
|
||||
if (backendName in tf.engine().registry) {
|
||||
this.log("Human library setting backend:", this.config.backend);
|
||||
this.config.backend = backendName;
|
||||
const backendFactory = tf.findBackendFactory(backendName);
|
||||
tf.removeBackend(backendName);
|
||||
tf.registerBackend(backendName, backendFactory);
|
||||
await tf.setBackend(backendName);
|
||||
if (this.config.backend in tf.engine().registry) {
|
||||
this.log("Setting backend:", this.config.backend);
|
||||
await tf.setBackend(this.config.backend);
|
||||
await tf.ready();
|
||||
} else {
|
||||
this.log("Human library backend not registred:", backendName);
|
||||
this.log("Backend not registred:", this.config.backend);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -73116,10 +73112,10 @@ class Human {
|
|||
return new Promise(async (resolve) => {
|
||||
const timeStart = now();
|
||||
timeStamp = now();
|
||||
await this.resetBackend(this.config.backend);
|
||||
await this.checkBackend();
|
||||
perf.backend = Math.trunc(now() - timeStamp);
|
||||
if (first) {
|
||||
this.log("Human library starting");
|
||||
this.log("Starting");
|
||||
this.log("Configuration:", this.config);
|
||||
this.log("Flags:", tf.ENV.flags);
|
||||
first = false;
|
||||
|
|
@ -73156,7 +73152,7 @@ class Human {
|
|||
perf.face = Math.trunc(now() - timeStamp);
|
||||
for (const face of faces) {
|
||||
if (!face.image || face.image.isDisposedInternal) {
|
||||
this.log("face object is disposed:", face.image);
|
||||
this.log("Face object is disposed:", face.image);
|
||||
continue;
|
||||
}
|
||||
this.state = "run:agegender";
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -291,7 +291,7 @@
|
|||
"imports": []
|
||||
},
|
||||
"src/human.js": {
|
||||
"bytes": 13144,
|
||||
"bytes": 13072,
|
||||
"imports": [
|
||||
{
|
||||
"path": "node_modules/@tensorflow/tfjs/dist/tf.node.js"
|
||||
|
|
@ -468,7 +468,7 @@
|
|||
"dist/human.esm.js.map": {
|
||||
"imports": [],
|
||||
"inputs": {},
|
||||
"bytes": 5123652
|
||||
"bytes": 5123513
|
||||
},
|
||||
"dist/human.esm.js": {
|
||||
"imports": [],
|
||||
|
|
@ -621,13 +621,13 @@
|
|||
"bytesInOutput": 3012
|
||||
},
|
||||
"src/human.js": {
|
||||
"bytesInOutput": 11771
|
||||
"bytesInOutput": 11527
|
||||
},
|
||||
"src/human.js": {
|
||||
"bytesInOutput": 0
|
||||
}
|
||||
},
|
||||
"bytes": 2925208
|
||||
"bytes": 2924964
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72827,7 +72827,7 @@ var Human = (() => {
|
|||
var require_package = __commonJS((exports, module) => {
|
||||
module.exports = {
|
||||
name: "@vladmandic/human",
|
||||
version: "0.5.1",
|
||||
version: "0.5.2",
|
||||
description: "human: 3D Face Detection, Iris Tracking and Age & Gender Prediction",
|
||||
sideEffects: false,
|
||||
main: "dist/human.node.js",
|
||||
|
|
@ -72972,7 +72972,7 @@ var Human = (() => {
|
|||
}
|
||||
log(...msg) {
|
||||
if (msg && this.config.console)
|
||||
console.log(...msg);
|
||||
console.log("Human:", ...msg);
|
||||
}
|
||||
analyze(...msg) {
|
||||
if (!this.analyzeMemoryLeaks)
|
||||
|
|
@ -73012,19 +73012,15 @@ var Human = (() => {
|
|||
this.models.emotion = await emotion.load(this.config);
|
||||
}
|
||||
}
|
||||
async resetBackend(backendName) {
|
||||
async checkBackend() {
|
||||
if (tf.getBackend() !== this.config.backend) {
|
||||
this.state = "backend";
|
||||
if (backendName in tf.engine().registry) {
|
||||
this.log("Human library setting backend:", this.config.backend);
|
||||
this.config.backend = backendName;
|
||||
const backendFactory = tf.findBackendFactory(backendName);
|
||||
tf.removeBackend(backendName);
|
||||
tf.registerBackend(backendName, backendFactory);
|
||||
await tf.setBackend(backendName);
|
||||
if (this.config.backend in tf.engine().registry) {
|
||||
this.log("Setting backend:", this.config.backend);
|
||||
await tf.setBackend(this.config.backend);
|
||||
await tf.ready();
|
||||
} else {
|
||||
this.log("Human library backend not registred:", backendName);
|
||||
this.log("Backend not registred:", this.config.backend);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -73121,10 +73117,10 @@ var Human = (() => {
|
|||
return new Promise(async (resolve) => {
|
||||
const timeStart = now();
|
||||
timeStamp = now();
|
||||
await this.resetBackend(this.config.backend);
|
||||
await this.checkBackend();
|
||||
perf.backend = Math.trunc(now() - timeStamp);
|
||||
if (first) {
|
||||
this.log("Human library starting");
|
||||
this.log("Starting");
|
||||
this.log("Configuration:", this.config);
|
||||
this.log("Flags:", tf.ENV.flags);
|
||||
first = false;
|
||||
|
|
@ -73161,7 +73157,7 @@ var Human = (() => {
|
|||
perf.face = Math.trunc(now() - timeStamp);
|
||||
for (const face of faces) {
|
||||
if (!face.image || face.image.isDisposedInternal) {
|
||||
this.log("face object is disposed:", face.image);
|
||||
this.log("Face object is disposed:", face.image);
|
||||
continue;
|
||||
}
|
||||
this.state = "run:agegender";
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -291,7 +291,7 @@
|
|||
"imports": []
|
||||
},
|
||||
"src/human.js": {
|
||||
"bytes": 13144,
|
||||
"bytes": 13072,
|
||||
"imports": [
|
||||
{
|
||||
"path": "node_modules/@tensorflow/tfjs/dist/tf.node.js"
|
||||
|
|
@ -468,7 +468,7 @@
|
|||
"dist/human.js.map": {
|
||||
"imports": [],
|
||||
"inputs": {},
|
||||
"bytes": 5127510
|
||||
"bytes": 5127370
|
||||
},
|
||||
"dist/human.js": {
|
||||
"imports": [],
|
||||
|
|
@ -621,10 +621,10 @@
|
|||
"bytesInOutput": 3144
|
||||
},
|
||||
"src/human.js": {
|
||||
"bytesInOutput": 13092
|
||||
"bytesInOutput": 12832
|
||||
}
|
||||
},
|
||||
"bytes": 3071177
|
||||
"bytes": 3070917
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5777,7 +5777,7 @@ var require_config = __commonJS((exports2) => {
|
|||
var require_package = __commonJS((exports2, module2) => {
|
||||
module2.exports = {
|
||||
name: "@vladmandic/human",
|
||||
version: "0.5.1",
|
||||
version: "0.5.2",
|
||||
description: "human: 3D Face Detection, Iris Tracking and Age & Gender Prediction",
|
||||
sideEffects: false,
|
||||
main: "dist/human.node.js",
|
||||
|
|
@ -5921,7 +5921,7 @@ class Human {
|
|||
}
|
||||
log(...msg) {
|
||||
if (msg && this.config.console)
|
||||
console.log(...msg);
|
||||
console.log("Human:", ...msg);
|
||||
}
|
||||
analyze(...msg) {
|
||||
if (!this.analyzeMemoryLeaks)
|
||||
|
|
@ -5961,19 +5961,15 @@ class Human {
|
|||
this.models.emotion = await emotion.load(this.config);
|
||||
}
|
||||
}
|
||||
async resetBackend(backendName) {
|
||||
async checkBackend() {
|
||||
if (tf.getBackend() !== this.config.backend) {
|
||||
this.state = "backend";
|
||||
if (backendName in tf.engine().registry) {
|
||||
this.log("Human library setting backend:", this.config.backend);
|
||||
this.config.backend = backendName;
|
||||
const backendFactory = tf.findBackendFactory(backendName);
|
||||
tf.removeBackend(backendName);
|
||||
tf.registerBackend(backendName, backendFactory);
|
||||
await tf.setBackend(backendName);
|
||||
if (this.config.backend in tf.engine().registry) {
|
||||
this.log("Setting backend:", this.config.backend);
|
||||
await tf.setBackend(this.config.backend);
|
||||
await tf.ready();
|
||||
} else {
|
||||
this.log("Human library backend not registred:", backendName);
|
||||
this.log("Backend not registred:", this.config.backend);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6070,10 +6066,10 @@ class Human {
|
|||
return new Promise(async (resolve) => {
|
||||
const timeStart = now();
|
||||
timeStamp = now();
|
||||
await this.resetBackend(this.config.backend);
|
||||
await this.checkBackend();
|
||||
perf.backend = Math.trunc(now() - timeStamp);
|
||||
if (first) {
|
||||
this.log("Human library starting");
|
||||
this.log("Starting");
|
||||
this.log("Configuration:", this.config);
|
||||
this.log("Flags:", tf.ENV.flags);
|
||||
first = false;
|
||||
|
|
@ -6110,7 +6106,7 @@ class Human {
|
|||
perf.face = Math.trunc(now() - timeStamp);
|
||||
for (const face of faces) {
|
||||
if (!face.image || face.image.isDisposedInternal) {
|
||||
this.log("face object is disposed:", face.image);
|
||||
this.log("Face object is disposed:", face.image);
|
||||
continue;
|
||||
}
|
||||
this.state = "run:agegender";
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -73868,7 +73868,7 @@ var require_config = __commonJS((exports2) => {
|
|||
var require_package = __commonJS((exports2, module2) => {
|
||||
module2.exports = {
|
||||
name: "@vladmandic/human",
|
||||
version: "0.5.1",
|
||||
version: "0.5.2",
|
||||
description: "human: 3D Face Detection, Iris Tracking and Age & Gender Prediction",
|
||||
sideEffects: false,
|
||||
main: "dist/human.node.js",
|
||||
|
|
@ -74012,7 +74012,7 @@ class Human {
|
|||
}
|
||||
log(...msg) {
|
||||
if (msg && this.config.console)
|
||||
console.log(...msg);
|
||||
console.log("Human:", ...msg);
|
||||
}
|
||||
analyze(...msg) {
|
||||
if (!this.analyzeMemoryLeaks)
|
||||
|
|
@ -74052,19 +74052,15 @@ class Human {
|
|||
this.models.emotion = await emotion.load(this.config);
|
||||
}
|
||||
}
|
||||
async resetBackend(backendName) {
|
||||
async checkBackend() {
|
||||
if (tf.getBackend() !== this.config.backend) {
|
||||
this.state = "backend";
|
||||
if (backendName in tf.engine().registry) {
|
||||
this.log("Human library setting backend:", this.config.backend);
|
||||
this.config.backend = backendName;
|
||||
const backendFactory = tf.findBackendFactory(backendName);
|
||||
tf.removeBackend(backendName);
|
||||
tf.registerBackend(backendName, backendFactory);
|
||||
await tf.setBackend(backendName);
|
||||
if (this.config.backend in tf.engine().registry) {
|
||||
this.log("Setting backend:", this.config.backend);
|
||||
await tf.setBackend(this.config.backend);
|
||||
await tf.ready();
|
||||
} else {
|
||||
this.log("Human library backend not registred:", backendName);
|
||||
this.log("Backend not registred:", this.config.backend);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -74161,10 +74157,10 @@ class Human {
|
|||
return new Promise(async (resolve) => {
|
||||
const timeStart = now();
|
||||
timeStamp = now();
|
||||
await this.resetBackend(this.config.backend);
|
||||
await this.checkBackend();
|
||||
perf.backend = Math.trunc(now() - timeStamp);
|
||||
if (first) {
|
||||
this.log("Human library starting");
|
||||
this.log("Starting");
|
||||
this.log("Configuration:", this.config);
|
||||
this.log("Flags:", tf.ENV.flags);
|
||||
first = false;
|
||||
|
|
@ -74201,7 +74197,7 @@ class Human {
|
|||
perf.face = Math.trunc(now() - timeStamp);
|
||||
for (const face of faces) {
|
||||
if (!face.image || face.image.isDisposedInternal) {
|
||||
this.log("face object is disposed:", face.image);
|
||||
this.log("Face object is disposed:", face.image);
|
||||
continue;
|
||||
}
|
||||
this.state = "run:agegender";
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -116,7 +116,7 @@
|
|||
"imports": []
|
||||
},
|
||||
"src/human.js": {
|
||||
"bytes": 13144,
|
||||
"bytes": 13072,
|
||||
"imports": [
|
||||
{
|
||||
"path": "src/facemesh/facemesh.js"
|
||||
|
|
@ -260,7 +260,7 @@
|
|||
"dist/human.node-nobundle.js.map": {
|
||||
"imports": [],
|
||||
"inputs": {},
|
||||
"bytes": 263858
|
||||
"bytes": 263646
|
||||
},
|
||||
"dist/human.node-nobundle.js": {
|
||||
"imports": [],
|
||||
|
|
@ -359,10 +359,10 @@
|
|||
"bytesInOutput": 47
|
||||
},
|
||||
"src/human.js": {
|
||||
"bytesInOutput": 11781
|
||||
"bytesInOutput": 11537
|
||||
}
|
||||
},
|
||||
"bytes": 156398
|
||||
"bytes": 156154
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
25
src/human.js
25
src/human.js
|
|
@ -85,7 +85,7 @@ class Human {
|
|||
// helper function: wrapper around console output
|
||||
log(...msg) {
|
||||
// eslint-disable-next-line no-console
|
||||
if (msg && this.config.console) console.log(...msg);
|
||||
if (msg && this.config.console) console.log('Human:', ...msg);
|
||||
}
|
||||
|
||||
// helper function: measure tensor leak
|
||||
|
|
@ -126,19 +126,18 @@ class Human {
|
|||
}
|
||||
}
|
||||
|
||||
async resetBackend(backendName) {
|
||||
async checkBackend() {
|
||||
if (tf.getBackend() !== this.config.backend) {
|
||||
this.state = 'backend';
|
||||
if (backendName in tf.engine().registry) {
|
||||
this.log('Human library setting backend:', this.config.backend);
|
||||
this.config.backend = backendName;
|
||||
const backendFactory = tf.findBackendFactory(backendName);
|
||||
tf.removeBackend(backendName);
|
||||
tf.registerBackend(backendName, backendFactory);
|
||||
await tf.setBackend(backendName);
|
||||
if (this.config.backend in tf.engine().registry) {
|
||||
this.log('Setting backend:', this.config.backend);
|
||||
// const backendFactory = tf.findBackendFactory(backendName);
|
||||
// tf.removeBackend(backendName);
|
||||
// tf.registerBackend(backendName, backendFactory);
|
||||
await tf.setBackend(this.config.backend);
|
||||
await tf.ready();
|
||||
} else {
|
||||
this.log('Human library backend not registred:', backendName);
|
||||
this.log('Backend not registred:', this.config.backend);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -226,12 +225,12 @@ class Human {
|
|||
|
||||
// configure backend
|
||||
timeStamp = now();
|
||||
await this.resetBackend(this.config.backend);
|
||||
await this.checkBackend();
|
||||
perf.backend = Math.trunc(now() - timeStamp);
|
||||
|
||||
// check number of loaded models
|
||||
if (first) {
|
||||
this.log('Human library starting');
|
||||
this.log('Starting');
|
||||
this.log('Configuration:', this.config);
|
||||
this.log('Flags:', tf.ENV.flags);
|
||||
first = false;
|
||||
|
|
@ -279,7 +278,7 @@ class Human {
|
|||
for (const face of faces) {
|
||||
// is something went wrong, skip the face
|
||||
if (!face.image || face.image.isDisposedInternal) {
|
||||
this.log('face object is disposed:', face.image);
|
||||
this.log('Face object is disposed:', face.image);
|
||||
continue;
|
||||
}
|
||||
// run ssr-net age & gender, inherits face from blazeface
|
||||
|
|
|
|||
Loading…
Reference in New Issue