Merge pull request #1070 from wangjiawei04/v0.5.0

V0.5.0 pick 2 pr
PaddlePaddle · Feb 23, 2021 · b2c61d1 · b2c61d1
2 parents c065e7a + 3423532
commit b2c61d1
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 14 deletions.
diff --git a/doc/DOCKER_IMAGES.md b/doc/DOCKER_IMAGES.md
@@ -97,3 +97,5 @@ Running Images:
 |          | <=0.4.0 | Nan                   | Nan       | Nan         |
 | Cuda11.0 | 0.5.0   | 0.5.0-cuda11.0-cudnn8 | Ubuntu 18 | 8.2.0       |
 |          | <=0.4.0 | Nan                   | Nan       | Nan         |
+
+**Tips:**  If you want to use CPU server and GPU server (version>=0.5.0) at the same time, you should check the gcc version,  only Cuda10.1/10.2/11 can run with CPU server owing to the same gcc version(8.2).
diff --git a/doc/DOCKER_IMAGES_CN.md b/doc/DOCKER_IMAGES_CN.md
@@ -102,3 +102,4 @@ registry.baidubce.com/paddlepaddle/serving:xpu-beta
 | Cuda11.0 | 0.5.0   | 0.5.0-cuda11.0-cudnn8 | Ubuntu 18 | 8.2.0       |
 |          | <=0.4.0 | Nan                   | Nan       | Nan         |
 
+**注意事项：** 如果您在0.5.0及以上版本需要在一个容器当中同时运行CPU server和GPU server，需要选择Cuda10.1/10.2/11的镜像，因为他们和CPU环境有着相同版本的gcc。
diff --git a/doc/LATEST_PACKAGES.md b/doc/LATEST_PACKAGES.md
@@ -3,41 +3,44 @@
 ## CPU server
 ### Python 3
 ```
+# Compile by gcc8.2
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server-0.0.0-py3-none-any.whl
 ```
 
 ### Python 2
 ```
+# Compile by gcc8.2
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server-0.0.0-py2-none-any.whl
 ```
 
 ## GPU server
 ### Python 3
 ```
-#cuda 9.0
+#cuda 9.0, Compile by gcc4.8
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post9-py3-none-any.whl
-#cuda 10.0
+#cuda 10.0, Compile by gcc4.8
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post10-py3-none-any.whl
-#cuda10.1 with TensorRT 6
+#cuda10.1 with TensorRT 6, Compile by gcc8.2
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post101-py3-none-any.whl
-#cuda10.2 with TensorRT 7
+#cuda10.2 with TensorRT 7, Compile by gcc8.2
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post102-py3-none-any.whl
-#cuda11.0 with TensorRT 7 (beta)
+#cuda11.0 with TensorRT 7 (beta), Compile by gcc8.2
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post11-py3-none-any.whl
 ```
 ### Python 2
 ```
-#cuda 9.0
+#cuda 9.0, Compile by gcc4.8
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post9-py2-none-any.whl
-#cuda 10.0
+#cuda 10.0, Compile by gcc4.8
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post10-py2-none-any.whl
-#cuda10.1 with TensorRT 6
+#cuda10.1 with TensorRT 6, Compile by gcc8.2
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post101-py2-none-any.whl
-#cuda10.2 with TensorRT 7
+#cuda10.2 with TensorRT 7, Compile by gcc8.2
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post102-py2-none-any.whl
-#cuda11.0 with TensorRT 7 (beta)
+#cuda11.0 with TensorRT 7 (beta), Compile by gcc8.2
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post11-py2-none-any.whl
 ```
+**Tips:**  If you want to use CPU server and GPU server at the same time, you should check the gcc version,  only Cuda10.1/10.2/11 can run with CPU server owing to the same gcc version(8.2).
 
 ## Client
 

diff --git a/doc/RUN_IN_DOCKER.md b/doc/RUN_IN_DOCKER.md
@@ -73,4 +73,5 @@ If you need to change the version, please refer to the instructions on the homep
 
 ## Precautious
 
-Runtime images cannot be used for compilation. If you want to compile from source, refer to [COMPILE](COMPILE.md).
+- Runtime images cannot be used for compilation. If you want to compile from source, refer to [COMPILE](COMPILE.md).
+- If you use Cuda9 and Cuda10 docker images, you cannot use `paddle_serving_server` CPU version at the same time, due to the limitation of gcc version. If you want to use both in one docker image, please choose images of Cuda10.1, Cuda10.2 and Cuda11.
diff --git a/doc/RUN_IN_DOCKER_CN.md b/doc/RUN_IN_DOCKER_CN.md
@@ -65,4 +65,5 @@ docker exec -it test bash
 
 ## 注意事项
 
-运行时镜像不能用于开发编译。如果想要从源码编译，请查看[如何编译PaddleServing](COMPILE.md)。
+- 运行时镜像不能用于开发编译。如果想要从源码编译，请查看[如何编译PaddleServing](COMPILE.md)。
+- 由于Cuda10和Cuda9的环境受限于GCC版本，无法同时运行CPU版本的`paddle_serving_server`，因此如果想要在GPU环境中同时使用CPU版本的`paddle_serving_server`，请选择Cuda10.1，Cuda10.2和Cuda11版本的镜像。
diff --git a/java/examples/pom.xml b/java/examples/pom.xml
@@ -8,7 +8,30 @@
     <groupId>io.paddle.serving.client</groupId>
     <artifactId>paddle-serving-sdk-java-examples</artifactId>
     <version>0.0.1</version>
-
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>aliyun-plugin</id>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
     <build>
         <plugins>
             <plugin>

diff --git a/java/pom.xml b/java/pom.xml
@@ -47,7 +47,30 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
-
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>aliyun-plugin</id>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
     <dependencyManagement>
         <dependencies>
             <dependency>