github/deepface
1
1
Fork 0
mirror of https://github.com/serengil/deepface.git synced 2025-06-07 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

no need to check version for fb deepface

Browse Source
This commit is contained in:
Sefik Ilkin Serengil 2024-03-19 08:56:05 +00:00
parent 87a95dc2ae
commit ce1fa57d35
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deepface/basemodels/FbDeepFace.py
View File

@ -23,6 +23,7 @@ if tf_major == 1:
Flatten, Flatten,
Dense, Dense,
Dropout, Dropout,
LocallyConnected2D,
) )
else: else:
from tensorflow.keras.models import Model, Sequential from tensorflow.keras.models import Model, Sequential
@ -32,6 +33,7 @@ else:
Flatten, Flatten,
Dense, Dense,
Dropout, Dropout,
LocallyConnected2D,
) )
@ -43,14 +45,6 @@ class DeepFaceClient(FacialRecognition):
""" """
def __init__(self): def __init__(self):
# DeepFace requires tf 2.12 or less
if tf_major == 2 and tf_minor > 12:
# Ref: https://github.com/serengil/deepface/pull/1079
raise ValueError(
"DeepFace model requires LocallyConnected2D but it is no longer supported"
f" after tf 2.12 but you have {tf_major}.{tf_minor}. You need to downgrade your tf."
)
self.model = load_model() self.model = load_model()
self.model_name = "DeepFace" self.model_name = "DeepFace"
self.input_shape = (152, 152) self.input_shape = (152, 152)
@ -75,13 +69,6 @@ def load_model(
""" """
Construct DeepFace model, download its weights and load Construct DeepFace model, download its weights and load
""" """
# we have some checks for this dependency in the init of client
# putting this in global causes library initialization
if tf_major == 1:
from keras.layers import LocallyConnected2D
else:
from tensorflow.keras.layers import LocallyConnected2D
base_model = Sequential() base_model = Sequential()
base_model.add( base_model.add(
Convolution2D(32, (11, 11), activation="relu", name="C1", input_shape=(152, 152, 3)) Convolution2D(32, (11, 11), activation="relu", name="C1", input_shape=(152, 152, 3))