From 34f27f6fa1ccf9dce64769c7a9c3a817b6bc1ba9 Mon Sep 17 00:00:00 2001 From: Ethan Date: Tue, 16 Mar 2021 11:21:39 -0400 Subject: [PATCH] tweaked extractor to be compatible with my code that invokes it . --- mainscripts/Extractor.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mainscripts/Extractor.py b/mainscripts/Extractor.py index 1d5c80f..d02a8a8 100644 --- a/mainscripts/Extractor.py +++ b/mainscripts/Extractor.py @@ -69,8 +69,9 @@ class ExtractSubprocessor(Subprocessor): self.log_info (f"Running on {client_dict['device_name'] }") - if self.type == 'all' or self.type == 'rects-s3fd' or 'landmarks' in self.type: - self.rects_extractor = facelib.S3FDExtractor(place_model_on_cpu=place_model_on_cpu) + # if self.type == 'all' or self.type == 'rects-s3fd' or 'landmarks' in self.type: + # self.rects_extractor = facelib.S3FDExtractor(place_model_on_cpu=place_model_on_cpu) + self.rects_extractor = facelib.S3FDExtractor() if self.type == 'all' or 'landmarks' in self.type: # for head type, extract "3D landmarks" @@ -115,7 +116,7 @@ class ExtractSubprocessor(Subprocessor): rects_extractor=self.rects_extractor, ) - if self.type == 'final' or self.type == 'all': + if 'final' in self.type or self.type == 'final' or self.type == 'all': data = ExtractSubprocessor.Cli.final_stage(data=data, image=image, face_type=self.face_type,