Merge branch 'develop' into Zelda

java/README.md

+## Java Demo
+
+### Install package
+```
+mvn compile
+mvn install
+cd examples
+mvn compile
+mvn install
+```
+
+### Start Server
+
+take the fit_a_line demo as example
+
+```
+ python -m paddle_serving_server.serve --model uci_housing_model --thread 10 --port 9393 --use_multilang #CPU
+python -m paddle_serving_server_gpu.serve --model uci_housing_model --thread 10 --port 9393 --use_multilang #GPU
+```
+
+### Client Predict
+```
+java -cp paddle-serving-sdk-java-examples-0.0.1-jar-with-dependencies.jar PaddleServingClientExample fit_a_line
+```
+
+The Java example also contains the prediction client of Bert, Model_enaemble, asyn_predict, batch_predict, Cube_local, Cube_quant, and Yolov4 models.

java/README_CN.md

+## Java 示例
+
+### 安装客户端依赖
+```
+mvn compile
+mvn install
+cd examples
+mvn compile
+mvn install
+```
+
+### 启动服务端
+
+以fit_a_line模型为例
+
+```
+ python -m paddle_serving_server.serve --model uci_housing_model --thread 10 --port 9393 --use_multilang #CPU
+python -m paddle_serving_server_gpu.serve --model uci_housing_model --thread 10 --port 9393 --use_multilang #GPU
+```
+
+### 客户端预测
+```
+java -cp paddle-serving-sdk-java-examples-0.0.1-jar-with-dependencies.jar PaddleServingClientExample fit_a_line
+```
+
+java示例中还包含了bert、model_enaemble、asyn_predict、batch_predict、cube_local、cube_quant、yolov4模型的预测客户端。

python/paddle_serving_server/__init__.py

@@ -584,7 +584,7 @@ class MultiLangServerServiceServicer(multi_lang_general_model_service_pb2_grpc.
                     else:
                         raise Exception("error type.")
                 tensor.shape.extend(list(model_result[name].shape))
-                if name in self.lod_tensor_set_:
+                if "{}.lod".format(name) in model_result:
                     tensor.lod.extend(model_result["{}.lod".format(name)]
                                       .tolist())
                 inst.tensor_array.append(tensor)

python/paddle_serving_server_gpu/__init__.py

@@ -655,7 +655,7 @@ class MultiLangServerServiceServicer(multi_lang_general_model_service_pb2_grpc.
                     else:
                         raise Exception("error type.")
                 tensor.shape.extend(list(model_result[name].shape))
-                if name in self.lod_tensor_set_:
+                if "{}.lod".format(name) in model_result:
                     tensor.lod.extend(model_result["{}.lod".format(name)]
                                       .tolist())
                 inst.tensor_array.append(tensor)

tools/Dockerfile.cuda10.0-cudnn7.devel

@@ -39,3 +39,5 @@ RUN yum install -y python3 python3-devel \
 RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8 \
     && echo "export LANG=en_US.utf8" >> /root/.bashrc \
     && echo "export LANGUAGE=en_US.utf8" >> /root/.bashrc
+
+