diff options
Diffstat (limited to 'megapixels/commands/cv/face_vector.py')
| -rw-r--r-- | megapixels/commands/cv/face_vector.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/megapixels/commands/cv/face_vector.py b/megapixels/commands/cv/face_vector.py index 9e9f6396..9a527bc3 100644 --- a/megapixels/commands/cv/face_vector.py +++ b/megapixels/commands/cv/face_vector.py @@ -27,10 +27,10 @@ from app.settings import app_cfg as cfg show_default=True, help=click_utils.show_help(types.Dataset)) @click.option('--size', 'opt_size', - type=(int, int), default=(300, 300), + type=(int, int), default=cfg.DEFAULT_SIZE_FACE_DETECT, help='Output image size') @click.option('-e', '--extractor', 'opt_extractor', - default=types.FaceExtractor.VGG, + default=click_utils.get_default(types.FaceExtractor.VGG), type=cfg.FaceExtractorVar, help='Type of extractor framework/network to use') @click.option('-j', '--jitters', 'opt_jitters', default=cfg.DLIB_FACEREC_JITTERS, @@ -88,7 +88,7 @@ def cli(ctx, opt_fp_out, opt_dir_media, opt_data_store, opt_dataset, opt_size, # load data fp_record = data_store.metadata(types.Metadata.FILE_RECORD) - df_record = pd.read_csv(fp_record).set_index('index') + df_record = pd.read_csv(fp_record, dtype={'fn':str}).set_index('index') fp_roi = data_store.metadata(types.Metadata.FACE_ROI) df_roi = pd.read_csv(fp_roi).set_index('index') @@ -115,10 +115,9 @@ def cli(ctx, opt_fp_out, opt_dir_media, opt_data_store, opt_dataset, opt_size, bbox = BBox.from_xywh(x, y, w, h) # norm # compute vec vec = extractor.extract(im, bbox) # use normalized BBox - vec_flat = extractor.flatten(vec) - vec_flat['roi_index'] = roi_index - vec_flat['record_index'] = record_index - vecs.append(vec_flat) + vec_str = extractor.to_str(vec) + vec_obj = {'vec':vec_str, 'roi_index': roi_index, 'record_index':record_index} + vecs.append(vec_obj) # ------------------------------------------------- # save data |