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

add queuing for getImageSceneModel init

Browse source
This commit is contained in:
Abhinav 2022-08-03 10:28:09 +05:30
parent a125503707
commit b866745fe7
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/services/machineLearning/imageSceneService.ts
View file

@ -10,8 +10,9 @@ import { SCENE_DETECTION_IMAGE_SIZE } from 'constants/machineLearning/config';
class ImageScene implements SceneDetectionService {
method: Versioned<SceneDetectionMethod>;
model: tfjsConverter.GraphModel;
sceneMap: { [key: string]: string };
private model: tfjsConverter.GraphModel;
private sceneMap: { [key: string]: string };
private ready: Promise<void>;
public constructor() {
this.method = {
@ -43,12 +44,18 @@ class ImageScene implements SceneDetectionService {
warmupResult.dispose();
}
private async getImageSceneModel() {
if (!this.ready) {
this.ready = this.init();
}
await this.ready;
return this.model;
}
async detectScenes(image: ImageBitmap, minScore: number) {
await tf.ready();
if (!this.model) {
await this.init();
}
const model = await this.getImageSceneModel();
const output = tf.tidy(() => {
const tensor = tf.browser.fromPixels(image);
@ -63,7 +70,7 @@ class ImageScene implements SceneDetectionService {
resizedTensor = tf.expandDims(resizedTensor);
resizedTensor = tf.cast(resizedTensor, 'float32');
const output = this.model.predict(resizedTensor) as tf.Tensor;
const output = model.predict(resizedTensor) as tf.Tensor;
return output;
});