Merge pull request #1303 from serengil/feat-task-0808-refactoring-models

models refactored
serengil · Aug 8, 2024 · e533489 · e533489
2 parents d2b9b75 + b7c7a55
commit e533489
Show file tree

Hide file tree

Showing 31 changed files with 10 additions and 10 deletions.
diff --git a/deepface/extendedmodels/Age.py → deepface/models/demography/Age.py b/deepface/extendedmodels/Age.py → deepface/models/demography/Age.py
@@ -1,7 +1,7 @@
 import os
 import gdown
 import numpy as np
-from deepface.basemodels import VGGFace
+from deepface.models.facial_recognition import VGGFace
 from deepface.commons import package_utils, folder_utils
 from deepface.models.Demography import Demography
 from deepface.commons.logger import Logger

diff --git a/deepface/extendedmodels/Emotion.py → deepface/models/demography/Emotion.py b/deepface/extendedmodels/Emotion.py → deepface/models/demography/Emotion.py
diff --git a/deepface/extendedmodels/Gender.py → deepface/models/demography/Gender.py b/deepface/extendedmodels/Gender.py → deepface/models/demography/Gender.py
@@ -6,7 +6,7 @@
 import numpy as np
 
 # project dependencies
-from deepface.basemodels import VGGFace
+from deepface.models.facial_recognition import VGGFace
 from deepface.commons import package_utils, folder_utils
 from deepface.models.Demography import Demography
 from deepface.commons.logger import Logger

diff --git a/deepface/extendedmodels/Race.py → deepface/models/demography/Race.py b/deepface/extendedmodels/Race.py → deepface/models/demography/Race.py
@@ -6,7 +6,7 @@
 import numpy as np
 
 # project dependencies
-from deepface.basemodels import VGGFace
+from deepface.models.facial_recognition import VGGFace
 from deepface.commons import package_utils, folder_utils
 from deepface.models.Demography import Demography
 from deepface.commons.logger import Logger

diff --git a/deepface/basemodels/__init__.py → deepface/models/demography/__init__.py b/deepface/basemodels/__init__.py → deepface/models/demography/__init__.py
diff --git a/deepface/detectors/CenterFace.py → deepface/models/face_detection/CenterFace.py b/deepface/detectors/CenterFace.py → deepface/models/face_detection/CenterFace.py
diff --git a/deepface/detectors/Dlib.py → deepface/models/face_detection/Dlib.py b/deepface/detectors/Dlib.py → deepface/models/face_detection/Dlib.py
diff --git a/deepface/detectors/FastMtCnn.py → deepface/models/face_detection/FastMtCnn.py b/deepface/detectors/FastMtCnn.py → deepface/models/face_detection/FastMtCnn.py
diff --git a/deepface/detectors/MediaPipe.py → deepface/models/face_detection/MediaPipe.py b/deepface/detectors/MediaPipe.py → deepface/models/face_detection/MediaPipe.py
diff --git a/deepface/detectors/MtCnn.py → deepface/models/face_detection/MtCnn.py b/deepface/detectors/MtCnn.py → deepface/models/face_detection/MtCnn.py
diff --git a/deepface/detectors/OpenCv.py → deepface/models/face_detection/OpenCv.py b/deepface/detectors/OpenCv.py → deepface/models/face_detection/OpenCv.py
diff --git a/deepface/detectors/RetinaFace.py → deepface/models/face_detection/RetinaFace.py b/deepface/detectors/RetinaFace.py → deepface/models/face_detection/RetinaFace.py
diff --git a/deepface/detectors/Ssd.py → deepface/models/face_detection/Ssd.py b/deepface/detectors/Ssd.py → deepface/models/face_detection/Ssd.py
@@ -4,7 +4,7 @@
 import cv2
 import pandas as pd
 import numpy as np
-from deepface.detectors import OpenCv
+from deepface.models.face_detection import OpenCv
 from deepface.commons import folder_utils
 from deepface.models.Detector import Detector, FacialAreaRegion
 from deepface.commons.logger import Logger

