fix ci

Author: ysh329

core/engine.py

@@ -671,7 +671,9 @@ def test_ncnn_engine(self):
         ncnn.set_config(
             "benchmark_platform", ["android-armv8", "android-armv7"]  # noqa
         )
-        ncnn.set_config("support_backend", ["-1", "0"])  # -1: cpu, 0: gpu
+        ncnn.set_config(
+            "support_backend", ["0"]
+        )  # ["-1", "0"])  # -1: cpu, 0: gpu # noqa
         ncnn.set_config("cpu_thread_num", [1, 2, 4])
         ncnn.config["repeats"] = 10
         ncnn.config["warmup"] = 2

core/global_config.py

@@ -18,8 +18,10 @@ def create_config(framework_name):
         # note(ysh329):
         # https://github.com/Tencent/TNN/blob/master/doc/cn/user/test.md
         config["work_dir"] = "./{}".format(framework_name)
-        config["model_repo"] = "https://gitee.com/yuens/{}-models.git".format(
-            framework_name
+        config[
+            "model_repo"
+        ] = "https://github.com/ai-performance/{}-models.git".format(  # noqa
+            framework_name  # noqa
         )
         config["model_type_keyword"] = framework_name
         # complete model version during `prepare_models`

ncnn/build_ncnn_android.sh

@@ -1,9 +1,11 @@
-#!/bin/bash
+ #!/usr/bin/env bash
 set -x
 
-readonly ANDROID_NDK_HOME=/opt/android-ndk-r17c
+PWD=$(pwd)
 
-function prepare_env {
+export ANDROID_NDK=/opt/android-ndk-r17c
+
+echo "=========================== prepare_env ==============================="
     # attr, wget, unzip
     apt update
     apt install -y --no-install-recommends attr wget unzip
@@ -36,71 +38,57 @@ function prepare_env {
     # setup env
     export VULKAN_SDK=`pwd`/1.1.114.0/x86_64
 
-    cd -
-}
+    cd $PWD
 
 # download code repo from github
-function download_repo {
+echo "========================= download_repo ============================"
+    cd $PWD
+
     # download repo
     if [ ! -d "./ncnn" ]; then
         git clone https://github.com/tencent/ncnn.git ncnn
     else
         echo "local ncnn repo exited"
     fi
-}
+
 
 # compile tnn
-function build {
+echo "========================= build ====================================="
     # replace
     cp benchncnn.cpp ./ncnn/benchmark/benchncnn.cpp 
     cd ncnn
 
-    # generate
-    cd schema && ./generate.sh
-    cd -
-
     # build
-    export ANDROID_NDK=${ANDROID_NDK_HOME}
-    cd ncnn
-
     ##### android armv7
-    mkdir -p build-android-armv7
-    pushd build-android-armv7
-    cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON -DANDROID_PLATFORM=android-19 ..
-    make -j4
-    make install
-    popd
-
-    ##### android aarch64
-    mkdir -p build-android-aarch64
-    pushd build-android-aarch64
-    cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-21 ..
-    make -j4
-    make install
-    popd
-
-    ##### android armv7 vulkan
-#    mkdir -p build-android-armv7-vulkan
-#    pushd build-android-armv7-vulkan
-#    cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON ..
+#    mkdir -p build-android-armv7
+#    pushd build-android-armv7
+#    cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON -DANDROID_PLATFORM=android-19 ..
 #    make -j4
 #    make install
 #    popd
 
-    ##### android aarch64 vulkan
-#    mkdir -p build-android-aarch64-vulkan
-#    pushd build-android-aarch64-vulkan
-#    cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON ..
+    ##### android aarch64
+#    mkdir -p build-android-aarch64
+#    pushd build-android-aarch64
+#    cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-21 ..
 #    make -j4
 #    make install
 #    popd
 
-}
+    ##### android armv7 vulkan
+    mkdir -p build-android-armv7-vulkan
+    pushd build-android-armv7-vulkan
+    cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON ..
+    make -j4
+    make install
+    popd
+
+    ##### android aarch64 vulkan
+    mkdir -p build-android-aarch64-vulkan
+    pushd build-android-aarch64-vulkan
+    cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON ..
+    make -j4
+    make install
+    popd
 
-function main {
-    prepare_env
-    download_repo
-    build
-}
 
-main ${@}

ncnn/build_ncnn_model_convertor.sh

@@ -53,9 +53,9 @@ function main() {
         cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/host.gcc.toolchain.cmake ..
         make -j4
         make install
-        popd
         make caffe2ncnn -j4
         make ncnnoptimize -j4
+        popd
     elif [[ $platform =~ "Darwin" ]]; then
         ##### MacOS
         mkdir -p build-mac