[A] Add one test and update codes

kunkunlin1221 · kunkunlin1221 · commit a0ecf19081af · 2025-08-26T20:14:15.000+08:00
diff --git a/.github/workflows/cpu-ci.yml b/.github/workflows/cpu-ci.yml
@@ -13,13 +13,15 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.10", "3.12"]
-        os: ["ubuntu-latest", "ubuntu-24.04-arm", "macos-13", "macos-latest"] # , "macos-15"  # replace with "macos-latest" if needed
+        os: ["ubuntu-22.04","ubuntu-24.04", "macos-13", "macos-latest"] # "ubuntu-24.04-arm",  # replace with "macos-latest" if needed
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          lfs: true
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
@@ -29,6 +31,7 @@ jobs:
 
       - name: Install Dependencies
         run: |
+          sudo apt install -y libturbojpeg exiftool ffmpeg libheif-dev poppler-utils
           python -m pip install -U pip wheel "numpy>=2" "cython>=3.0.12" "setuptools>=69"
           python setup.py build_ext --inplace
           python -m pip install .
@@ -42,20 +45,20 @@ jobs:
         run: |
           mkdir -p tests/coverage
           python -m pip install pytest pytest-cov typeguard
-          python -m pytest tests \
-            --junitxml=tests/coverage/cov-junitxml.xml \
-            --cov=pyface \
-            | tee tests/coverage/cov.txt
+          python -m pytest tests --junitxml=tests/coverage/cov-junitxml.xml --cov=pyface
 
-      - name: Pytest Coverage Comment
+      - name: Surface failing tests
         if: always()
-        id: coverageComment
-        uses: MishaKav/pytest-coverage-comment@main
+        uses: pmeier/pytest-results-action@main
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          pytest-coverage-path: tests/coverage/cov.txt
-          junitxml-path: tests/coverage/cov-junitxml.xml
+          path: tests/coverage/cov-junitxml.xml
+          summary: true
+          display-options: fEX
+          fail-on-empty: true
+          title: Test results
 
       - name: Clean artifacts
         if: always()
-        run: rm -rf dist wheelhouse build *.egg-info
+        run: |
+          rm -rf dist wheelhouse build *.egg-info
+          rm -rf ${{ github.workspace }}
diff --git a/.github/workflows/cuda-ci.yml b/.github/workflows/cuda-ci.yml
@@ -19,6 +19,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          lfs: true
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
@@ -41,20 +43,20 @@ jobs:
         run: |
           mkdir -p tests/coverage
           python -m pip install pytest pytest-cov typeguard
-          python -m pytest tests \
-            --junitxml=tests/coverage/cov-junitxml.xml \
-            --cov=pyface \
-            | tee tests/coverage/cov.txt
+          python -m pytest tests --junitxml=tests/coverage/cov-junitxml.xml --cov=pyface
 
-      - name: Pytest Coverage Comment
+      - name: Surface failing tests
         if: always()
-        id: coverageComment
-        uses: MishaKav/pytest-coverage-comment@main
+        uses: pmeier/pytest-results-action@main
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          pytest-coverage-path: tests/coverage/cov.txt
-          junitxml-path: tests/coverage/cov-junitxml.xml
+          path: tests/coverage/cov-junitxml.xml
+          summary: true
+          display-options: fEX
+          fail-on-empty: true
+          title: Test results
 
       - name: Clean artifacts
         if: always()
-        run: rm -rf dist wheelhouse build *.egg-info
+        run: |
+          rm -rf dist wheelhouse build *.egg-info
+          rm -rf ${{ github.workspace }}
diff --git a/pyface/__init__.py b/pyface/__init__.py
@@ -1,6 +1,6 @@
 from .components import *
 from .face_service import *
 from .object import *
-from .utils import download_models
+from .utils import *
 
 __version__ = "0.1.2"
