Fix rknn and aarch64 build ci (#1980)

* fix ci build script doesn't fail when error occurs

* fix build_cpu_model_convert

* upgrade pip

---------

Co-authored-by: RunningLeon <[email protected]>

Author: irexyc

.github/workflows/backend-rknn.yml

@@ -29,7 +29,7 @@ jobs:
         run: sudo apt update
       - name: cross compile
         run: |
-          sh -x tools/scripts/ubuntu_cross_build_rknn.sh rk3588
+          sh -xe tools/scripts/ubuntu_cross_build_rknn.sh rk3588
   build_rknpu:
     runs-on: ubuntu-20.04
     steps:
@@ -41,4 +41,4 @@ jobs:
         run: sudo apt update
       - name: cross compile
         run: |
-          sh -x tools/scripts/ubuntu_cross_build_rknn.sh rv1126
+          sh -xe tools/scripts/ubuntu_cross_build_rknn.sh rv1126

.github/workflows/build.yml

@@ -25,7 +25,6 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [3.7]
         torch: [1.8.0, 1.9.0]
         include:
           - torch: 1.8.0
@@ -36,18 +35,18 @@ jobs:
             torchvision: 0.10.0
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
       - name: Install PyTorch
-        run: python -m pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html
+        run: |
+          python -m pip install --upgrade pip
+          python -V
+          python -m pip show pip
+          python -m pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html
       - name: Install unittest dependencies
         run: |
           python -m pip install openmim
           python -m pip install -r requirements.txt
           python -m pip install -r requirements/backends.txt
-          python -m mim install "mmcv>=2.0.0rc1"
+          python -m mim install "mmcv>=2.0.0"
           python -m mim install -r requirements/codebases.txt
           python -m pip install -U numpy clip numba transformers
           python -m pip list
@@ -112,7 +111,7 @@ jobs:
           python-version: 3.8
       - name: gcc-multilib
         run: |
-          sh -x tools/scripts/ubuntu_cross_build_aarch64.sh
+          sh -ex tools/scripts/ubuntu_cross_build_aarch64.sh
 
   build_cuda102:
     runs-on: ubuntu-20.04

tools/scripts/ubuntu_cross_build_aarch64.sh

@@ -34,8 +34,8 @@ build_ocv() {
   cd opencv/platforms/linux/cross_build_aarch64
   rm -rf CMakeCache.txt
   cmake ../../.. -DBUILD_TIFF=ON -DCMAKE_INSTALL_PREFIX=/tmp/ocv-aarch64 -DCMAKE_TOOLCHAIN_FILE=../aarch64-gnu.toolchain.cmake
-  good_nproc
-  jobs=$?
+  # good_nproc
+  jobs=`nproc`
   make -j${jobs}
   make install
   cd -
@@ -53,8 +53,8 @@ build_ncnn() {
   cmake .. \
     -DCMAKE_TOOLCHAIN_FILE=../toolchains/aarch64-linux-gnu.toolchain.cmake \
     -DCMAKE_INSTALL_PREFIX=/tmp/ncnn-aarch64
-  good_nproc
-  jobs=$?
+  # good_nproc
+  jobs=`nproc`
   make -j${jobs}
   make install
   cd -
@@ -75,10 +75,12 @@ build_mmdeploy() {
     -DMMDEPLOY_TARGET_DEVICES="cpu" \
     -DMMDEPLOY_TARGET_BACKENDS="ncnn" \
     -Dncnn_DIR=/tmp/ncnn-aarch64/lib/cmake/ncnn \
-    -DOpenCV_DIR=/tmp/ocv-aarch64/lib/cmake/opencv4
+    -DOpenCV_DIR=/tmp/ocv-aarch64/lib/cmake/opencv4 \
+    -DMMDEPLOY_BUILD_EXAMPLES=ON \
+    -DMMDEPLOY_BUILD_SDK=ON
 
-  good_nproc
-  jobs=$?
+  # good_nproc
+  jobs=`nproc`
   make -j${jobs}
   make install
 

tools/scripts/ubuntu_cross_build_rknn.sh

@@ -61,8 +61,8 @@ build_ocv_arm_gnueabi() {
   rm -rf CMakeCache.txt
   cmake .. -DCMAKE_INSTALL_PREFIX=install -DCMAKE_TOOLCHAIN_FILE=../platforms/linux/arm-gnueabi.toolchain.cmake \
     -DBUILD_TIFF=ON -DBUILD_PERF_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release
-  good_nproc
-  jobs=$?
+  # good_nproc
+  jobs=`nproc`
   make -j${jobs} && make install
   export OPENCV_PACKAGE_DIR=$(pwd)/install/lib/cmake/opencv4
   cd -
@@ -79,8 +79,8 @@ build_ocv_aarch64() {
   rm -rf CMakeCache.txt
   cmake .. -DCMAKE_INSTALL_PREFIX=install -DCMAKE_TOOLCHAIN_FILE=../platforms/linux/aarch64-gnu.toolchain.cmake \
     -DBUILD_PERF_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release
-  good_nproc
-  jobs=$?
+  # good_nproc
+  jobs=`nproc`
   make -j${jobs} && make install
   export OPENCV_PACKAGE_DIR=$(pwd)/install/lib/cmake/opencv4
   cd -
@@ -102,11 +102,10 @@ build_mmdeploy_with_rknpu() {
     -DMMDEPLOY_BUILD_EXAMPLES=ON \
     -DMMDEPLOY_TARGET_BACKENDS="rknn" \
     -DRKNPU_DEVICE_DIR="${RKNPU_DIR}"/rknn/rknn_api/librknn_api \
-    -DOpenCV_DIR="${OPENCV_PACKAGE_DIR}" \
-    -DMMDEPLOY_SHARED_LIBS=ON
+    -DOpenCV_DIR="${OPENCV_PACKAGE_DIR}"
 
-  good_nproc
-  jobs=$?
+  # good_nproc
+  jobs=`nproc`
   make -j${jobs} && make install
 
   ls -lah install/bin/*
@@ -128,11 +127,10 @@ build_mmdeploy_with_rknpu2() {
     -DMMDEPLOY_BUILD_EXAMPLES=ON \
     -DMMDEPLOY_TARGET_BACKENDS="rknn" \
     -DRKNPU2_DEVICE_DIR="${RKNPU2_DIR}/runtime/${device_model}" \
-    -DOpenCV_DIR="${OPENCV_PACKAGE_DIR}" \
-    -DMMDEPLOY_SHARED_LIBS=ON
+    -DOpenCV_DIR="${OPENCV_PACKAGE_DIR}"
 
-  good_nproc
-  jobs=$?
+  # good_nproc
+  jobs=`nproc`
   make -j${jobs} && make install
 
   ls -lah install/bin/*