fix(CI): ncnn script install (#1459)

* CI(script): fix ncnn install

* docs(build): update ncnn version to 20221128

* fix(CI): trigger
pull/1470/head
tpoisonooo 2022-11-29 20:37:06 +08:00 committed by GitHub
parent 2c9861555f
commit f6b35f3b68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 8 deletions

View File

@ -2,11 +2,19 @@ name: backend-ncnn
on:
push:
branches:
- main
- master
- dev-1.x
paths-ignore:
- "demo/**"
- "tools/**"
pull_request:
branches:
- main
- master
- dev-1.x
paths-ignore:
- "demo/**"
- "tools/**"

View File

@ -77,9 +77,9 @@ export OPENCV_ANDROID_SDK_DIR=${PWD}/OpenCV-android-sdk
<tr>
<td>ncnn </td>
<td>A high-performance neural network inference computing framework supporting for android.</br>
<b> Now, MMDeploy supports 20220721 and has to use <code>git clone</code> to download it. For supported android ABI, see <a href='https://github.com/Tencent/ncnn/releases'> here </a>. </b><br>
<b> Now, MMDeploy supports 20221128 and has to use <code>git clone</code> to download it. For supported android ABI, see <a href='https://github.com/Tencent/ncnn/releases'> here </a>. </b><br>
<pre><code>
git clone -b 20220721 https://github.com/Tencent/ncnn.git
git clone -b 20221128 https://github.com/Tencent/ncnn.git
cd ncnn
git submodule update --init
export NCNN_DIR=${PWD}

View File

@ -64,7 +64,7 @@ ls -alh /tmp/ocv-aarch64
c) Cross build ncnn and install to /tmp/ncnn-aarch64
```bash
git clone https://github.com/tencent/ncnn --branch 20220729 --depth=1
git clone https://github.com/tencent/ncnn --branch 20221128 --depth=1
mkdir build && cd build
cmake .. \
-DCMAKE_TOOLCHAIN_FILE=../toolchains/aarch64-linux-gnu.toolchain.cmake \

View File

@ -77,10 +77,10 @@ export OPENCV_ANDROID_SDK_DIR=${PWD}/OpenCV-android-sdk
<tr>
<td>ncnn </td>
<td>ncnn 是支持 android 平台的高效神经网络推理计算框架</br>
<b> 目前, MMDeploy 支持 ncnn 的 20220721 版本, 且必须使用<code>git clone</code> 下载源码的方式安装。请到 <a href='https://github.com/Tencent/ncnn/releases'> 这里 </a> 查询 ncnn 支持的 android ABI。</b><br>
<b> 目前, MMDeploy 支持 ncnn 的 20221128 版本, 且必须使用<code>git clone</code> 下载源码的方式安装。请到 <a href='https://github.com/Tencent/ncnn/releases'> 这里 </a> 查询 ncnn 支持的 android ABI。</b><br>
<pre><code>
git clone -b 20220721 https://github.com/Tencent/ncnn.git
git clone -b 20221128 https://github.com/Tencent/ncnn.git
cd ncnn
git submodule update --init
export NCNN_DIR=${PWD}

View File

@ -64,7 +64,7 @@ ls -alh /tmp/ocv-aarch64
c) 交叉编译 ncnn 安装到 tmp 目录
```bash
git clone https://github.com/tencent/ncnn --branch 20220729 --depth=1
git clone https://github.com/tencent/ncnn --branch 20221128 --depth=1
mkdir build && cd build
cmake .. \
-DCMAKE_TOOLCHAIN_FILE=../toolchains/aarch64-linux-gnu.toolchain.cmake \

View File

@ -60,7 +60,7 @@ def install_pyncnn(dep_dir):
# git clone
if not os.path.exists('ncnn'):
os.system(
'git clone --depth 1 --branch 20220729 https://github.com/tencent/ncnn && cd ncnn' # noqa: E501
'git clone --depth 1 --branch 20221128 https://github.com/tencent/ncnn && cd ncnn' # noqa: E501
)
ncnn_dir = os.path.join(dep_dir, 'ncnn')

View File

@ -43,7 +43,7 @@ build_ocv() {
build_ncnn() {
if [ ! -e "ncnn" ];then
git clone https://github.com/tencent/ncnn --branch 20220729 --depth=1
git clone https://github.com/tencent/ncnn --branch 20221128 --depth=1
fi
if [ ! -e "ncnn/build_aarch64" ];then
mkdir -p ncnn/build_aarch64