From 9fcd62adccc0a835fbb6fb702fb3792b47e94a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=9Eefik=20Serangil?= Date: Wed, 1 Jul 2020 14:19:12 +0300 Subject: [PATCH] download ensemble model --- deepface/DeepFace.py | 30 ++++++++++++++++++++++++------ setup.py | 2 +- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/deepface/DeepFace.py b/deepface/DeepFace.py index ab7f8c4..f892ded 100644 --- a/deepface/DeepFace.py +++ b/deepface/DeepFace.py @@ -4,6 +4,8 @@ warnings.filterwarnings("ignore") import time import os from os import path +from pathlib import Path +import gdown import numpy as np import pandas as pd from tqdm import tqdm @@ -131,12 +133,21 @@ def verify(img1_path, img2_path='' #------------------------------- #find deepface path - deepface_path = DeepFace.__file__ - deepface_path = deepface_path.replace("\\", "/").replace("/DeepFace.py", "") - ensemble_model_path = deepface_path+"/models/face-recognition-ensemble-model.txt" + home = str(Path.home()) + + if os.path.isfile(home+'/.deepface/weights/face-recognition-ensemble-model.txt') != True: + print("face-recognition-ensemble-model.txt will be downloaded...") + url = 'https://raw.githubusercontent.com/serengil/deepface/master/deepface/models/face-recognition-ensemble-model.txt' + output = home+'/.deepface/weights/face-recognition-ensemble-model.txt' + gdown.download(url, output, quiet=False) + + ensemble_model_path = home+'/.deepface/weights/face-recognition-ensemble-model.txt' + #print(ensemble_model_path) + #------------------------------- + deepface_ensemble = lgb.Booster(model_file = ensemble_model_path) prediction = deepface_ensemble.predict(np.expand_dims(np.array(ensemble_features), axis=0))[0] @@ -732,9 +743,16 @@ def find(img_path, db_path #---------------------------------- #lightgbm model - deepface_path = DeepFace.__file__ - deepface_path = deepface_path.replace("\\", "/").replace("/DeepFace.py", "") - ensemble_model_path = deepface_path+"/models/face-recognition-ensemble-model.txt" + home = str(Path.home()) + + if os.path.isfile(home+'/.deepface/weights/face-recognition-ensemble-model.txt') != True: + print("face-recognition-ensemble-model.txt will be downloaded...") + url = 'https://raw.githubusercontent.com/serengil/deepface/master/deepface/models/face-recognition-ensemble-model.txt' + output = home+'/.deepface/weights/face-recognition-ensemble-model.txt' + gdown.download(url, output, quiet=False) + + ensemble_model_path = home+'/.deepface/weights/face-recognition-ensemble-model.txt' + deepface_ensemble = lgb.Booster(model_file = ensemble_model_path) y = deepface_ensemble.predict(x) diff --git a/setup.py b/setup.py index a6dd72a..6cb0bc6 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh: setuptools.setup( name="deepface", - version="0.0.32", + version="0.0.33", author="Sefik Ilkin Serengil", author_email="serengil@gmail.com", description="A Lightweight Face Recognition and Facial Attribute Analysis Framework (Age, Gender, Emotion, Race) for Python",