Update InspireFace to 1.1.0

Author: tunmx

cpp-package/inspireface/.gitignore

@@ -7,4 +7,9 @@ test_res/*
 resource/*
 pack/*
 *.zip
-3rdparty
+3rdparty/
+.macos_cache/
+*.framework
+.cache/*
+.vscode/*
+build_local/*

cpp-package/inspireface/CMakeLists.txt

@@ -1,13 +1,23 @@
-#cmake_minimum_required(VERSION 3.19)
 cmake_minimum_required(VERSION 3.10)
 project(InspireFace)
 
 set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++14")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
 
+# Current version
+set(INSPIRE_FACE_VERSION_MAJOR 1)
+set(INSPIRE_FACE_VERSION_MINOR 1)
+set(INSPIRE_FACE_VERSION_PATCH 0)
+
+# Converts the version number to a string
+string(CONCAT INSPIRE_FACE_VERSION_MAJOR_STR ${INSPIRE_FACE_VERSION_MAJOR})
+string(CONCAT INSPIRE_FACE_VERSION_MINOR_STR ${INSPIRE_FACE_VERSION_MINOR})
+string(CONCAT INSPIRE_FACE_VERSION_PATCH_STR ${INSPIRE_FACE_VERSION_PATCH})
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cpp/inspireface/information.h.in ${CMAKE_CURRENT_SOURCE_DIR}/cpp/inspireface/information.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cpp/inspireface/version.txt.in ${CMAKE_CURRENT_SOURCE_DIR}/cpp/inspireface/version.txt)
+
 # Set the ISF_THIRD_PARTY_DIR variable to allow it to be set externally from the command line, or use the default path if it is not set
 set(ISF_THIRD_PARTY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty" CACHE PATH "Path to the third-party libraries directory")
 
@@ -78,8 +88,24 @@ set(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cpp/)
 
 # OpenCV dependency configuration
 if (APPLE)
-    set(PLAT darwin)
-    find_package(OpenCV REQUIRED)
+    if (IOS)
+        message(IOS_3RDPARTY=${IOS_3RDPARTY})
+        set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH NO)
+        set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE NO)
+
+        link_directories(${IOS_3RDPARTY})
+        include_directories(${IOS_3RDPARTY}/opencv2.framework)
+
+        set(MNN_FRAMEWORK_PATH "${IOS_3RDPARTY}/MNN.framework")
+        include_directories("${MNN_FRAMEWORK_PATH}/")
+
+        set(OpenCV_DIR "${IOS_3RDPARTY}/opencv2.framework")
+#        find_package(OpenCV REQUIRED)
+    else()
+        message("Use apple device")
+        set(PLAT darwin)
+        find_package(OpenCV REQUIRED)
+    endif ()
 else()
     if (ISF_BUILD_LINUX_ARM7 OR ISF_BUILD_LINUX_AARCH64)
         add_definitions("-DDISABLE_GUI")
@@ -115,35 +141,43 @@ else()
     find_package(OpenCV REQUIRED)
 endif ()
 
+set(ISF_LINUX_MNN_CUDA "" CACHE STRING "Path to CUDA directory")
 
-# MNN Config
-if (NOT ANDROID)
-
-    if (ISF_GLOBAL_INFERENCE_BACKEND_USE_MNN_CUDA)
-        # Use MNN Cuda
-        message("Global MNN CUDA device inference")
-        add_definitions("-DISF_GLOBAL_INFERENCE_BACKEND_USE_MNN_CUDA")
-        set(MNN_INCLUDE_DIRS ${ISF_LINUX_MNN_CUDA}/include)
-        link_directories(${ISF_LINUX_MNN_CUDA}/lib)
-        set(MNN_LIBS MNN)
-
-    elseif(DEFINED MNN_STATIC_PATH)
-        message("Using static MNN from specified path: ${MNN_STATIC_PATH}")
-        set(MNN_INCLUDE_DIRS "${MNN_STATIC_PATH}/include")
-        set(MNN_LIBS "${MNN_STATIC_PATH}/lib/libMNN.a")
-    else ()
-        # Default or fallback case for MNN setup
-        message("Default or fallback case for MNN setup")
+if (ISF_GLOBAL_INFERENCE_BACKEND_USE_MNN_CUDA)
+    message("Global MNN CUDA device inference")
+    add_definitions("-DISF_GLOBAL_INFERENCE_BACKEND_USE_MNN_CUDA")
+    # Use MNN Cuda
+    if (NOT DEFINED ISF_LINUX_MNN_CUDA)
         # MNN Options
-        set(MNN_BUILD_SHARED_LIBS OFF CACHE BOOL "Build MNN as a shared library")
-
+        set(MNN_CUDA ON)
         add_subdirectory(${ISF_THIRD_PARTY_DIR}/MNN EXCLUDE_FROM_ALL)
         set(MNN_INCLUDE_DIRS "${ISF_THIRD_PARTY_DIR}/MNN/include")
         set(MNN_LIBS MNN)
+    else()
+        message(ISF_LINUX_MNN_CUDA=${ISF_LINUX_MNN_CUDA})
+        set(MNN_INCLUDE_DIRS ${ISF_LINUX_MNN_CUDA}/include)
+        link_directories(${ISF_LINUX_MNN_CUDA}/)
+        set(MNN_LIBS MNN)
+    endif()
 
-    endif ()
+elseif(DEFINED MNN_STATIC_PATH)
+    message("Using static MNN from specified path: ${MNN_STATIC_PATH}")
+    set(MNN_INCLUDE_DIRS "${MNN_STATIC_PATH}/include")
+    set(MNN_LIBS "${MNN_STATIC_PATH}/lib/libMNN.a")
+elseif(IOS)
+    message(Build iOS)
+else ()
+    # Default or fallback case for MNN setup
+    message("Default or fallback case for MNN setup")
+    # MNN Options
+    set(MNN_BUILD_SHARED_LIBS OFF CACHE BOOL "Build MNN as a shared library")
+
+    add_subdirectory(${ISF_THIRD_PARTY_DIR}/MNN EXCLUDE_FROM_ALL)
+    set(MNN_INCLUDE_DIRS "${ISF_THIRD_PARTY_DIR}/MNN/include")
+    set(MNN_LIBS MNN)
+
+endif ()
 
-endif()
 
 # Set install path
 set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install")

cpp-package/inspireface/README.md

@@ -8,6 +8,12 @@ If you require further information on tracking development branches, CI/CD proce
 
 Please contact [[email protected]](mailto:[email protected]?subject=InspireFace) for commercial support, including obtaining and integrating higher accuracy models, as well as custom development.
 
+##  Top News
+
+**`2024-06-18`** Added face detection feature with tracking-by-detection mode.
+
+**`2024-06-01`** Adapted for accelerated inference on CUDA-enabled devices.
+
 ## 1. Preparation
 ### 1.1. Clone 3rdparty
 
@@ -105,12 +111,12 @@ We have completed the adaptation and testing of the software across various oper
 | 2       |                      | ARMv8                 | -                          | [![build](https://img.shields.io/github/actions/workflow/status/HyperInspire/InspireFace/release-sdks.yaml?&style=for-the-badge&label=build)](https://github.com/HyperInspire/InspireFace/actions/workflows/release-sdks.yaml) | ![test](https://img.shields.io/badge/OFFLINE-PASSING-blue?style=for-the-badge) |
 | 3       |                      | x86/x86_64            | -                          | [![build](https://img.shields.io/github/actions/workflow/status/HyperInspire/InspireFace/release-sdks.yaml?&style=for-the-badge&label=build)](https://github.com/HyperInspire/InspireFace/actions/workflows/release-sdks.yaml) | [![test](https://img.shields.io/github/actions/workflow/status/HyperInspire/InspireFace/test_ubuntu_x86_Pikachu.yaml?style=for-the-badge&label=Test&color=blue)](https://github.com/HyperInspire/InspireFace/actions/workflows/test_ubuntu_x86_Pikachu.yaml) |
 | 4       |                      | ARMv7                 | RV1109RV1126               | [![build](https://img.shields.io/github/actions/workflow/status/HyperInspire/InspireFace/release-sdks.yaml?&style=for-the-badge&label=build)](https://github.com/HyperInspire/InspireFace/actions/workflows/release-sdks.yaml) | ![test](https://img.shields.io/badge/OFFLINE-PASSING-blue?style=for-the-badge) |
-| 5       |                      | x86/x86_64            | CUDA                       | ![build](https://img.shields.io/badge/OFFLINE-PASSING-green?style=for-the-badge) |  |
+| 5       |                      | x86/x86_64            | CUDA                       | ![build](https://img.shields.io/badge/OFFLINE-PASSING-green?style=for-the-badge) | ![test](https://img.shields.io/badge/OFFLINE-PASSING-blue?style=for-the-badge) |
 | 6       | **macOS**            | Intel x86             | -                          | ![build](https://img.shields.io/badge/OFFLINE-PASSING-green?style=for-the-badge) | ![test](https://img.shields.io/badge/OFFLINE-PASSING-blue?style=for-the-badge) |
 | 7       |                      | Apple Silicon         | -                          | ![build](https://img.shields.io/badge/OFFLINE-PASSING-green?style=for-the-badge) | ![test](https://img.shields.io/badge/OFFLINE-PASSING-blue?style=for-the-badge) |
-| 8       | **iOS**              | ARM                   | -                          |  |  |
-| 9       | **Android**          | ARMv7                 | -                          |  |  |
-| 10      |                      | ARMv8                 | -                          |  |  |
+| 8       | **iOS**              | ARM                   | -                          | [![build](https://img.shields.io/github/actions/workflow/status/HyperInspire/InspireFace/release-sdks.yaml?&style=for-the-badge&label=build)](https://github.com/HyperInspire/InspireFace/actions/workflows/release-sdks.yaml) |  |
+| 9       | **Android**          | ARMv7                 | -                          | [![build](https://img.shields.io/github/actions/workflow/status/HyperInspire/InspireFace/release-sdks.yaml?&style=for-the-badge&label=build)](https://github.com/HyperInspire/InspireFace/actions/workflows/release-sdks.yaml) |  |
+| 10      |                      | ARMv8                 | -                          | [![build](https://img.shields.io/github/actions/workflow/status/HyperInspire/InspireFace/release-sdks.yaml?&style=for-the-badge&label=build)](https://github.com/HyperInspire/InspireFace/actions/workflows/release-sdks.yaml) |  |
 
 - Complete compilation scripts and successful compilation.
 - Pass unit tests on physical devices.
@@ -129,6 +135,9 @@ build-cross-armv7-armhf
 # Build armv7 with support RV1109RV1126 device NPU cross-complie
 docker-compose up build-cross-rv1109rv1126-armhf
 
+# Build Android with support arm64-v8a and armeabi-v7a
+docker-compose up build-cross-android
+
 # Build all
 docker-compose up
 ```
@@ -154,7 +163,7 @@ HFDetectMode detMode = HF_DETECT_MODE_IMAGE;
 HInt32 maxDetectNum = 5;
 // Handle of the current face SDK algorithm context
 HFSession session = {0};
-ret = HFCreateInspireFaceSessionOptional(option, detMode, maxDetectNum, &session);
+ret = HFCreateInspireFaceSessionOptional(option, detMode, maxDetectNum, -1, -1, &session);
 if (ret != HSUCCEED) {
     std::cout << "Create FaceContext error: " << ret << std::endl;
     return ret;
@@ -296,6 +305,22 @@ During the process of building the test program using CMake, it will involve sel
 
 **Note**: If you want to view the benchmark test report, you can click on the [link](doc/Benchmark-Remark(Updating).md).
 
+### Quick Test
+
+If you need to perform a quick test, you can use the script we provide. This script will automatically download the test file `test_res` and build the test program to run the test. 
+
+*Note: If you need to enable more comprehensive tests, you can adjust the options in the script as needed.*
+
+```bash
+# If you are using Ubuntu, you can execute this.
+bash ci/quick_test_linux_x86_usual.sh
+
+# If you are using another system (including Ubuntu), you can execute this.
+bash ci/quick_test_local.sh
+```
+
+Every time code is committed, tests are run on GitHub Actions.
+
 ## 5. Function Support
 The following functionalities and technologies are currently supported.
 

cpp-package/inspireface/ci/ci_linux_x86_usual.sh renamed to cpp-package/inspireface/ci/quick_test_linux_x86_usual.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+
+# Exit immediately if any command exits with a non-zero status
+set -e
+
+TARGET_DIR="test_res"
+DOWNLOAD_URL="https://github.com/tunmx/inspireface-store/raw/main/resource/test_res-lite.zip"
+ZIP_FILE="test_res-lite.zip"
+BUILD_DIRNAME="quick_test_build"
+TEST_DIR="./build/${BUILD_DIRNAME}/test"
+TEST_EXECUTABLE="./test/Test"
+
+# Check if the target directory already exists
+if [ ! -d "$TARGET_DIR" ]; then
+    echo "Directory '$TARGET_DIR' does not exist. Downloading..."
+
+    # Download the dataset zip file
+    wget -q "$DOWNLOAD_URL" -O "$ZIP_FILE"
+
+    echo "Extracting '$ZIP_FILE' to '$TARGET_DIR'..."
+    # Unzip the downloaded file
+    unzip "$ZIP_FILE"
+
+    # Remove the downloaded zip file and unnecessary folders
+    rm "$ZIP_FILE"
+    rm -rf "__MACOSX"
+
+    echo "Download and extraction complete."
+else
+    echo "Directory '$TARGET_DIR' already exists. Skipping download."
+fi
+
+# Get the absolute path of the target directory
+FULL_TEST_DIR="$(realpath ${TARGET_DIR})"
+
+# Create the build directory if it doesn't exist
+mkdir -p build/${BUILD_DIRNAME}/
+
+# Change directory to the build directory
+# Disable the shellcheck warning for potential directory changes
+# shellcheck disable=SC2164
+cd build/${BUILD_DIRNAME}/
+
+# Configure the CMake build system
+cmake -DCMAKE_BUILD_TYPE=Release \
+  -DISF_BUILD_WITH_SAMPLE=OFF \
+  -DISF_BUILD_WITH_TEST=ON \
+  -DISF_ENABLE_BENCHMARK=ON \
+  -DISF_ENABLE_USE_LFW_DATA=OFF \
+  -DISF_ENABLE_TEST_EVALUATION=OFF \
+  -DISF_BUILD_SHARED_LIBS=OFF ../../
+
+# Compile the project using 4 parallel jobs
+make -j4
+
+# Create a symbolic link to the extracted test data directory
+ln -s ${FULL_TEST_DIR} .
+
+# Check if the test executable file exists
+if [ ! -f "$TEST_EXECUTABLE" ]; then
+    # If not, print an error message and exit with a non-zero status code
+    echo "Error: Test executable '$TEST_EXECUTABLE' not found. Please ensure it is built correctly."
+    exit 1
+else
+    # If it exists, print a message and run the test executable
+    echo "Test executable found. Running tests..."
+    "$TEST_EXECUTABLE"
+fi