Test rk356x

HyperInspire · Jan 13, 2025 · 902057b · 902057b
1 parent 23de522
commit 902057b
Show file tree

Hide file tree

Showing 7 changed files with 704 additions and 6 deletions.
diff --git a/.github/workflows/linux-armv7-rk356x-aarch64.yaml b/.github/workflows/linux-armv7-rk356x-aarch64.yaml
@@ -2,7 +2,7 @@ name: Build Linux-Ubuntu-AArch64-rk356x
 
 on:
   push:
-    branches: ["feature/rk356x"]
+    branches: ["dev/patch-5"]
 
 # Set the global GitHub token environment variable
 env:

diff --git a/command/build_cross_rk356x_aarch64.sh b/command/build_cross_rk356x_aarch64.sh
@@ -33,7 +33,6 @@ fi
 SCRIPT_DIR=$(pwd)  # Project dir
 
 
-echo "MNN_CUSTOM_SOURCE: ${MNN_CUSTOM_SOURCE}"
 cd ${SCRIPT_DIR}
 
 # export ARM_CROSS_COMPILE_TOOLCHAIN=/root/arm-rockchip830-linux-uclibcgnueabihf/
@@ -64,8 +63,8 @@ cmake -DCMAKE_SYSTEM_NAME=Linux \
   -DISF_ENABLE_RGA=ON \
   -DISF_ENABLE_COST_TIME=OFF \
   -DISF_BUILD_WITH_SAMPLE=OFF \
-  -DISF_BUILD_WITH_TEST=OFF \
-  -DISF_ENABLE_BENCHMARK=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 ${SCRIPT_DIR}

diff --git a/cpp/inspireface/pipeline_module/face_pipeline_module.cpp b/cpp/inspireface/pipeline_module/face_pipeline_module.cpp
@@ -228,7 +228,11 @@ int32_t FacePipelineModule::InitMaskPredict(InspireModel &model) {
 
 int32_t FacePipelineModule::InitRBGAntiSpoofing(InspireModel &model) {
     auto input_size = model.Config().get<std::vector<int>>("input_size");
+#ifdef INFERENCE_HELPER_ENABLE_RKNN2
+    m_rgb_anti_spoofing_ = std::make_shared<RBGAntiSpoofingAdapt>(input_size[0], true);
+#else
     m_rgb_anti_spoofing_ = std::make_shared<RBGAntiSpoofingAdapt>(input_size[0]);
+#endif
     auto ret = m_rgb_anti_spoofing_->loadData(model, model.modelType);
     if (ret != InferenceHelper::kRetOk) {
         return HERR_ARCHIVE_LOAD_FAILURE;
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: Build Linux-Ubuntu-AArch64-rk356x @@
     on:
       push:
-        branches: ["feature/rk356x"]
+        branches: ["dev/patch-5"]
     # Set the global GitHub token environment variable
     env:
@@ Expand Down @@