diff --git a/deepface/DeepFace.py b/deepface/DeepFace.py index e80aacf..e5a8cb1 100644 --- a/deepface/DeepFace.py +++ b/deepface/DeepFace.py @@ -29,7 +29,7 @@ logger = Logger(module="DeepFace") warnings.filterwarnings("ignore") os.environ["TF_CPP_MIN_LOG_LEVEL"] = "3" -tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) +tf_version = functions.get_tf_major_version() if tf_version == 2: tf.get_logger().setLevel(logging.ERROR) # ----------------------------------- diff --git a/deepface/basemodels/ArcFace.py b/deepface/basemodels/ArcFace.py index f647276..13cf10a 100644 --- a/deepface/basemodels/ArcFace.py +++ b/deepface/basemodels/ArcFace.py @@ -1,6 +1,5 @@ import os import gdown -import tensorflow as tf from deepface.commons import functions from deepface.commons.logger import Logger from deepface.models.FacialRecognition import FacialRecognition @@ -12,7 +11,7 @@ logger = Logger(module="basemodels.ArcFace") # -------------------------------- # dependency configuration -tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) +tf_version = functions.get_tf_major_version() if tf_version == 1: from keras.models import Model diff --git a/deepface/basemodels/DeepID.py b/deepface/basemodels/DeepID.py index 0c74f0b..7a4da5b 100644 --- a/deepface/basemodels/DeepID.py +++ b/deepface/basemodels/DeepID.py @@ -1,13 +1,12 @@ import os import gdown -import tensorflow as tf from deepface.commons import functions from deepface.commons.logger import Logger from deepface.models.FacialRecognition import FacialRecognition logger = Logger(module="basemodels.DeepID") -tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) +tf_version = functions.get_tf_major_version() if tf_version == 1: from keras.models import Model diff --git a/deepface/basemodels/Facenet.py b/deepface/basemodels/Facenet.py index 8476909..4479790 100644 --- a/deepface/basemodels/Facenet.py +++ b/deepface/basemodels/Facenet.py @@ -1,6 +1,5 @@ import os import gdown -import tensorflow as tf from deepface.commons import functions from deepface.commons.logger import Logger from deepface.models.FacialRecognition import FacialRecognition @@ -10,7 +9,7 @@ logger = Logger(module="basemodels.Facenet") # -------------------------------- # dependency configuration -tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) +tf_version = functions.get_tf_major_version() if tf_version == 1: from keras.models import Model diff --git a/deepface/basemodels/FbDeepFace.py b/deepface/basemodels/FbDeepFace.py index eb49f7e..0a436ed 100644 --- a/deepface/basemodels/FbDeepFace.py +++ b/deepface/basemodels/FbDeepFace.py @@ -1,7 +1,6 @@ import os import zipfile import gdown -import tensorflow as tf from deepface.commons import functions from deepface.commons.logger import Logger from deepface.models.FacialRecognition import FacialRecognition @@ -11,7 +10,7 @@ logger = Logger(module="basemodels.FbDeepFace") # -------------------------------- # dependency configuration -tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) +tf_version = functions.get_tf_major_version() if tf_version == 1: from keras.models import Model, Sequential diff --git a/deepface/basemodels/OpenFace.py b/deepface/basemodels/OpenFace.py index d829e30..05ef430 100644 --- a/deepface/basemodels/OpenFace.py +++ b/deepface/basemodels/OpenFace.py @@ -7,7 +7,7 @@ from deepface.models.FacialRecognition import FacialRecognition logger = Logger(module="basemodels.OpenFace") -tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) +tf_version = functions.get_tf_major_version() if tf_version == 1: from keras.models import Model from keras.layers import Conv2D, ZeroPadding2D, Input, concatenate @@ -30,6 +30,7 @@ class OpenFace(FacialRecognition): """ OpenFace model class """ + def __init__(self): self.model = load_model() self.model_name = "OpenFace" diff --git a/deepface/basemodels/VGGFace.py b/deepface/basemodels/VGGFace.py index 0a0df33..921898e 100644 --- a/deepface/basemodels/VGGFace.py +++ b/deepface/basemodels/VGGFace.py @@ -1,6 +1,5 @@ import os import gdown -import tensorflow as tf from deepface.commons import functions from deepface.commons.logger import Logger from deepface.models.FacialRecognition import FacialRecognition @@ -9,8 +8,7 @@ logger = Logger(module="basemodels.VGGFace") # --------------------------------------- -tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) - +tf_version = functions.get_tf_major_version() if tf_version == 1: from keras.models import Model, Sequential from keras.layers import ( diff --git a/deepface/commons/functions.py b/deepface/commons/functions.py index 64f8e06..22b76f1 100644 --- a/deepface/commons/functions.py +++ b/deepface/commons/functions.py @@ -21,9 +21,12 @@ logger = Logger(module="commons.functions") # -------------------------------------------------- # configurations of dependencies -tf_version = tf.__version__ -tf_major_version = int(tf_version.split(".", maxsplit=1)[0]) -tf_minor_version = int(tf_version.split(".")[1]) + +def get_tf_major_version() -> int: + return int(tf.__version__.split(".", maxsplit=1)[0]) + + +tf_major_version = get_tf_major_version() if tf_major_version == 1: from keras.preprocessing import image diff --git a/deepface/extendedmodels/Age.py b/deepface/extendedmodels/Age.py index 3c03ee5..6315a8c 100644 --- a/deepface/extendedmodels/Age.py +++ b/deepface/extendedmodels/Age.py @@ -1,7 +1,6 @@ import os import gdown import numpy as np -import tensorflow as tf from deepface.basemodels import VGGFace from deepface.commons import functions from deepface.commons.logger import Logger @@ -12,7 +11,7 @@ logger = Logger(module="extendedmodels.Age") # ---------------------------------------- # dependency configurations -tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) +tf_version = functions.get_tf_major_version() if tf_version == 1: from keras.models import Model, Sequential diff --git a/deepface/extendedmodels/Emotion.py b/deepface/extendedmodels/Emotion.py index 7cf984a..7db38c1 100644 --- a/deepface/extendedmodels/Emotion.py +++ b/deepface/extendedmodels/Emotion.py @@ -1,6 +1,5 @@ import os import gdown -import tensorflow as tf import numpy as np import cv2 from deepface.commons import functions @@ -13,7 +12,7 @@ logger = Logger(module="extendedmodels.Emotion") # pylint: disable=line-too-long # ------------------------------------------- # dependency configuration -tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) +tf_version = functions.get_tf_major_version() if tf_version == 1: from keras.models import Sequential diff --git a/deepface/extendedmodels/Gender.py b/deepface/extendedmodels/Gender.py index 0ecad61..5c6bc95 100644 --- a/deepface/extendedmodels/Gender.py +++ b/deepface/extendedmodels/Gender.py @@ -1,6 +1,5 @@ import os import gdown -import tensorflow as tf import numpy as np from deepface.basemodels import VGGFace from deepface.commons import functions @@ -14,8 +13,7 @@ logger = Logger(module="extendedmodels.Gender") # ------------------------------------- # dependency configurations -tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) - +tf_version = functions.get_tf_major_version() if tf_version == 1: from keras.models import Model, Sequential from keras.layers import Convolution2D, Flatten, Activation diff --git a/deepface/extendedmodels/Race.py b/deepface/extendedmodels/Race.py index 71d2d12..33a0d19 100644 --- a/deepface/extendedmodels/Race.py +++ b/deepface/extendedmodels/Race.py @@ -1,6 +1,5 @@ import os import gdown -import tensorflow as tf import numpy as np from deepface.basemodels import VGGFace from deepface.commons import functions @@ -13,7 +12,7 @@ logger = Logger(module="extendedmodels.Race") # pylint: disable=line-too-long # -------------------------- # dependency configurations -tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) +tf_version = functions.get_tf_major_version() if tf_version == 1: from keras.models import Model, Sequential diff --git a/deepface/models/Demography.py b/deepface/models/Demography.py index 861a987..36a01c8 100644 --- a/deepface/models/Demography.py +++ b/deepface/models/Demography.py @@ -1,10 +1,9 @@ from typing import Union from abc import ABC, abstractmethod import numpy as np -import tensorflow as tf - -tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) +from deepface.commons import functions +tf_version = functions.get_tf_major_version() if tf_version == 1: from keras.models import Model else: diff --git a/deepface/models/FacialRecognition.py b/deepface/models/FacialRecognition.py index fa70f65..1709e40 100644 --- a/deepface/models/FacialRecognition.py +++ b/deepface/models/FacialRecognition.py @@ -1,9 +1,9 @@ from abc import ABC from typing import Any, Union import numpy as np -import tensorflow as tf +from deepface.commons import functions -tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) +tf_version = functions.get_tf_major_version() if tf_version == 2: from tensorflow.keras.models import Model else: