From 65cb506ca182272e2701136097fd00c55dc6bd69 Mon Sep 17 00:00:00 2001 From: adamhrv Date: Wed, 16 Jan 2019 13:30:16 +0100 Subject: change bbox to norm, refine face extractor --- megapixels/app/settings/app_cfg.py | 7 +++++-- megapixels/app/settings/types.py | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'megapixels/app/settings') diff --git a/megapixels/app/settings/app_cfg.py b/megapixels/app/settings/app_cfg.py index 14e2493c..42e37b7a 100644 --- a/megapixels/app/settings/app_cfg.py +++ b/megapixels/app/settings/app_cfg.py @@ -42,7 +42,7 @@ DIR_PEOPLE = 'people' DIR_MODELS_CAFFE = join(DIR_MODELS,'caffe') DIR_MODELS_DARKNET = join(DIR_MODELS,'darknet') DIR_MODELS_DARKNET_PJREDDIE = join(DIR_MODELS_DARKNET, 'pjreddie') -DIR_MODELS_PYTORCHq = join(DIR_MODELS,'pytorch') +DIR_MODELS_PYTORCH = join(DIR_MODELS,'pytorch') DIR_MODELS_TORCH = join(DIR_MODELS,'torch') DIR_MODELS_MXNET = join(DIR_MODELS,'mxnet') DIR_MODELS_KERAS = join(DIR_MODELS,'keras') @@ -99,7 +99,10 @@ HASH_BRANCH_SIZE = 3 DLIB_FACEREC_JITTERS = 5 # number of face recognition jitters #DLIB_FACEREC_PADDING = 0.25 # default dlib FACEREC_PADDING = 0.3 # VGG FACE2 recommended - +DEFAULT_SIZE_FACE_DETECT = (480,480) +DEFAULT_JITTER_AMT = 0.015 # used for OpenCV DNN face detector with VGG2 face feature extractor +DEFAULT_NUM_JITTERS = 4 # used for smothing the facial feature extraction +DEFAULT_FACE_PADDING_VGG_FACE2 = 0.3 POSE_MINMAX_YAW = (-25,25) POSE_MINMAX_ROLL = (-15,15) POSE_MINMAX_PITCH = (-10,10) diff --git a/megapixels/app/settings/types.py b/megapixels/app/settings/types.py index 940c8b6d..9325fc3c 100644 --- a/megapixels/app/settings/types.py +++ b/megapixels/app/settings/types.py @@ -43,10 +43,10 @@ class LogLevel(Enum): class Metadata(Enum): IDENTITY, FILE_RECORD, FACE_VECTOR, FACE_POSE, \ - FACE_ROI, FACE_LANDMARK_2D_68, FACE_LANDMARK_2D_5,FACE_LANDMARK_3D_68 = range(8) + FACE_ROI, FACE_LANDMARK_2D_68, FACE_LANDMARK_2D_5,FACE_LANDMARK_3D_68, FACE_ATTRIBUTES = range(9) class Dataset(Enum): - LFW, VGG_FACE2, MSCELEB, UCCS, UMD_FACES, SCUT_FBP, SELFIE_DATASET = range(7) + LFW, VGG_FACE2, MSCELEB, UCCS, UMD_FACES, SCUT_FBP, UCF_SELFIE, UTK = range(8) # --------------------------------------------------------------------- @@ -59,7 +59,7 @@ class FaceDetectNet(Enum): class FaceExtractor(Enum): """Type of face recognition feature extractor""" # TODO deprecate DLIB resnet and use only CVDNN Caffe models - DLIB_RESNET, VGG_FACE2 = range(2) + DLIB, VGG = range(2) class FaceLandmark2D_5(Enum): DLIB, MTCNN = range(2) -- cgit v1.2.3-70-g09d2