From 6a59583ff2f13791e3d7e8a69b62dc4bc424c9eb Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 17 Jan 2019 16:41:45 +0100 Subject: ugh --- megapixels/app/server/api.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'megapixels/app') diff --git a/megapixels/app/server/api.py b/megapixels/app/server/api.py index 61789fb9..4f564710 100644 --- a/megapixels/app/server/api.py +++ b/megapixels/app/server/api.py @@ -7,7 +7,7 @@ import operator from flask import Blueprint, request, jsonify from PIL import Image # todo: try to remove PIL dependency -from app.processors import face_recognition +from app.processors.face_extractor import ExtractorDLIB from app.processors import face_detector from app.processors.faiss import load_faiss_databases from app.models.sql_factory import load_sql_datasets, list_datasets, get_dataset, get_table @@ -86,8 +86,10 @@ def upload(dataset_name): }) # extract 128-D vector - recognition = face_recognition.RecognitionDLIB(gpu=-1) - vec = recognition.vec(im_np, bbox) + extractor = face_extractor.ExtractorDLIB() + vec = extractor.extract(im, bbox_norm) # NB use norm, not bbox_dim + # recognition = face_recognition.RecognitionDLIB(gpu=-1) + # vec = recognition.vec(im_np, bbox) query = np.array([ vec ]).astype('float32') # query FAISS -- cgit v1.2.3-70-g09d2