diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | megapixels/app/settings/app_cfg.py | 6 | ||||
| -rw-r--r-- | megapixels/app/settings/types.py | 7 |
3 files changed, 12 insertions, 4 deletions
@@ -2,7 +2,8 @@ 3rdparty/ *_local_* site/public/datasets/ - +site/public/*.html +notebooks/_local_* # Project specific webpack-stats.dev.json diff --git a/megapixels/app/settings/app_cfg.py b/megapixels/app/settings/app_cfg.py index fea47572..14e2493c 100644 --- a/megapixels/app/settings/app_cfg.py +++ b/megapixels/app/settings/app_cfg.py @@ -21,6 +21,7 @@ DataStoreVar = click_utils.ParamVar(types.DataStore) # Face analysis HaarCascadeVar = click_utils.ParamVar(types.HaarCascade) FaceDetectNetVar = click_utils.ParamVar(types.FaceDetectNet) +FaceExtractorVar = click_utils.ParamVar(types.FaceExtractor) FaceLandmark2D_5Var = click_utils.ParamVar(types.FaceLandmark2D_5) FaceLandmark2D_68Var = click_utils.ParamVar(types.FaceLandmark2D_68) FaceLandmark3D_68Var = click_utils.ParamVar(types.FaceLandmark3D_68) @@ -41,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_PYTORCH = join(DIR_MODELS,'pytorch') +DIR_MODELS_PYTORCHq = 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') @@ -96,7 +97,8 @@ HASH_TREE_DEPTH = 3 HASH_BRANCH_SIZE = 3 DLIB_FACEREC_JITTERS = 5 # number of face recognition jitters -DLIB_FACEREC_PADDING = 0.25 # default dlib +#DLIB_FACEREC_PADDING = 0.25 # default dlib +FACEREC_PADDING = 0.3 # VGG FACE2 recommended POSE_MINMAX_YAW = (-25,25) POSE_MINMAX_ROLL = (-15,15) diff --git a/megapixels/app/settings/types.py b/megapixels/app/settings/types.py index 1d77fdbd..940c8b6d 100644 --- a/megapixels/app/settings/types.py +++ b/megapixels/app/settings/types.py @@ -54,7 +54,12 @@ class Dataset(Enum): # -------------------------------------------------------------------- class FaceDetectNet(Enum): """Scene text detector networks""" - HAAR, DLIB_CNN, DLIB_HOG, CVDNN, MTCNN = range(5) + HAAR, DLIB_CNN, DLIB_HOG, CVDNN, MTCNN_TF, MTCNN_PT, MTCNN_CAFFE = range(7) + +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) class FaceLandmark2D_5(Enum): DLIB, MTCNN = range(2) |