diff --git a/deepface/detectors/Yolo.py → deepface/models/face_detection/Yolo.py b/deepface/detectors/Yolo.py → deepface/models/face_detection/Yolo.py
diff --git a/deepface/detectors/YuNet.py → deepface/models/face_detection/YuNet.py b/deepface/detectors/YuNet.py → deepface/models/face_detection/YuNet.py
diff --git a/deepface/detectors/__init__.py → deepface/models/face_detection/__init__.py b/deepface/detectors/__init__.py → deepface/models/face_detection/__init__.py
diff --git a/deepface/basemodels/ArcFace.py → ...face/models/facial_recognition/ArcFace.py b/deepface/basemodels/ArcFace.py → ...face/models/facial_recognition/ArcFace.py
diff --git a/deepface/basemodels/DeepID.py → deepface/models/facial_recognition/DeepID.py b/deepface/basemodels/DeepID.py → deepface/models/facial_recognition/DeepID.py
diff --git a/deepface/basemodels/Dlib.py → deepface/models/facial_recognition/Dlib.py b/deepface/basemodels/Dlib.py → deepface/models/facial_recognition/Dlib.py
diff --git a/deepface/basemodels/Facenet.py → ...face/models/facial_recognition/Facenet.py b/deepface/basemodels/Facenet.py → ...face/models/facial_recognition/Facenet.py
diff --git a/deepface/basemodels/FbDeepFace.py → ...e/models/facial_recognition/FbDeepFace.py b/deepface/basemodels/FbDeepFace.py → ...e/models/facial_recognition/FbDeepFace.py
diff --git a/deepface/basemodels/GhostFaceNet.py → ...models/facial_recognition/GhostFaceNet.py b/deepface/basemodels/GhostFaceNet.py → ...models/facial_recognition/GhostFaceNet.py
diff --git a/deepface/basemodels/OpenFace.py → ...ace/models/facial_recognition/OpenFace.py b/deepface/basemodels/OpenFace.py → ...ace/models/facial_recognition/OpenFace.py
diff --git a/deepface/basemodels/SFace.py → deepface/models/facial_recognition/SFace.py b/deepface/basemodels/SFace.py → deepface/models/facial_recognition/SFace.py
diff --git a/deepface/basemodels/VGGFace.py → ...face/models/facial_recognition/VGGFace.py b/deepface/basemodels/VGGFace.py → ...face/models/facial_recognition/VGGFace.py
diff --git a/deepface/extendedmodels/__init__.py → ...ace/models/facial_recognition/__init__.py b/deepface/extendedmodels/__init__.py → ...ace/models/facial_recognition/__init__.py
diff --git a/deepface/spoofmodels/FasNet.py → deepface/models/spoofing/FasNet.py b/deepface/spoofmodels/FasNet.py → deepface/models/spoofing/FasNet.py
@@ -47,7 +47,7 @@ def __init__(self):
         )
 
         # guarantees Fasnet imported and torch installed
-        from deepface.spoofmodels import FasNetBackbone
+        from deepface.models.spoofing import FasNetBackbone
 
         # Fasnet will use 2 distinct models to predict, then it will find the sum of predictions
         # to make a final prediction

diff --git a/deepface/spoofmodels/FasNetBackbone.py → deepface/models/spoofing/FasNetBackbone.py b/deepface/spoofmodels/FasNetBackbone.py → deepface/models/spoofing/FasNetBackbone.py
diff --git a/deepface/spoofmodels/__init__.py → deepface/models/spoofing/__init__.py b/deepface/spoofmodels/__init__.py → deepface/models/spoofing/__init__.py
diff --git a/deepface/modules/demography.py b/deepface/modules/demography.py
@@ -7,7 +7,7 @@
 
 # project dependencies
 from deepface.modules import modeling, detection, preprocessing
-from deepface.extendedmodels import Gender, Race, Emotion
+from deepface.models.demography import Gender, Race, Emotion
 
 
 def analyze(

diff --git a/deepface/modules/modeling.py b/deepface/modules/modeling.py
@@ -2,7 +2,7 @@
 from typing import Any
 
 # project dependencies
-from deepface.basemodels import (
+from deepface.models.facial_recognition import (
     VGGFace,
     OpenFace,
     FbDeepFace,
@@ -13,7 +13,7 @@
     Facenet,
     GhostFaceNet,
 )
-from deepface.detectors import (
+from deepface.models.face_detection import (
     FastMtCnn,
     MediaPipe,
     MtCnn,
@@ -25,8 +25,8 @@
     YuNet,
     CenterFace,
 )
-from deepface.extendedmodels import Age, Gender, Race, Emotion
-from deepface.spoofmodels import FasNet
+from deepface.models.demography import Age, Gender, Race, Emotion
+from deepface.models.spoofing import FasNet
 
 
 def build_model(task: str, model_name: str) -> Any: