Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Docs] fix ncnn docs #378

Merged
merged 2 commits into from
Apr 24, 2022
Merged

[Docs] fix ncnn docs #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bd8efb
fix ncnn docs`
hanrui1sensetime Apr 18, 2022
6fb7103
update 0216
hanrui1sensetime Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/en/backends/ncnn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## ncnn Support

MMDeploy now supports ncnn version == 1.0.20211208
MMDeploy now supports ncnn version == 1.0.20220216

### Installation

Expand All @@ -27,7 +27,7 @@ You should ensure your gcc satisfies `gcc >= 6`.

- Download ncnn source code
```bash
git clone -b 20211208 [email protected]:Tencent/ncnn.git
git clone -b 20220216 [email protected]:Tencent/ncnn.git
```

- <font color=red>Make install</font> ncnn library
Expand Down Expand Up @@ -82,7 +82,7 @@ If you haven't installed NCNN in the default path, please add `-Dncnn_DIR` flag
#### Reminder
- In ncnn version >= 1.0.20201208, the dimension of ncnn.Mat should be no more than 4.
- In ncnn version >= 1.0.20220216, the dimension of ncnn.Mat should be no more than 4.
### FAQs
Expand Down
4 changes: 2 additions & 2 deletions docs/en/build/android.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,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 v20211208 and has to use <code>git clone</code> to download it.</b><br>
<b> Now, MMDeploy supports v20220216 and has to use <code>git clone</code> to download it.</b><br>
<pre><code>
git clone -b 20211208 https://github.com/Tencent/ncnn.git
git clone -b 20220216 https://github.com/Tencent/ncnn.git
cd ncnn
git submodule update --init
export NCNN_DIR=${PWD}
Expand Down
2 changes: 1 addition & 1 deletion docs/en/build/linux.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ export MMDEPLOY_DIR=$(pwd)
3. <b>pplnn</b>: PPL.NN. <code>pplnn_DIR</code> is needed.
<pre><code>-Dpplnn_DIR=${PPLNN_DIR}</code></pre>
4. <b>ncnn</b>: ncnn. <code>ncnn_DIR</code> is needed.
<pre><code>-Dncnn_DIR=${NCNN_DIR}</code></pre>
<pre><code>-Dncnn_DIR=${NCNN_DIR}/build/install/lib/cmake/ncnn</code></pre>
5. <b>openvino</b>: OpenVINO. <code>InferenceEngine_DIR</code> is needed.
<pre><code>-DInferenceEngine_DIR=${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/share</code></pre>
6. <b>torchscript</b>: TorchScript. <code>Torch_DIR</code> is needed.
Expand Down
4 changes: 2 additions & 2 deletions docs/zh_cn/build/android.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ export OPENCV_ANDROID_SDK_DIR=${PWD}/OpenCV-android-sdk
<tr>
<td>ncnn </td>
<td>ncnn 是支持 android 平台的高效神经网络推理计算框架</br>
<b> 目前, MMDeploy 支持 ncnn 的 20211208 版本, 且必须使用<code>git clone</code> 下载源码的方式安装</b><br>
<b> 目前, MMDeploy 支持 ncnn 的 20220216 版本, 且必须使用<code>git clone</code> 下载源码的方式安装</b><br>
<pre><code>
git clone -b 20211208 https://github.com/Tencent/ncnn.git
git clone -b 20220216 https://github.com/Tencent/ncnn.git
cd ncnn
git submodule update --init
export NCNN_DIR=${PWD}
Expand Down
2 changes: 1 addition & 1 deletion docs/zh_cn/build/linux.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ export MMDEPLOY_DIR=$(pwd)
3. <b>pplnn</b>: 表示 PPL.NN。需要设置 <code>pplnn_DIR</code>
<pre><code>-Dpplnn_DIR=${PPLNN_DIR}</code></pre>
4. <b>ncnn</b>: 表示 ncnn。需要设置 <code>ncnn_DIR</code>
<pre><code>-Dncnn_DIR=${NCNN_DIR}</code></pre>
<pre><code>-Dncnn_DIR=${NCNN_DIR}/build/install/lib/cmake/ncnn</code></pre>
5. <b>openvino</b>: 表示 OpenVINO。需要设置 <code>InferenceEngine_DIR</code>
<pre><code>-DInferenceEngine_DIR=${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/share</code></pre>
6. <b>torchscript</b>: TorchScript. 需要设置<code>Torch_DIR</code>
Expand Down