Merge pull request #996 from wangjiawei04/cmake

Fix some doc

core/general-server/CMakeLists.txt

@@ -29,7 +29,8 @@ target_link_libraries(serving -Wl,--whole-archive fluid_cpu_engine
         -Wl,--no-whole-archive)
 
 target_link_libraries(serving paddle_fluid ${paddle_depend_libs})
-
+target_link_libraries(serving brpc)
+target_link_libraries(serving protobuf)
 target_link_libraries(serving pdserving)
 target_link_libraries(serving cube-api)
 target_link_libraries(serving utils)

doc/DOCKER_IMAGES.md

@@ -45,7 +45,15 @@ If you want to customize your Serving based on source code, use the version with
 |                GPU (cuda11-cudnn8-tensorRT7) runtime                 | Ubuntu18|    latest-cuda11-cudnn8   | [Dockerfile.cuda11-cudnn8](../tools/Dockerfile.cuda11-cudnn8) |
 |              GPU (cuda11-cudnn8-tensorRT7) development               | Ubuntu18 | latest-cuda11-cudnn8-devel | [Dockerfile.cuda11-cudnn8.devel](../tools/Dockerfile.cuda11-cudnn8.devel) |
 
-
+**Java Client:**
+```
+hub.baidubce.com/paddlepaddle/serving:latest-java
+```
+
+**XPU:**
+```
+hub.baidubce.com/paddlepaddle/serving:xpu-beta
+```
 
 ## Requirements for running CUDA containers
 

doc/DOCKER_IMAGES_CN.md

@@ -45,6 +45,15 @@
 |                GPU (cuda11-cudnn8-tensorRT7) 运行镜像                 | Ubuntu18|    latest-cuda11-cudnn8   | [Dockerfile.cuda11-cudnn8](../tools/Dockerfile.cuda11-cudnn8) |
 |              GPU (cuda11-cudnn8-tensorRT7) 开发镜像               | Ubuntu18 | latest-cuda11-cudnn8-devel | [Dockerfile.cuda11-cudnn8.devel](../tools/Dockerfile.cuda11-cudnn8.devel) |
 
+**Java镜像：**
+```
+hub.baidubce.com/paddlepaddle/serving:latest-java
+```
+
+**XPU镜像：**
+```
+hub.baidubce.com/paddlepaddle/serving:xpu-beta
+```
 
 ## 运行CUDA容器的要求
 

doc/LATEST_PACKAGES.md

@@ -32,7 +32,6 @@ https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post10-
 #cuda10.1 with TensorRT 6
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post101-py2-none-any.whl
 #cuda10.2 with TensorRT 7
->>>>>>> fit_a_line
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post102-py2-none-any.whl
 ```
 
@@ -64,3 +63,18 @@ https://paddle-serving.bj.bcebos.com/whl/paddle_serving_app-0.0.0-py3-none-any.w
 ```
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_app-0.0.0-py2-none-any.whl
 ```
+
+## ARM user
+for ARM user who uses [PaddleLite](https://github.com/PaddlePaddle/PaddleLite) can download the wheel packages as follows. And ARM user should use the xpu-beta docker [DOCKER IMAGES](./DOCKER_IMAGES.md) 
+**We only support Python 3.6 for Arm Users.**
+
+### Wheel Package Links
+```
+# Server 
+https://paddle-serving.bj.bcebos.com/whl/xpu/paddle_serving_server_gpu-0.0.0.postarm_xpu-py3-none-any.whl
+# Client
+https://paddle-serving.bj.bcebos.com/whl/xpu/paddle_serving_client-0.0.0-cp36-none-any.whl 
+# App
+https://paddle-serving.bj.bcebos.com/whl/xpu/paddle_serving_app-0.0.0-py3-none-any.whl 
+```
+