Merge pull request #1298 from serengil/feat-task-0408-batch-support-f…

…or-extended-models batch run support added for facial attribute models
serengil · Aug 4, 2024 · a718285 · a718285
2 parents d348d8d + 51717db
commit a718285
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/deepface/extendedmodels/Age.py b/deepface/extendedmodels/Age.py
@@ -33,7 +33,9 @@ def __init__(self):
         self.model_name = "Age"
 
     def predict(self, img: np.ndarray) -> np.float64:
-        age_predictions = self.model.predict(img, verbose=0)[0, :]
+        # model.predict causes memory issue when it is called in a for loop
+        # age_predictions = self.model.predict(img, verbose=0)[0, :]
+        age_predictions = self.model(img, training=False).numpy()[0, :]
         return find_apparent_age(age_predictions)
 
 

diff --git a/deepface/extendedmodels/Emotion.py b/deepface/extendedmodels/Emotion.py
@@ -52,7 +52,10 @@ def predict(self, img: np.ndarray) -> np.ndarray:
         img_gray = cv2.resize(img_gray, (48, 48))
         img_gray = np.expand_dims(img_gray, axis=0)
 
-        emotion_predictions = self.model.predict(img_gray, verbose=0)[0, :]
+        # model.predict causes memory issue when it is called in a for loop
+        # emotion_predictions = self.model.predict(img_gray, verbose=0)[0, :]
+        emotion_predictions = self.model(img_gray, training=False).numpy()[0, :]
+
         return emotion_predictions
 
 

diff --git a/deepface/extendedmodels/Gender.py b/deepface/extendedmodels/Gender.py
@@ -41,7 +41,9 @@ def __init__(self):
         self.model_name = "Gender"
 
     def predict(self, img: np.ndarray) -> np.ndarray:
-        return self.model.predict(img, verbose=0)[0, :]
+        # model.predict causes memory issue when it is called in a for loop
+        # return self.model.predict(img, verbose=0)[0, :]
+        return self.model(img, training=False).numpy()[0, :]
 
 
 def load_model(

diff --git a/deepface/extendedmodels/Race.py b/deepface/extendedmodels/Race.py
@@ -40,7 +40,9 @@ def __init__(self):
         self.model_name = "Race"
 
     def predict(self, img: np.ndarray) -> np.ndarray:
-        return self.model.predict(img, verbose=0)[0, :]
+        # model.predict causes memory issue when it is called in a for loop
+        # return self.model.predict(img, verbose=0)[0, :]
+        return self.model(img, training=False).numpy()[0, :]
 
 
 def load_model(