diff --git a/pyface/components/face_depth/tddfav2.py b/pyface/components/face_depth/tddfav2.py
@@ -198,7 +198,7 @@ class TDDFAV2:
     def __init__(
         self,
         model_path: Optional[Union[str, cb.Path]] = None,
-        model_version: str = "tddfav2_mbv1_fp32",
+        model_name: str = "tddfav2_mbv1_fp32",
         batch_size: int = 1,
         gpu_id: int = 0,
         backend: str = "cuda",
@@ -207,8 +207,8 @@ def __init__(
     ):
         if model_path is None:
             model_path = download_model_and_return_model_fpath(
-                repo_id=self.repo_ids[model_version],
-                model_fname=f"{model_version}.onnx",
+                repo_id=self.repo_ids[model_name],
+                model_fname=f"{model_name}.onnx",
             )
         self.model_path = model_path
         self.batch_size = batch_size
diff --git a/pyface/components/face_detection/scrfd.py b/pyface/components/face_detection/scrfd.py
@@ -100,7 +100,7 @@ class SCRFD:
     def __init__(
         self,
         model_path: str = None,
-        model_version: str = "scrfd_10g_gnkps_fp32",
+        model_name: str = "scrfd_10g_gnkps_fp32",
         batch_size: int = 1,
         inp_size: Optional[Tuple[int, int]] = (480, 640),  # best settings for the model
         score_th: Optional[float] = None,
@@ -111,8 +111,8 @@ def __init__(
     ):
         if model_path is None:
             model_path = download_model_and_return_model_fpath(
-                repo_id=self.repo_ids[model_version],
-                model_fname=f"{model_version}.onnx",
+                repo_id=self.repo_ids[model_name],
+                model_fname=f"{model_name}.onnx",
             )
         self.model_path = model_path
         self.engine = cb.ONNXEngine(
diff --git a/pyface/components/face_gender.py b/pyface/components/face_gender.py
@@ -49,7 +49,7 @@ class GenderDetector:
     def __init__(
         self,
         model_path: str = None,
-        model_version: str = "gender_detection_lcnet_050",
+        model_name: str = "gender_detection_lcnet_050",
         batch_size: int = 1,
         gpu_id: int = 0,
         backend: str = "cuda",
@@ -58,8 +58,8 @@ def __init__(
     ):
         if model_path is None:
             model_path = download_model_and_return_model_fpath(
-                repo_id=self.repo_ids[model_version],
-                model_fname=f"{model_version}.onnx",
+                repo_id=self.repo_ids[model_name],
+                model_fname=f"{model_name}.onnx",
             )
         self.model_path = model_path
         self.engine = cb.ONNXEngine(
diff --git a/pyface/components/face_landmark/coordinate_reg.py b/pyface/components/face_landmark/coordinate_reg.py
@@ -36,7 +36,7 @@ class CoordinateReg:
     def __init__(
         self,
         model_path: Optional[str] = None,
-        model_version: str = "coordinate_reg_mbv1_fp32",
+        model_name: str = "coordinate_reg_mbv1_fp32",
         gpu_id: int = 0,
         backend: str = "cuda",
         session_option: Dict[str, Any] = {},
@@ -46,8 +46,8 @@ def __init__(
     ):
         if model_path is None:
             model_path = download_model_and_return_model_fpath(
-                repo_id=self.repo_ids[model_version],
-                model_fname=f"{model_version}.onnx",
+                repo_id=self.repo_ids[model_name],
+                model_fname=f"{model_name}.onnx",
             )
         self.model_path = model_path
         self.engine = cb.ONNXEngine(
diff --git a/pyface/components/face_recognition/arcface.py b/pyface/components/face_recognition/arcface.py
@@ -17,7 +17,7 @@ class ArcFace:
     def __init__(
         self,
         model_path: Optional[str] = None,
-        model_version: str = "wf42m_pfc03_vit-l_fp32",
+        model_name: str = "wf42m_pfc03_vit-l_fp32",
         batch_size: int = 1,
         enable_flip: bool = False,
         gpu_id: int = 0,
@@ -27,8 +27,8 @@ def __init__(
     ):
         if model_path is None:
             model_path = download_model_and_return_model_fpath(
-                repo_id=self.repo_ids[model_version],
-                model_fname=f"{model_version}.onnx",
+                repo_id=self.repo_ids[model_name],
+                model_fname=f"{model_name}.onnx",
             )
         self.model_path = model_path
         self.engine = cb.ONNXEngine(
@@ -43,7 +43,7 @@ def __init__(
         self.metadata["Mean"] = [127.5, 127.5, 127.5]
         self.metadata["Std"] = [128, 128, 128]
         self.metadata["ColorMode"] = "rgb"
-        self.metadata["Version"] = self.versions[model_version]
+        self.metadata["Version"] = self.versions[model_name]
         self.metadata.freeze()
         self.initialize()
 
diff --git a/pyface/utils.py b/pyface/utils.py
@@ -1,13 +1,40 @@
+import capybara as cb
+import onnxruntime as ort
+
 from .components.face_depth.tddfav2 import TDDFAV2
 from .components.face_detection.scrfd import SCRFD
 from .components.face_gender import GenderDetector
 from .components.face_landmark.coordinate_reg import CoordinateReg
 from .components.face_recognition.arcface import ArcFace
 
+__all__ = [
+    "download_models",
+    "get_ort_backend",
+]
+
 
 def download_models():
     TDDFAV2.download_models()
     SCRFD.download_models()
     GenderDetector.download_models()
     CoordinateReg.download_models()
     ArcFace.download_models()
+
+
+def cuda_avaliable():
+    providers = ort.get_available_providers()
+    return "CUDAExecutionProvider" in providers
+
+
+def coreml_avaliable():
+    providers = ort.get_available_providers()
+    return "CoreMLExecutionProvider" in providers
+
+
+def get_ort_backend():
+    if cuda_avaliable():
+        return cb.Backend.cuda
+    elif coreml_avaliable():
+        return cb.Backend.coreml
+    else:
+        return cb.Backend.cpu
diff --git a/tests/resources/EmmaWatson1.png b/tests/resources/EmmaWatson1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a06751436d341d1d4389b01db504d35ea477e7a10d80b38951b6d7d8194d650
+size 1257800
diff --git a/tests/resources/JohnnyDepp1.png b/tests/resources/JohnnyDepp1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd88f4714180e7ef110c2f06c043ac4e2cfd5bd1b4301d2820b114df9a8664b2
+size 1667229
diff --git a/tests/resources/face_bank/EmmaWatson.png b/tests/resources/face_bank/EmmaWatson.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1abd290e74139db3e22ac9dea2a942f27e626d076dd4375020d4849f5a98125b
+size 1943539
diff --git a/tests/resources/face_bank/JohnnyDepp.png b/tests/resources/face_bank/JohnnyDepp.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:898f56977f7a50f6e38e90b94cf67d37567b9b845dc36bf4141fe98ad0fbfe76
+size 1250454
diff --git a/tests/resources/xl_face.png b/tests/resources/xl_face.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25c2c283659ec9175a924ced630bfe0d99d45fde735fe91079709d8c653a493c
+size 450456
diff --git a/tests/resources/xs_faces.png b/tests/resources/xs_faces.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97a93bfd39e8b7d1e8ee4906931a08a0b5b1ac6c4089313123983f66ff3069b0
+size 4645655
diff --git a/tests/test_face_detection.py b/tests/test_face_detection.py
@@ -0,0 +1,81 @@
+import capybara as cb
+import cv2
+import numpy as np
+import pytest
+
+import pyface as pf
+
+RESOURCE_DIR = cb.get_curdir(__file__) / "resources"
+
+TEST_DATA = [
+    {
+        "img_fpath": RESOURCE_DIR / "EmmaWatson1.png",
+        "expected": {
+            "boxes": np.array([[412.52731323, 194.85551453, 751.04302979, 642.71121216]], dtype="float32"),
+            "lmk5pts": np.array(
+                [
+                    [
+                        [449.80097198, 366.0531826],
+                        [581.79126072, 367.359972],
+                        [465.10058594, 458.07265472],
+                        [460.2443161, 527.72718811],
+                        [570.59969902, 529.41928101],
+                    ]
+                ],
+                dtype="float32",
+            ),
+            "scores": np.array([[0.80300564]], dtype="float32"),
+        },
+    },
+    {
+        "img_fpath": RESOURCE_DIR / "JohnnyDepp1.png",
+        "expected": {
+            "boxes": np.array([[434.57501197, 188.672789, 691.22249818, 507.53144979]], dtype="float32"),
+            "lmk5pts": np.array(
+                [
+                    [
+                        [478.99239435, 284.38753269],
+                        [585.12645214, 287.86553004],
+                        [500.60212723, 351.98840269],
+                        [480.54181178, 422.01026003],
+                        [553.02625371, 426.00003743],
+                    ]
+                ],
+                dtype="float32",
+            ),
+            "scores": np.array([[0.7277902]], dtype="float32"),
+        },
+    },
+]
+
+
+@pytest.mark.parametrize("data", TEST_DATA)
+def test_build_face_detection(data):
+    model = pf.build_face_detection(
+        name="scrfd",
+        model_name="scrfd_10g_gnkps_fp32",
+        backend=pf.get_ort_backend(),
+    )
+    img = cv2.imread(data["img_fpath"])
+    faces_on_img = model(imgs=[img])[0]
+
+    assert faces_on_img["infos"]["num_proposals"]
+    np.testing.assert_allclose(faces_on_img["boxes"], data["expected"]["boxes"], rtol=1e-4)
+    np.testing.assert_allclose(faces_on_img["lmk5pts"], data["expected"]["lmk5pts"], rtol=1e-4)
+    np.testing.assert_allclose(faces_on_img["scores"], data["expected"]["scores"], rtol=1e-4)
+
+
+@pytest.mark.parametrize("data", TEST_DATA)
+def test_build_face_detection_cpu(data):
+    model = pf.build_face_detection(
+        name="scrfd",
+        model_name="scrfd_10g_gnkps_fp32",
+        backend="cpu",
+    )
+    img = cv2.imread(data["img_fpath"])
+    faces_on_img = model(imgs=[img])[0]
+
+    assert faces_on_img["infos"]["num_proposals"]
+    np.testing.assert_allclose(faces_on_img["boxes"], data["expected"]["boxes"], rtol=1e-4)
+    np.testing.assert_allclose(faces_on_img["lmk5pts"], data["expected"]["lmk5pts"], rtol=1e-4)
+    np.testing.assert_allclose(faces_on_img["scores"], data["expected"]["scores"], rtol=1e-4)
