wangsiyuan06 преди 4 години
родител
ревизия
2da263c285

+ 2 - 2
README_cn.md

@@ -57,7 +57,7 @@ pip install paddlex -i https://mirror.baidu.com/pypi/simple
 
 3. **PaddleX Restful:**  
   使用基于RESTful API开发的GUI与Web Demo实现远程的深度学习全流程开发;同时开发者也可以基于RESTful API开发个性化的可视化界面
-- 前往[PaddleX RESTful API使用教程](./docs/restful/introduction.md)  
+- 前往[PaddleX RESTful API使用教程](./docs/gui/restful/introduction.md)  
 
 
 ## 产品模块说明
@@ -81,7 +81,7 @@ pip install paddlex -i https://mirror.baidu.com/pypi/simple
 - [10分钟快速上手系列教程](https://paddlex.readthedocs.io/zh_CN/develop/quick_start.html)
 - [PaddleX模型训练教程集合](https://paddlex.readthedocs.io/zh_CN/develop/train/index.html)
 - [PaddleX API接口说明](https://paddlex.readthedocs.io/zh_CN/develop/apis/index.html)
-- [PaddleX RESTful API说明](https://paddlex.readthedocs.io/zh_CN/develop/restful/introduction.html)
+- [PaddleX RESTful API说明](https://paddlex.readthedocs.io/zh_CN/develop/gui/restful/introduction.html)
 
 ### 在线项目示例
 

+ 1 - 2
docs/deploy/index.rst

@@ -9,9 +9,8 @@
    export_model.md
    hub_serving.md
    server/index
-   nvidia-jetson.md
-   jetson-docker.md
    paddlelite/index
    openvino/index
    raspberry/index
+   jetson/index
    opencv.md

+ 10 - 0
docs/deploy/jetson/index.rst

@@ -0,0 +1,10 @@
+Jetson部署
+=======================================
+
+
+.. toctree::
+   :maxdepth: 1
+   :caption: 文档目录:
+
+   nvidia-jetson.md
+   jetson-docker.md

+ 8 - 3
docs/deploy/jetson-docker.md → docs/deploy/jetson/jetson-docker.md

@@ -23,7 +23,7 @@ docker pull paddlex/jetson:1.0
 docker images
 ```
 可以看到,存在一个REPOSITORY为`paddlex/jetson`、TAG为`1.0`的docker镜像
-![](./images/images.png)  
+![](../images/images.png)  
 
 ### Step2: 容器创建
 创建容器之前,需要先准备好需要编译的部署代码与训练好的PaddleX Inference模型
@@ -42,14 +42,14 @@ cp -r PaddleX/deploy/cpp ~/infer/
 
 **创建容器**:通过如下命令创建容器,同时将HOME目录下包含部署代码的infer文件夹挂载到容器内
  ```
- docker create -it -v ~/infer/:/infer  -e DISPLAY=$DISPLAY --net=host --name paddlex --runtime nvidia paddlex/jetson:1.0 /bin/bash
+ docker create -it -v ~/infer/:/infer -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=$DISPLAY --net=host --name paddlex --runtime nvidia paddlex/jetson:1.0 /bin/bash
  ```
 查看创建的容器
  ```
  docker ps -a
  ```  
 
- ![](./images/container.png)  
+ ![](../images/container.png)  
 
 
 创建好容器后需要运行容器
@@ -97,6 +97,11 @@ docker exec -it paddlex /bin/bash -c 'cd /infer/cpp && sh scripts/jetson_build.s
 | save_result | 是否将每帧的预测可视结果保存为视频文件,支持值为0或1(默认值为1) |
 | save_dir | 保存可视化结果的路径, 默认值为"output" |
 
+**设置show_result为1之前请执行如下命令确保容器有显示权限**
+```
+sudo xhost +
+```  
+
 **注意:若系统无GUI,则不要将show_result设置为1。当使用摄像头预测时,按`ESC`键可关闭摄像头并推出预测程序。**
 
 **对于直接使用Docker提供的部署可执行文件进行部署的命令如下:**  

+ 0 - 0
docs/deploy/nvidia-jetson.md → docs/deploy/jetson/nvidia-jetson.md


+ 1 - 6
docs/gui/index.rst

@@ -73,12 +73,7 @@ PaddleX RESTful API 二次开发
    download.md
    usage/index
    faq.md
-   introduction.md
-   restful.md
-   quick_start.md
-   restful_api.md
-   data_struct.md
-   tree.md
+   restful/index
 
 
 * PaddleX GUI版本: v1.0

+ 0 - 0
docs/restful/data_struct.md → docs/gui/restful/data_struct.md


+ 0 - 0
docs/restful/img/classify_help.jpg → docs/gui/restful/img/classify_help.jpg


+ 0 - 0
docs/restful/img/detect_help.jpg → docs/gui/restful/img/detect_help.jpg


+ 0 - 0
docs/restful/img/framework.png → docs/gui/restful/img/framework.png


+ 0 - 0
docs/restful/img/gui_use.png → docs/gui/restful/img/gui_use.png


+ 0 - 0
docs/restful/img/ins_seg_help.jpg → docs/gui/restful/img/ins_seg_help.jpg


+ 0 - 0
docs/restful/img/restful_api.png → docs/gui/restful/img/restful_api.png


+ 0 - 0
docs/restful/img/seg_help.jpg → docs/gui/restful/img/seg_help.jpg


+ 0 - 0
docs/restful/img/start_restful.png → docs/gui/restful/img/start_restful.png


+ 0 - 0
docs/restful/img/web_demo.png → docs/gui/restful/img/web_demo.png


+ 1 - 1
docs/restful/index.rst → docs/gui/restful/index.rst

@@ -31,7 +31,7 @@ PaddleX RESTful API 二次开发
 
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
    :caption: 文档目录
    
    introduction.md

+ 0 - 0
docs/restful/introduction.md → docs/gui/restful/introduction.md


+ 0 - 0
docs/restful/quick_start.md → docs/gui/restful/quick_start.md


+ 0 - 0
docs/restful/restful.md → docs/gui/restful/restful.md


+ 0 - 0
docs/restful/restful_api.md → docs/gui/restful/restful_api.md


+ 0 - 0
docs/restful/tree.md → docs/gui/restful/tree.md


+ 3 - 16
docs/index.rst

@@ -50,8 +50,7 @@ PaddleX是基于飞桨核心框架、开发套件和工具组件的深度学习
    deploy/export_model.md
    deploy/hub_serving.md
    deploy/server/index
-   deploy/nvidia-jetson.md
-   deploy/jetson-docker.md
+   deploy/jetson/index
    deploy/paddlelite/android.md
    deploy/raspberry/index
    deploy/openvino/index
@@ -75,24 +74,12 @@ PaddleX是基于飞桨核心框架、开发套件和工具组件的深度学习
    gui/download.md
    gui/how_to_use.md
    gui/FAQ.md
+   gui/restful/index
 
 
 .. toctree::
    :maxdepth: 1
-   :caption: 8. RESTful API使用
-
-   
-   restful/introduction.md
-   restful/restful.md
-   restful/quick_start.md
-   restful/restful_api.md
-   restful/data_struct.md
-   restful/tree.md
-
-
-.. toctree::
-   :maxdepth: 1
-   :caption: 9. 附录
+   :caption: 8. 附录
 
    apis/index.rst
    appendix/model_zoo.md