Update InspireFace to 1.0.1

2025-12-30 08:02:27 +00:00 · 2024-05-08 14:19:31 +08:00
parent 208d17eff8
commit ce564bdd9f
261 changed files with 898 additions and 324783 deletions
--- a/cpp-package/inspireface/command/build.sh
+++ b/cpp-package/inspireface/command/build.sh
@@ -1,15 +1,90 @@
-mkdir -p build/local
-# shellcheck disable=SC2164
-cd build/local
-# export cross_compile_toolchain=/home/s4129/software/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf
-cmake -DCMAKE_BUILD_TYPE=Release \
-  -DTHIRD_PARTY_DIR=3rdparty \
-  -DBUILD_WITH_SAMPLE=ON \
-  -DBUILD_WITH_TEST=OFF \
-  -DENABLE_BENCHMARK=OFF \
-  -DENABLE_USE_LFW_DATA=OFF \
-  -DENABLE_TEST_EVALUATION=OFF \
-  -DBUILD_SHARED_LIBS=ON ../../
+#!/bin/bash

+# Reusable function to handle 'install' directory operations
+move_install_files() {
+    local root_dir="$1"
+    local install_dir="$root_dir/install"
+
+    # Step 1: Check if the 'install' directory exists
+    if [ ! -d "$install_dir" ]; then
+        echo "Error: 'install' directory does not exist in $root_dir"
+        exit 1
+    fi
+
+    # Step 2: Delete all other files/folders except 'install'
+    find "$root_dir" -mindepth 1 -maxdepth 1 -not -name "install" -exec rm -rf {} +
+
+    # Step 3: Move all files from 'install' to the root directory
+    mv "$install_dir"/* "$root_dir" 2>/dev/null
+
+    # Step 4: Remove the empty 'install' directory
+    rmdir "$install_dir"
+
+    echo "Files from 'install' moved to $root_dir, and 'install' directory deleted."
+}
+
+if [ -n "$VERSION" ]; then
+    TAG="-$VERSION"
+else
+    TAG=""
+fi
+
+# Detect the operating system
+OS_NAME=$(uname)
+BUILD_DIR="build"
+SCRIPT_DIR=$(pwd)  # Project dir
+
+
+
+# Determine the appropriate build directory based on the OS
+case "$OS_NAME" in
+    Darwin)
+        # macOS system
+        BUILD_DIR="${BUILD_DIR}/inspireface-macos${TAG}"
+        ;;
+    Linux)
+        # Linux system, further identify the distribution if necessary
+        if [ -f /etc/os-release ]; then
+            . /etc/os-release
+            case "$ID" in
+                ubuntu)
+                    BUILD_DIR="${BUILD_DIR}/inspireface-linux-ubuntu${TAG}"
+                    ;;
+                centos)
+                    BUILD_DIR="${BUILD_DIR}/inspireface-linux-centos${TAG}"
+                    ;;
+                *)
+                    # If an unknown Linux distribution, default to generic 'linux'
+                    BUILD_DIR="${BUILD_DIR}/inspireface-linux${TAG}"
+                    ;;
+            esac
+        else
+            # If unable to detect Linux distribution, default to 'linux'
+            BUILD_DIR="${BUILD_DIR}/inspireface-linux${TAG}"
+        fi
+        ;;
+    *)
+        # If OS is not recognized, default to 'generic'
+        BUILD_DIR="${BUILD_DIR}/inspireface-generic${TAG}"
+        ;;
+esac
+
+# Create the build directory and navigate into it
+mkdir -p "$BUILD_DIR"
+cd "$BUILD_DIR" || exit 1
+
+# Run CMake configuration (adjust the options as needed)
+cmake -DCMAKE_BUILD_TYPE=Release \
+  -DISF_BUILD_WITH_SAMPLE=ON \
+  -DISF_BUILD_WITH_TEST=OFF \
+  -DISF_ENABLE_BENCHMARK=OFF \
+  -DISF_ENABLE_USE_LFW_DATA=OFF \
+  -DISF_ENABLE_TEST_EVALUATION=OFF \
+  -DISF_BUILD_SHARED_LIBS=ON "$SCRIPT_DIR"
+
+# Compile and install
 make -j4
-make install
+make install
+
+# Move 'install' files to the build root directory using an absolute path
+move_install_files "$(pwd)"
--- a/cpp-package/inspireface/command/build_cross_aarch64.sh
+++ b/cpp-package/inspireface/command/build_cross_aarch64.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Reusable function to handle 'install' directory operations
+move_install_files() {
+    local root_dir="$1"
+    local install_dir="$root_dir/install"
+
+    # Step 1: Check if the 'install' directory exists
+    if [ ! -d "$install_dir" ]; then
+        echo "Error: 'install' directory does not exist in $root_dir"
+        exit 1
+    fi
+
+    # Step 2: Delete all other files/folders except 'install'
+    find "$root_dir" -mindepth 1 -maxdepth 1 -not -name "install" -exec rm -rf {} +
+
+    # Step 3: Move all files from 'install' to the root directory
+    mv "$install_dir"/* "$root_dir" 2>/dev/null
+
+    # Step 4: Remove the empty 'install' directory
+    rmdir "$install_dir"
+
+    echo "Files from 'install' moved to $root_dir, and 'install' directory deleted."
+}
+
+if [ -n "$VERSION" ]; then
+    TAG="-$VERSION"
+else
+    TAG=""
+fi
+
+SCRIPT_DIR=$(pwd)  # Project dir
+BUILD_FOLDER_PATH="build/inspireface-linux-aarch64${TAG}"
+
+mkdir -p ${BUILD_FOLDER_PATH}
+# shellcheck disable=SC2164
+cd ${BUILD_FOLDER_PATH}
+# export cross_compile_toolchain=/home/jingyuyan/software/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu
+cmake -DCMAKE_SYSTEM_NAME=Linux \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_SYSTEM_VERSION=1 \
+  -DCMAKE_SYSTEM_PROCESSOR=aarch64 \
+  -DCMAKE_C_COMPILER=$ARM_CROSS_COMPILE_TOOLCHAIN/bin/aarch64-linux-gnu-gcc \
+  -DCMAKE_CXX_COMPILER=$ARM_CROSS_COMPILE_TOOLCHAIN/bin/aarch64-linux-gnu-g++ \
+  -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -flax-vector-conversions" \
+  -DTARGET_PLATFORM=armlinux \
+  -DISF_BUILD_LINUX_AARCH64=ON \
+  -DISF_BUILD_LINUX_ARM7=OFF \
+  -DISF_BUILD_WITH_SAMPLE=OFF \
+  -DISF_BUILD_WITH_TEST=OFF \
+  -DISF_ENABLE_BENCHMARK=OFF \
+  -DISF_ENABLE_USE_LFW_DATA=OFF \
+  -DISF_ENABLE_TEST_EVALUATION=OFF \
+  -DISF_BUILD_SHARED_LIBS=ON ${SCRIPT_DIR}
+
+make -j4
+make install
+
+move_install_files "$(pwd)"
--- a/cpp-package/inspireface/command/build_cross_armv7_armhf.sh
+++ b/cpp-package/inspireface/command/build_cross_armv7_armhf.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# Reusable function to handle 'install' directory operations
+move_install_files() {
+    local root_dir="$1"
+    local install_dir="$root_dir/install"
+
+    # Step 1: Check if the 'install' directory exists
+    if [ ! -d "$install_dir" ]; then
+        echo "Error: 'install' directory does not exist in $root_dir"
+        exit 1
+    fi
+
+    # Step 2: Delete all other files/folders except 'install'
+    find "$root_dir" -mindepth 1 -maxdepth 1 -not -name "install" -exec rm -rf {} +
+
+    # Step 3: Move all files from 'install' to the root directory
+    mv "$install_dir"/* "$root_dir" 2>/dev/null
+
+    # Step 4: Remove the empty 'install' directory
+    rmdir "$install_dir"
+
+    echo "Files from 'install' moved to $root_dir, and 'install' directory deleted."
+}
+
+if [ -n "$VERSION" ]; then
+    TAG="-$VERSION"
+else
+    TAG=""
+fi
+
+SCRIPT_DIR=$(pwd)  # Project dir
+BUILD_FOLDER_PATH="build/inspireface-linux-armv7-armhf${TAG}"
+
+mkdir -p ${BUILD_FOLDER_PATH}
+# shellcheck disable=SC2164
+cd ${BUILD_FOLDER_PATH}
+# export cross_compile_toolchain=/home/jingyuyan/software/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf
+cmake -DCMAKE_SYSTEM_NAME=Linux \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_SYSTEM_VERSION=1 \
+  -DCMAKE_SYSTEM_PROCESSOR=armv7 \
+  -DCMAKE_C_COMPILER=$ARM_CROSS_COMPILE_TOOLCHAIN/bin/arm-linux-gnueabihf-gcc \
+  -DCMAKE_CXX_COMPILER=$ARM_CROSS_COMPILE_TOOLCHAIN/bin/arm-linux-gnueabihf-g++ \
+  -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -flax-vector-conversions" \
+  -DTARGET_PLATFORM=armlinux \
+  -DISF_BUILD_LINUX_ARM7=ON \
+  -DISF_BUILD_WITH_SAMPLE=OFF \
+  -DISF_BUILD_WITH_TEST=OFF \
+  -DISF_ENABLE_BENCHMARK=OFF \
+  -DISF_ENABLE_USE_LFW_DATA=OFF \
+  -DISF_ENABLE_TEST_EVALUATION=OFF \
+  -DISF_BUILD_SHARED_LIBS=ON ${SCRIPT_DIR}
+
+make -j4
+make install
+
+move_install_files "$(pwd)"
--- a/cpp-package/inspireface/command/build_cross_rv1109rv1126_armhf.sh
+++ b/cpp-package/inspireface/command/build_cross_rv1109rv1126_armhf.sh
@@ -1,25 +1,61 @@
-mkdir -p build/rv1109rv1126_armhf
+#!/bin/bash
+
+# Reusable function to handle 'install' directory operations
+move_install_files() {
+    local root_dir="$1"
+    local install_dir="$root_dir/install"
+
+    # Step 1: Check if the 'install' directory exists
+    if [ ! -d "$install_dir" ]; then
+        echo "Error: 'install' directory does not exist in $root_dir"
+        exit 1
+    fi
+
+    # Step 2: Delete all other files/folders except 'install'
+    find "$root_dir" -mindepth 1 -maxdepth 1 -not -name "install" -exec rm -rf {} +
+
+    # Step 3: Move all files from 'install' to the root directory
+    mv "$install_dir"/* "$root_dir" 2>/dev/null
+
+    # Step 4: Remove the empty 'install' directory
+    rmdir "$install_dir"
+
+    echo "Files from 'install' moved to $root_dir, and 'install' directory deleted."
+}
+
+if [ -n "$VERSION" ]; then
+    TAG="-$VERSION"
+else
+    TAG=""
+fi
+
+SCRIPT_DIR=$(pwd)  # Project dir
+BUILD_FOLDER_PATH="build/inspireface-linux-armv7-rv1109rv1126-armhf${TAG}"
+
+mkdir -p ${BUILD_FOLDER_PATH}
 # shellcheck disable=SC2164
-cd build/rv1109rv1126_armhf
-# export cross_compile_toolchain=/home/s4129/software/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf
+cd ${BUILD_FOLDER_PATH}
+
+# export cross_compile_toolchain=/home/jingyuyan/software/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf
 cmake -DCMAKE_SYSTEM_NAME=Linux \
  -DCMAKE_BUILD_TYPE=Release \
-  -DTHIRD_PARTY_DIR=3rdparty \
  -DCMAKE_SYSTEM_VERSION=1 \
  -DCMAKE_SYSTEM_PROCESSOR=armv7 \
  -DCMAKE_C_COMPILER=$ARM_CROSS_COMPILE_TOOLCHAIN/bin/arm-linux-gnueabihf-gcc \
  -DCMAKE_CXX_COMPILER=$ARM_CROSS_COMPILE_TOOLCHAIN/bin/arm-linux-gnueabihf-g++ \
+  -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -flax-vector-conversions" \
  -DTARGET_PLATFORM=armlinux \
-  -DBUILD_LINUX_ARM7=ON \
-  -DENABLE_RKNN=ON \
-  -DRK_DEVICE_TYPE=RV1109RV1126 \
-  -DBUILD_WITH_SAMPLE=OFF \
-  -DBUILD_WITH_TEST=OFF \
-  -DENABLE_BENCHMARK=OFF \
-  -DENABLE_USE_LFW_DATA=OFF \
-  -DENABLE_TEST_EVALUATION=OFF \
-  -DBUILD_SHARED_LIBS=ON ../..
+  -DISF_BUILD_LINUX_ARM7=ON \
+  -DISF_ENABLE_RKNN=ON \
+  -DISF_RK_DEVICE_TYPE=RV1109RV1126 \
+  -DISF_BUILD_WITH_SAMPLE=OFF \
+  -DISF_BUILD_WITH_TEST=OFF \
+  -DISF_ENABLE_BENCHMARK=OFF \
+  -DISF_ENABLE_USE_LFW_DATA=OFF \
+  -DISF_ENABLE_TEST_EVALUATION=OFF \
+  -DISF_BUILD_SHARED_LIBS=ON ${SCRIPT_DIR}

 make -j4
 make install

+move_install_files "$(pwd)"
--- a/cpp-package/inspireface/command/build_linux_cuda.sh
+++ b/cpp-package/inspireface/command/build_linux_cuda.sh
@@ -1,17 +1,52 @@
-mkdir -p build/linux_cuda
+#!/bin/bash
+
+# Reusable function to handle 'install' directory operations
+move_install_files() {
+    local root_dir="$1"
+    local install_dir="$root_dir/install"
+
+    # Step 1: Check if the 'install' directory exists
+    if [ ! -d "$install_dir" ]; then
+        echo "Error: 'install' directory does not exist in $root_dir"
+        exit 1
+    fi
+
+    # Step 2: Delete all other files/folders except 'install'
+    find "$root_dir" -mindepth 1 -maxdepth 1 -not -name "install" -exec rm -rf {} +
+
+    # Step 3: Move all files from 'install' to the root directory
+    mv "$install_dir"/* "$root_dir" 2>/dev/null
+
+    # Step 4: Remove the empty 'install' directory
+    rmdir "$install_dir"
+
+    echo "Files from 'install' moved to $root_dir, and 'install' directory deleted."
+}
+
+if [ -n "$VERSION" ]; then
+    TAG="-$VERSION"
+else
+    TAG=""
+fi
+
+BUILD_FOLDER_PATH="build/inspireface-linux-cuda${TAG}"
+SCRIPT_DIR=$(pwd)  # Project dir
+
+mkdir -p ${BUILD_FOLDER_PATH}
 # shellcheck disable=SC2164
-cd build/linux_cuda
-# export cross_compile_toolchain=/home/s4129/software/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf
+cd ${BUILD_FOLDER_PATH}
+
 cmake -DCMAKE_SYSTEM_NAME=Linux \
  -DCMAKE_BUILD_TYPE=Release \
-  -DTHIRD_PARTY_DIR=3rdparty \
-  -DBUILD_WITH_SAMPLE=OFF \
-  -DBUILD_WITH_TEST=OFF \
-  -DENABLE_BENCHMARK=OFF \
-  -DENABLE_USE_LFW_DATA=OFF \
-  -DENABLE_TEST_EVALUATION=OFF \
-  -DGLOBAL_INFERENCE_BACKEND_USE_MNN_CUDA=ON \
-  -DLINUX_MNN_CUDA=/home/tunm/software/MNN-2.7.0/build_cuda/install \
-  -DBUILD_SHARED_LIBS=ON ../..
+  -DISF_BUILD_WITH_SAMPLE=OFF \
+  -DISF_BUILD_WITH_TEST=OFF \
+  -DISF_ENABLE_BENCHMARK=OFF \
+  -DISF_ENABLE_USE_LFW_DATA=OFF \
+  -DISF_ENABLE_TEST_EVALUATION=OFF \
+  -DISF_GLOBAL_INFERENCE_BACKEND_USE_MNN_CUDA=ON \
+  -DISF_LINUX_MNN_CUDA=/home/tunm/software/MNN-2.7.0/build_cuda/install \
+  -DISF_BUILD_SHARED_LIBS=ON ${SCRIPT_DIR}

 make -j4
+
+move_install_files "$(pwd)"
--- a/cpp-package/inspireface/command/build_linux_ubuntu18.sh
+++ b/cpp-package/inspireface/command/build_linux_ubuntu18.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# Reusable function to handle 'install' directory operations
+move_install_files() {
+    local root_dir="$1"
+    local install_dir="$root_dir/install"
+
+    # Step 1: Check if the 'install' directory exists
+    if [ ! -d "$install_dir" ]; then
+        echo "Error: 'install' directory does not exist in $root_dir"
+        exit 1
+    fi
+
+    # Step 2: Delete all other files/folders except 'install'
+    find "$root_dir" -mindepth 1 -maxdepth 1 -not -name "install" -exec rm -rf {} +
+
+    # Step 3: Move all files from 'install' to the root directory
+    mv "$install_dir"/* "$root_dir" 2>/dev/null
+
+    # Step 4: Remove the empty 'install' directory
+    rmdir "$install_dir"
+
+    echo "Files from 'install' moved to $root_dir, and 'install' directory deleted."
+}
+
+if [ -n "$VERSION" ]; then
+    TAG="-$VERSION"
+else
+    TAG=""
+fi
+
+BUILD_FOLDER_PATH="build/inspireface-linux-x86-ubuntu18${TAG}/"
+SCRIPT_DIR=$(pwd)  # Project dir
+
+mkdir -p ${BUILD_FOLDER_PATH}
+# shellcheck disable=SC2164
+cd ${BUILD_FOLDER_PATH}
+
+cmake -DCMAKE_BUILD_TYPE=Release \
+  -DISF_BUILD_WITH_SAMPLE=ON \
+  -DISF_BUILD_WITH_TEST=OFF \
+  -DISF_ENABLE_BENCHMARK=OFF \
+  -DISF_ENABLE_USE_LFW_DATA=OFF \
+  -DISF_ENABLE_TEST_EVALUATION=OFF \
+  -DOpenCV_DIR=3rdparty/inspireface-precompile/opencv/4.5.1/opencv-ubuntu18-x86/lib/cmake/opencv4 \
+  -DISF_BUILD_SHARED_LIBS=ON ${SCRIPT_DIR}
+
+make -j4
+make install
+
+move_install_files "$(pwd)"