From 893354b870eb5fdfcf3e2b2fe250b124fff2a1fa Mon Sep 17 00:00:00 2001 From: iperov Date: Mon, 11 Mar 2019 09:32:00 +0400 Subject: [PATCH] fix S3FD for plaidML, fix S3FD warnings on Lambda layers. --- facelib/S3FD.h5 | Bin 89980840 -> 89980896 bytes mainscripts/Extractor.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/facelib/S3FD.h5 b/facelib/S3FD.h5 index f9229f3302d5b0c6f56541b4d71673c6ad860967..5788f655663609a754c6a716d48c48172939b9f7 100644 GIT binary patch delta 15561 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 I6yn1B|0B$1+W-In diff --git a/mainscripts/Extractor.py b/mainscripts/Extractor.py index eddf66f..28fa105 100644 --- a/mainscripts/Extractor.py +++ b/mainscripts/Extractor.py @@ -213,7 +213,7 @@ class ExtractSubprocessor(Subprocessor): cpu_only = True if not cpu_only and (type == 'rects' or type == 'landmarks'): - if type == 'rects' and (self.detector == 'mt' or self.detector == 's3fd') and nnlib.device.backend == "plaidML": + if type == 'rects' and (self.detector == 'mt') and nnlib.device.backend == "plaidML": cpu_only = True else: if multi_gpu: