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

Cleanup

Browse source
This commit is contained in:
Manav Rathi 2024-04-11 16:36:56 +05:30
parent 33c84f7a08
commit 61143c9c62
No known key found for this signature in database
2 changed files with 2 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
desktop/src/main/services/ml-face.ts
View file

@ -79,20 +79,6 @@ const faceEmbeddingSession = async () => {
};
export const detectFaces = async (input: Float32Array) => {
// console.log("start ort");
// this.onnxInferenceSession = await ort.InferenceSession.create(
// "/models/yoloface/yolov5s_face_640_640_dynamic.onnx",
// );
// const data = new Float32Array(1 * 3 * 640 * 640);
// const inputTensor = new ort.Tensor("float32", data, [1, 3, 640, 640]);
// // TODO(MR): onnx-yolo
// // const feeds: Record<string, ort.Tensor> = {};
// const feeds: Record<string, any> = {};
// const name = this.onnxInferenceSession.inputNames[0];
// feeds[name] = inputTensor;
// await this.onnxInferenceSession.run(feeds);
// console.log("start end");
const session = await faceDetectionSession();
const t = Date.now();
const feeds = {
@ -104,28 +90,6 @@ export const detectFaces = async (input: Float32Array) => {
};
export const faceEmbedding = async (input: Float32Array) => {
// console.log("start ort mobilefacenet");
// this.onnxInferenceSession = await ort.InferenceSession.create(
// "/models/mobilefacenet/mobilefacenet_opset15.onnx",
// );
// const faceBatchSize = 1;
// const data = new Float32Array(
// faceBatchSize * 3 * this.faceSize * this.faceSize,
// );
// const inputTensor = new ort.Tensor("float32", data, [
// faceBatchSize,
// this.faceSize,
// this.faceSize,
// 3,
// ]);
// // TODO(MR): onnx-yolo
// // const feeds: Record<string, ort.Tensor> = {};
// const feeds: Record<string, any> = {};
// const name = this.onnxInferenceSession.inputNames[0];
// feeds[name] = inputTensor;
// await this.onnxInferenceSession.run(feeds);
// console.log("start end mobilefacenet");
// Dimension of each face (alias)
const mobileFaceNetFaceSize = 112;
// Smaller alias
@ -139,6 +103,6 @@ export const faceEmbedding = async (input: Float32Array) => {
const feeds = { img_inputs: inputTensor };
const results = await session.run(feeds);
log.debug(() => `onnx/yolo face embedding took ${Date.now() - t} ms`);
// TODO: What's with this type?
// TODO: What's with this type? It works in practice, but double check.
return (results.embeddings as unknown as any)["cpuData"]; // as Float32Array;
};

2
web/apps/photos/src/services/machineLearning/yoloFaceDetectionService.ts
View file

@ -1,3 +1,4 @@
import { workerBridge } from "@/next/worker/worker-bridge";
import { euclidean } from "hdbscan";
import {
Matrix,
@ -20,7 +21,6 @@ import {
} from "utils/image";
import { newBox } from "utils/machineLearning";
import { Box, Point } from "../../../thirdparty/face-api/classes";
import { workerBridge } from "@/next/worker/worker-bridge";
class YoloFaceDetectionService implements FaceDetectionService {
public method: Versioned<FaceDetectionMethod>;