diff --git a/.github/workflows/backend-ncnn.yml b/.github/workflows/backend-ncnn.yml index 76c0d96c7..e0c811835 100644 --- a/.github/workflows/backend-ncnn.yml +++ b/.github/workflows/backend-ncnn.yml @@ -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/**" diff --git a/docs/en/01-how-to-build/android.md b/docs/en/01-how-to-build/android.md index a644db205..304b5c0b3 100644 --- a/docs/en/01-how-to-build/android.md +++ b/docs/en/01-how-to-build/android.md @@ -77,9 +77,9 @@ export OPENCV_ANDROID_SDK_DIR=${PWD}/OpenCV-android-sdk
git clone
to download it. For supported android ABI, see here . git clone
to download it. For supported android ABI, see here .
-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}
diff --git a/docs/en/01-how-to-build/cross_build_ncnn_aarch64.md b/docs/en/01-how-to-build/cross_build_ncnn_aarch64.md
index c63b898ec..11524f96d 100644
--- a/docs/en/01-how-to-build/cross_build_ncnn_aarch64.md
+++ b/docs/en/01-how-to-build/cross_build_ncnn_aarch64.md
@@ -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 \
diff --git a/docs/zh_cn/01-how-to-build/android.md b/docs/zh_cn/01-how-to-build/android.md
index 868b79d12..5fbd29d82 100644
--- a/docs/zh_cn/01-how-to-build/android.md
+++ b/docs/zh_cn/01-how-to-build/android.md
@@ -77,10 +77,10 @@ export OPENCV_ANDROID_SDK_DIR=${PWD}/OpenCV-android-sdk
ncnn
ncnn 是支持 android 平台的高效神经网络推理计算框架
- 目前, MMDeploy 支持 ncnn 的 20220721 版本, 且必须使用git clone
下载源码的方式安装。请到 这里 查询 ncnn 支持的 android ABI。
+ 目前, MMDeploy 支持 ncnn 的 20221128 版本, 且必须使用git clone
下载源码的方式安装。请到 这里 查询 ncnn 支持的 android ABI。
-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}
diff --git a/docs/zh_cn/01-how-to-build/cross_build_ncnn_aarch64.md b/docs/zh_cn/01-how-to-build/cross_build_ncnn_aarch64.md
index a84ef54b6..154e5e28f 100644
--- a/docs/zh_cn/01-how-to-build/cross_build_ncnn_aarch64.md
+++ b/docs/zh_cn/01-how-to-build/cross_build_ncnn_aarch64.md
@@ -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 \
diff --git a/tools/scripts/build_ubuntu_x64_ncnn.py b/tools/scripts/build_ubuntu_x64_ncnn.py
index f50e4b90e..0dd187fc3 100644
--- a/tools/scripts/build_ubuntu_x64_ncnn.py
+++ b/tools/scripts/build_ubuntu_x64_ncnn.py
@@ -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')
diff --git a/tools/scripts/ubuntu_cross_build_aarch64.sh b/tools/scripts/ubuntu_cross_build_aarch64.sh
index 01d08e0c1..456920340 100755
--- a/tools/scripts/ubuntu_cross_build_aarch64.sh
+++ b/tools/scripts/ubuntu_cross_build_aarch64.sh
@@ -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