From 3bc5fbf0eb084f95b30d95360323de17fb249e1c Mon Sep 17 00:00:00 2001 From: huzhiqiang <912790387@qq.com> Date: Tue, 24 Sep 2019 12:54:46 +0800 Subject: [PATCH] Gh pages hzq (#2126) * modify cpp_demo * modify model_optimzie_tool doc * modify FPGA and ios compiling --- _all_pages/develop/fpga.md | 4 ++-- _all_pages/develop/model_optimize_tool.md | 14 ++++++++++---- _all_pages/develop/source_compile.md | 2 +- _all_pages/v2.0.0-beta1/fpga.md | 4 ++-- _all_pages/v2.0.0-beta1/model_optimize_tool.md | 14 ++++++++++---- _all_pages/v2.0.0-beta1/source_compile.md | 2 +- 6 files changed, 26 insertions(+), 14 deletions(-) diff --git a/_all_pages/develop/fpga.md b/_all_pages/develop/fpga.md index 05897508c5..0cac7d2251 100644 --- a/_all_pages/develop/fpga.md +++ b/_all_pages/develop/fpga.md @@ -36,10 +36,10 @@ CMAKE编译选项： -DLITE_WITH_ARM=ON \ -DLITE_WITH_OPENMP=ON \ -DLITE_WITH_LIGHT_WEIGHT_FRAMEWORK=ON \ - -DWITH_TESTING=ON \ + -DWITH_TESTING=OFF \ -DLITE_WITH_FPGA=ON \ -DARM_TARGET_OS=armlinux - make -j2 + make publish_inference -j2 ``` Lite提供fpga编译脚本，位于lite/tools/build_fpga.sh，在Lite根目录执行该脚本即可编译 diff --git a/_all_pages/develop/model_optimize_tool.md b/_all_pages/develop/model_optimize_tool.md index b2aa3a655b..2ea28cbcca 100644 --- a/_all_pages/develop/model_optimize_tool.md +++ b/_all_pages/develop/model_optimize_tool.md @@ -11,9 +11,15 @@ Lite架构在预测过程中表现出来的高性能得益于其丰富的优化 ### 下载model_optimize_tool -```sh -wget https://paddle-inference-dist.bj.bcebos.com/PaddleLite/model_optimize_tool -chmod 777 model_optimize_tool +从 [Paddle-Lite Release](https://github.com/PaddlePaddle/Paddle-Lite/releases/)官网下载最新版本的`model_optimize_tool` + +![model_optimize_tool](https://user-images.githubusercontent.com/45189361/65481346-8d2e7100-dec7-11e9-848b-b237a2f4a3ff.png) + +注意：运行前需解压model_optimize_tool并添加可执行权限 + +``` +gunzip ./model_optimize_tool.gz +chmod +x model_optimize_tool ``` ### 编译model_optimize_tool @@ -34,7 +40,7 @@ chmod 777 model_optimize_tool fluid模型有两种形式，combined形式（权重保存为一个param文件）和非combined形式（权重保存为一个一个单独的文件），model_optimize_tool支持对这两种形式的fluid模型进行直接优化。 -2、使用model_optimize_tool对模型进行优化(在电脑端执行) +2、使用model_optimize_tool对模型进行优化(**需要在 x86 PC 端执行**) ```shell ./model_optimize_tool \ diff --git a/_all_pages/develop/source_compile.md b/_all_pages/develop/source_compile.md index 79c136ddfd..16576d101c 100644 --- a/_all_pages/develop/source_compile.md +++ b/_all_pages/develop/source_compile.md @@ -208,7 +208,7 @@ git checkout ``` ios tiny publish支持的编译选项： * `--arm_os`: 可选ios或者ios64 -* `--arm_abi`: 可选armv7和armv8 +* `--arm_abi`: 可选armv7和armv8（**注意**：当`arm_os=ios`时只能选择`arm_abi=armv7`） * 如果mac编译过程中报错："Invalid CMAKE_DEVELOPER_ROOT: does not exist", 运行： ```shell sudo xcode-select -s /Applications/Xcode.app/Contents/Developer diff --git a/_all_pages/v2.0.0-beta1/fpga.md b/_all_pages/v2.0.0-beta1/fpga.md index 24399a8145..ae930e1278 100644 --- a/_all_pages/v2.0.0-beta1/fpga.md +++ b/_all_pages/v2.0.0-beta1/fpga.md @@ -37,10 +37,10 @@ CMAKE编译选项： -DLITE_WITH_ARM=ON \ -DLITE_WITH_OPENMP=ON \ -DLITE_WITH_LIGHT_WEIGHT_FRAMEWORK=ON \ - -DWITH_TESTING=ON \ + -DWITH_TESTING=OFF \ -DLITE_WITH_FPGA=ON \ -DARM_TARGET_OS=armlinux - make -j2 + make publish_inference -j2 ``` Lite提供fpga编译脚本，位于lite/tools/build_fpga.sh，在Lite根目录执行该脚本即可编译 diff --git a/_all_pages/v2.0.0-beta1/model_optimize_tool.md b/_all_pages/v2.0.0-beta1/model_optimize_tool.md index 06cafd1ccd..ff6e3d21b1 100644 --- a/_all_pages/v2.0.0-beta1/model_optimize_tool.md +++ b/_all_pages/v2.0.0-beta1/model_optimize_tool.md @@ -11,9 +11,15 @@ Lite架构在预测过程中表现出来的高性能得益于其丰富的优化 ### 下载model_optimize_tool -```sh -wget https://paddle-inference-dist.bj.bcebos.com/PaddleLite/model_optimize_tool -chmod 777 model_optimize_tool +从 [Paddle-Lite Release](https://github.com/PaddlePaddle/Paddle-Lite/releases/)官网下载最新版本的`model_optimize_tool` + +![mode_optimize_tool](https://user-images.githubusercontent.com/45189361/65481346-8d2e7100-dec7-11e9-848b-b237a2f4a3ff.png) + +注意：运行前需解压model_optimize_tool并添加可执行权限 + +``` +gunzip ./model_optimize_tool.gz +chmod +x model_optimize_tool ``` ### 编译model_optimize_tool @@ -35,7 +41,7 @@ chmod 777 model_optimize_tool fluid模型有两种形式，combined形式（权重保存为一个param文件）和非combined形式（权重保存为一个一个单独的文件），model_optimize_tool支持对这两种形式的fluid模型进行直接优化。 -2、使用model_optimize_tool对模型进行优化(在电脑端执行) +2、使用model_optimize_tool对模型进行优化(**需要在 x86 PC 端执行**) ```shell ./model_optimize_tool \ diff --git a/_all_pages/v2.0.0-beta1/source_compile.md b/_all_pages/v2.0.0-beta1/source_compile.md index e50bbb1b43..9cbcc60942 100644 --- a/_all_pages/v2.0.0-beta1/source_compile.md +++ b/_all_pages/v2.0.0-beta1/source_compile.md @@ -229,7 +229,7 @@ git checkout ``` ios tiny publish支持的编译选项： * `--arm_os`: 可选ios或者ios64 -* `--arm_abi`: 可选armv7和armv8 +* `--arm_abi`: 可选armv7和armv8 (**注意**：当`arm_os=ios`时，只能选择`arm_abi=armv7`) * 如果mac编译过程中报错："Invalid CMAKE_DEVELOPER_ROOT: does not exist", 运行： ```shell sudo xcode-select -s /Applications/Xcode.app/Contents/Developer -- GitLab