beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Revert "use the new generated model"

Browse source 
This reverts commit d407337ec5ad2425020e5306a71e3158ef698f82.
This commit is contained in:
Abhinav 2022-03-04 14:05:00 +05:30
parent c681225ae5
commit 1dadb97f2f
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/models/open-images-ssd-mobilenet-v2/model.json
View file

File diff suppressed because one or more lines are too long

4
src/components/MachineLearning/MLFileDebugView.tsx
View file

@ -58,11 +58,11 @@ function drawFaceDetection(face: AlignedFace, ctx: CanvasRenderingContext2D) {
} }
function drawBbox(object: ObjectDetection, ctx: CanvasRenderingContext2D) { function drawBbox(object: ObjectDetection, ctx: CanvasRenderingContext2D) {
ctx.font = '20px Arial'; ctx.font = '100px Arial';
ctx.save(); ctx.save();
ctx.restore(); ctx.restore();
ctx.rect(...object.bbox); ctx.rect(...object.bbox);
ctx.lineWidth = 5; ctx.lineWidth = 10;
ctx.strokeStyle = 'green'; ctx.strokeStyle = 'green';
ctx.fillStyle = 'green'; ctx.fillStyle = 'green';
ctx.stroke(); ctx.stroke();

17
src/services/machineLearning/ssdMobileNetV2Service.ts
View file

@ -12,7 +12,7 @@ import {
// SSDMobileNetV2Model, // SSDMobileNetV2Model,
// } from './modelWrapper/SSDMobileNetV2'; // } from './modelWrapper/SSDMobileNetV2';
import * as SSDMobileNet from 'ssd-mobilenet'; import * as SSDMobileNet from '@tensorflow-models/coco-ssd';
class SSDMobileNetV2 implements ObjectDetectionService { class SSDMobileNetV2 implements ObjectDetectionService {
private ssdMobileNetV2Model: SSDMobileNet.ObjectDetection; private ssdMobileNetV2Model: SSDMobileNet.ObjectDetection;
@ -27,7 +27,9 @@ class SSDMobileNetV2 implements ObjectDetectionService {
private async init() { private async init() {
this.ssdMobileNetV2Model = await SSDMobileNet.load({ this.ssdMobileNetV2Model = await SSDMobileNet.load({
modelUrl: '/models/open-images-ssd-mobilenet-v2/model.json', // base: 'mobilenet_v2',
// dataset: 'open_images',
// modelUrl: '/models/open-images-ssd-mobilenet-v2/model.json',
}); });
console.log( console.log(
'loaded ssdMobileNetV2Model', 'loaded ssdMobileNetV2Model',
@ -38,9 +40,7 @@ class SSDMobileNetV2 implements ObjectDetectionService {
public async detectObjects(image: ImageBitmap): Promise<ObjectDetection[]> { public async detectObjects(image: ImageBitmap): Promise<ObjectDetection[]> {
// const resized = resizeToSquare(image, MOBILENETV2_OBJECT_SIZE); // const resized = resizeToSquare(image, MOBILENETV2_OBJECT_SIZE);
// console.log(resized);
const results = await this.detectObjectUsingModel(image); const results = await this.detectObjectUsingModel(image);
return results;
// const sizeCorrectedResults = results.map((result) => { // const sizeCorrectedResults = results.map((result) => {
// const scale = // const scale =
// Math.max(image.height, image.width) / MOBILENETV2_OBJECT_SIZE; // Math.max(image.height, image.width) / MOBILENETV2_OBJECT_SIZE;
@ -58,6 +58,8 @@ class SSDMobileNetV2 implements ObjectDetectionService {
// }); // });
// return sizeCorrectedResults; // return sizeCorrectedResults;
return results;
} }
private async getSSDMobileNetV2Model() { private async getSSDMobileNetV2Model() {
@ -76,11 +78,8 @@ class SSDMobileNetV2 implements ObjectDetectionService {
public async detectObjectUsingModel(imageBitmap: ImageBitmap) { public async detectObjectUsingModel(imageBitmap: ImageBitmap) {
const ssdMobileNetV2Model = await this.getSSDMobileNetV2Model(); const ssdMobileNetV2Model = await this.getSSDMobileNetV2Model();
const predictions = await ssdMobileNetV2Model.detect( const tfImage = tf.browser.fromPixels(imageBitmap);
imageBitmap, const predictions = await ssdMobileNetV2Model.detect(tfImage);
undefined,
0.1
);
return predictions; return predictions;
} }