Fix bugs

Former-commit-id: 9248c07

Author: tunmx

README.md

@@ -8,7 +8,9 @@ If you require further information on tracking development branches, CI/CD proce
 
 Please contact [contact@insightface.ai](mailto:contact@insightface.ai?subject=InspireFace) for commercial support, including obtaining and integrating higher accuracy models, as well as custom development.
 
-## ChangeLogs
+## Change Logs
+
+**`2024-07-02`** Fixed several bugs in the face detector with multi-level input.
 
 **`2024-06-27`** Verified iOS usability and fixed some bugs.
 
@@ -69,6 +71,9 @@ The '3rdparty' directory already includes the MNN library and specifies a partic
         - Prepare the cross-compilation toolchain in advance, such as gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf
 - CUDA (version 10.1 or higher)
     - GPU-based inference requires installing NVIDIA's CUDA dependencies on the device.
+- Eigen3
+    - If you need to use the tracking-by-detection feature, you must have Eigen3 installed in advance.
+
 - RKNN
     - Adjust and select versions currently supported for specific requirements.
 
@@ -357,7 +362,7 @@ For different scenarios, we currently provide several Packs, each containing mul
 
 | Name | Supported Devices | Note | Link |
 | --- | --- | --- | --- |
-| Pikachu | CPU | Lightweight edge-side model | [GDrive](https://drive.google.com/file/d/1i4uC-dZTQxdVgn2rP0ZdfJTMkJIXgYY4/view?usp=drive_link) |
-| Megatron | CPU, GPU | Local or server-side model | [GDrive](https://drive.google.com/file/d/1i4uC-dZTQxdVgn2rP0ZdfJTMkJIXgYY4/view?usp=drive_link) |
-| Gundam-RV1109 | RKNPU | Supports RK1109 and RK1126 | [GDrive](https://drive.google.com/file/d/1i4uC-dZTQxdVgn2rP0ZdfJTMkJIXgYY4/view?usp=drive_link) |
+| Pikachu | CPU | Lightweight edge-side model | [GDrive](https://drive.google.com/drive/folders/1krmv9Pj0XEZXR1GRPHjW_Sl7t4l0dNSS?usp=sharing) |
+| Megatron | CPU, GPU | Local or server-side model | [GDrive](https://drive.google.com/drive/folders/1krmv9Pj0XEZXR1GRPHjW_Sl7t4l0dNSS?usp=sharing) |
+| Gundam-RV1109 | RKNPU | Supports RK1109 and RK1126 | [GDrive](https://drive.google.com/drive/folders/1krmv9Pj0XEZXR1GRPHjW_Sl7t4l0dNSS?usp=sharing) |
 

command/build_cross_rv1109rv1126_armhf.sh

@@ -48,14 +48,14 @@ cmake -DCMAKE_SYSTEM_NAME=Linux \
   -DISF_BUILD_LINUX_ARM7=ON \
   -DISF_ENABLE_RKNN=ON \
   -DISF_RK_DEVICE_TYPE=RV1109RV1126 \
-  -DISF_BUILD_WITH_SAMPLE=ON \
-  -DISF_BUILD_WITH_TEST=ON \
-  -DISF_ENABLE_BENCHMARK=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 -j1
 make install
 
-# move_install_files "$(pwd)"
+move_install_files "$(pwd)"

cpp/inspireface/c_api/inspireface.h

@@ -171,7 +171,7 @@ HYPER_CAPI_EXPORT extern HResult HFCreateInspireFaceSession(
  * @param detectMode Detection mode to be used.
  * @param maxDetectFaceNum Maximum number of faces to detect.
  * @param detectPixelLevel Modify the input resolution level of the detector, the larger the better, 
- *          the need to input a multiple of 160, such as 160, 320, 640, the default value -1 is 160.
+ *          the need to input a multiple of 160, such as 160, 320, 640, the default value -1 is 320.
  * @param trackByDetectModeFPS If you are using the MODE_TRACK_BY_DETECTION tracking mode, 
  *          this value is used to set the fps frame rate of your current incoming video stream, which defaults to -1 at 30fps.
  * @param handle Pointer to the context handle that will be returned.

cpp/inspireface/feature_hub/feature_hub.h

@@ -44,7 +44,7 @@ using DatabaseConfiguration = struct DatabaseConfiguration {
     int feature_block_num = 20;
     bool enable_use_db = false;                    ///< Whether to enable data persistence.
     std::string db_path;                           ///< Path to the database file.
-    float recognition_threshold = 0.46f;           ///< Face search threshold
+    float recognition_threshold = 0.48f;           ///< Face search threshold
     SearchMode search_mode = SEARCH_MODE_EAGER;    ///< Search mode
 };
 

cpp/test/settings/enviro.h

@@ -18,6 +18,7 @@ class Enviro {
     void operator=(Enviro const&) = delete;
 
     std::string getPackName() const { return packName; }
+    
     void setPackName(const std::string& name) { packName = name; }
 
     const std::string &getTestResDir() const { return testResDir; }

cpp/test/test.cpp

@@ -1,6 +1,7 @@
 //
 // Created by tunm on 2023/10/11.
 //
+#include <string>
 #define CATCH_CONFIG_RUNNER
 
 #include <iostream>
@@ -54,11 +55,13 @@ int main(int argc, char* argv[]) {
     // Pack file name and test directory
     std::string pack;
     std::string testDir;
+    std::string packPath;
 
     // Add command line options
     auto cli = session.cli()
                | Catch::clara::Opt(pack, "value")["--pack"]("Resource pack filename")
-               | Catch::clara::Opt(testDir, "value")["--test_dir"]("Test dir resource");
+               | Catch::clara::Opt(testDir, "value")["--test_dir"]("Test dir resource")
+               | Catch::clara::Opt(packPath, "value")["--pack_path"]("The specified path to the pack file");
 
     // Set combined CLI to the session
     session.cli(cli);
@@ -75,15 +78,22 @@ int main(int argc, char* argv[]) {
         TEST_PRINT("Using default test dir: {}", getTestDataDir());
     }
 
+    std::string fullPath;
     // Check whether custom parameters are set
     if (!pack.empty()) {
         SET_PACK_NAME(pack);
+        fullPath = GET_MODEL_FILE();
         TEST_PRINT("Updated global Pack to: {}", TEST_MODEL_FILE);
+    } else if (!packPath.empty()) {
+        fullPath = packPath;
+        TEST_PRINT("Updated global Pack File to: {}", packPath);
     } else {
+        fullPath = GET_MODEL_FILE();
         TEST_PRINT("Using default global Pack: {}", TEST_MODEL_FILE);
     }
 
-    auto ret = HFLaunchInspireFace(GET_MODEL_FILE().c_str());
+    std::cout << fullPath << std::endl;
+    auto ret = HFLaunchInspireFace(fullPath.c_str());
     if (ret != HSUCCEED) {
         spdlog::error("An error occurred while starting InspireFace: {}", ret);
         return ret;

cpp/test/unit/api/test_feature_manage.cpp

@@ -335,7 +335,7 @@ TEST_CASE("test_SearchTopK", "[feature_search_top_k]") {
         configuration.dbPath = dbPathStr;
         configuration.featureBlockNum = 20;
         configuration.searchMode = HF_SEARCH_MODE_EXHAUSTIVE;
-        configuration.searchThreshold = 0.48f;
+        configuration.searchThreshold = 0.46f;
         // Delete the previous data before testing
         if (std::remove(configuration.dbPath) != 0) {
             spdlog::trace("Error deleting file");

doc/Benchmark-Remark(Updating).md

@@ -5,8 +5,10 @@ The benchmark tests will be continuously updated.
 ### Device: Macbook pro 16-inch, 2019 2.6 GHz Intel Core i7
 | **Benchmark** | **Loops** | **Total Time** | **Average Time** |
 | --- | --- | --- | --- |
-| Face Detect | 1000 | 4371.79 ms | **4.3718 ms** |
-| Face Track | 1000 | 1957.73 ms | **1.9577 ms** |
+| Face Detect@160          | 1000      | 4170.91578 ms  | **4.1709 ms**    |
+| Face Detect@320          | 1000      | 8493.06583 ms  | **8.4893 ms**    |
+| Face Detect@640          | 1000      | 25808.39749 ms | **25.808 ms**    |
+| Face Light-Track | 1000 | 1957.73 ms | **1.9577 ms** |
 | Face alignment & Extract | 1000 | 6139.67 ms | **6.1397 ms** |
 | Face Comparison | 1000 | 0.24ms  | **0.0002ms** |
 | Search Face from 1k | 1000 | 72.39ms | **0.07ms** |
@@ -17,14 +19,14 @@ The benchmark tests will be continuously updated.
 ### Device: RV1126
 | **Benchmark** | **Loops** | **Total Time** | **Average Time** |
 | --- | --- | --- | --- |
-| Face Detect | 1000 | 22638.11865ms | **22.63812ms** |
-| Face Track | 1000 | 8858.03802ms | **8.85804ms** |
+| Face Detect@160          | 1000      | 17342.88616ms  | **17.34289ms**   |
+| Face Detect@320          | 1000      | 22638.11865ms  | **22.63812ms**   |
+| Face Detect@640          | 1000      | 39745.28562ms  | **39.74529ms**   |
+| Face Light-Track | 1000 | 8858.03802ms | **8.85804ms** |
 | Face alignment & Extract | 1000 | 42352.03367ms | **42.35203ms** |
 | Face Comparison | 1000 | 1.30754ms  | **0.00131ms** |
 | Search Face from 1k | 1000 | 3198.13874ms | **3.19814ms** |
 | Search Face from 5k | 1000 | 15745.00533ms | **15.74501ms** |
 | Search Face from 10k | 1000 | 31267.2301ms | **31.26723ms** |
 
-## 
-
 **Note**: The test results are all calculated by the test programs in the '**cpp/test**' subproject.