diff --git a/doc/NEW_WEB_SERVICE.md b/doc/NEW_WEB_SERVICE.md index a36c1b7633076b04801bcbb5ce04ae39acd7bce9..39bca98a3bdfbc1b2cadb5d2c3d60395b4592b34 100644 --- a/doc/NEW_WEB_SERVICE.md +++ b/doc/NEW_WEB_SERVICE.md @@ -2,7 +2,7 @@ ([简体中文](NEW_WEB_SERVICE_CN.md)|English) -This document will take the image classification service based on the Imagenet data set as an example to introduce how to develop a new web service. The complete code can be visited at [here](https://github.com/PaddlePaddle/Serving/blob/develop/python/examples/imagenet/image_classification_service.py). +This document will take the image classification service based on the Imagenet data set as an example to introduce how to develop a new web service. The complete code can be visited at [here](../python/examples/imagenet/resnet50_web_service.py). ## WebService base class diff --git a/doc/NEW_WEB_SERVICE_CN.md b/doc/NEW_WEB_SERVICE_CN.md index c9555f88a62d64b2ce1b2d8dabd2bf88dc706326..43ca7fb61f2c70f13019574a7984e3665bd1b6fa 100644 --- a/doc/NEW_WEB_SERVICE_CN.md +++ b/doc/NEW_WEB_SERVICE_CN.md @@ -2,7 +2,7 @@ (简体中文|[English](NEW_WEB_SERVICE.md)) -本文档将以Imagenet图像分类服务为例，来介绍如何开发一个新的Web Service。您可以在[这里](https://github.com/PaddlePaddle/Serving/blob/develop/python/examples/imagenet/image_classification_service.py)查阅完整的代码。 +本文档将以Imagenet图像分类服务为例，来介绍如何开发一个新的Web Service。您可以在[这里](../python/examples/imagenet/resnet50_web_service.py)查阅完整的代码。 ## WebService基类 diff --git a/python/paddle_serving_app/version.py b/python/paddle_serving_app/version.py index 92ef4bed8a2fa14f0f7e686f0424db23a1e7d227..332cba98dd692c4e33da68d4de7763e83e3729b5 100644 --- a/python/paddle_serving_app/version.py +++ b/python/paddle_serving_app/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. """ Paddle Serving App version string """ -serving_app_version = "0.1.1" +serving_app_version = "0.1.2" diff --git a/python/paddle_serving_client/version.py b/python/paddle_serving_client/version.py index 4e024f00030d1fcf9a5eec7a2d8aec6d7c029251..f7fc14b2a7f0c25b471e8d3bb44e9d6db6839d01 100644 --- a/python/paddle_serving_client/version.py +++ b/python/paddle_serving_client/version.py @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. """ Paddle Serving Client version string """ -serving_client_version = "0.3.1" -serving_server_version = "0.3.1" -module_proto_version = "0.3.1" +serving_client_version = "0.3.2" +serving_server_version = "0.3.2" +module_proto_version = "0.3.2" diff --git a/python/paddle_serving_server/version.py b/python/paddle_serving_server/version.py index 4e024f00030d1fcf9a5eec7a2d8aec6d7c029251..f7fc14b2a7f0c25b471e8d3bb44e9d6db6839d01 100644 --- a/python/paddle_serving_server/version.py +++ b/python/paddle_serving_server/version.py @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. """ Paddle Serving Client version string """ -serving_client_version = "0.3.1" -serving_server_version = "0.3.1" -module_proto_version = "0.3.1" +serving_client_version = "0.3.2" +serving_server_version = "0.3.2" +module_proto_version = "0.3.2" diff --git a/python/paddle_serving_server/web_service.py b/python/paddle_serving_server/web_service.py index ea43c8cb18731f60d905ccbe4bada605709d9c11..d9b9e3f1b1dcfa9502096d0eab4e3be61d2bbaa6 100755 --- a/python/paddle_serving_server/web_service.py +++ b/python/paddle_serving_server/web_service.py @@ -88,8 +88,8 @@ class WebService(object): result = self.postprocess( feed=request.json["feed"], fetch=fetch, fetch_map=fetch_map) result = {"result": result} - except ValueError: - result = {"result": "Request Value Error"} + except ValueError as err: + result = {"result": err} return result def run_rpc_service(self): diff --git a/python/paddle_serving_server_gpu/version.py b/python/paddle_serving_server_gpu/version.py index 4e024f00030d1fcf9a5eec7a2d8aec6d7c029251..f7fc14b2a7f0c25b471e8d3bb44e9d6db6839d01 100644 --- a/python/paddle_serving_server_gpu/version.py +++ b/python/paddle_serving_server_gpu/version.py @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. """ Paddle Serving Client version string """ -serving_client_version = "0.3.1" -serving_server_version = "0.3.1" -module_proto_version = "0.3.1" +serving_client_version = "0.3.2" +serving_server_version = "0.3.2" +module_proto_version = "0.3.2" diff --git a/python/paddle_serving_server_gpu/web_service.py b/python/paddle_serving_server_gpu/web_service.py index bc1f621f7a5615220a504b4e98f5a36ccc8bf767..6750de86f1750f2ab9dc36eca9d4307f7821e2d8 100644 --- a/python/paddle_serving_server_gpu/web_service.py +++ b/python/paddle_serving_server_gpu/web_service.py @@ -133,8 +133,8 @@ class WebService(object): result = self.postprocess( feed=request.json["feed"], fetch=fetch, fetch_map=fetch_map) result = {"result": result} - except ValueError: - result = {"result": "Request Value Error"} + except ValueError as err: + result = {"result": err} return result def run_rpc_service(self): diff --git a/python/setup.py.client.in b/python/setup.py.client.in index 4613d2db7747d06ab706bc96181f612985630811..96773c38dc950c0b8357274dff30d7c952ecdc25 100644 --- a/python/setup.py.client.in +++ b/python/setup.py.client.in @@ -58,7 +58,7 @@ if '${PACK}' == 'ON': REQUIRED_PACKAGES = [ - 'six >= 1.10.0', 'protobuf >= 3.1.0', 'numpy >= 1.12', 'grpcio >= 1.28.1', + 'six >= 1.10.0', 'protobuf >= 3.11.0', 'numpy >= 1.12', 'grpcio >= 1.28.1', 'grpcio-tools >= 1.28.1' ] diff --git a/python/setup.py.server.in b/python/setup.py.server.in index 967b98da42f77ac593d723ce64fe6533abe40bb0..db679edbab8e6ba6929ed631c2bbc5a731146d0d 100644 --- a/python/setup.py.server.in +++ b/python/setup.py.server.in @@ -37,7 +37,7 @@ def python_version(): max_version, mid_version, min_version = python_version() REQUIRED_PACKAGES = [ - 'six >= 1.10.0', 'protobuf >= 3.1.0', 'grpcio >= 1.28.1', 'grpcio-tools >= 1.28.1', + 'six >= 1.10.0', 'protobuf >= 3.11.0', 'grpcio >= 1.28.1', 'grpcio-tools >= 1.28.1', 'paddle_serving_client', 'flask >= 1.1.1', 'paddle_serving_app' ] diff --git a/python/setup.py.server_gpu.in b/python/setup.py.server_gpu.in index 29098b7c8d23a3f53abd084b68871c66512e8b4f..65dec4621fceba3967ff21814b218c0229a5124b 100644 --- a/python/setup.py.server_gpu.in +++ b/python/setup.py.server_gpu.in @@ -37,7 +37,7 @@ def python_version(): max_version, mid_version, min_version = python_version() REQUIRED_PACKAGES = [ - 'six >= 1.10.0', 'protobuf >= 3.1.0', 'grpcio >= 1.28.1', 'grpcio-tools >= 1.28.1', + 'six >= 1.10.0', 'protobuf >= 3.11.0', 'grpcio >= 1.28.1', 'grpcio-tools >= 1.28.1', 'paddle_serving_client', 'flask >= 1.1.1', 'paddle_serving_app' ] diff --git a/tools/Dockerfile.gpu b/tools/Dockerfile.gpu index adb8e73f86a8fa436de3844a60f08ab22df0177e..145cd53eb0b9848349d591fdc078833ec5a89740 100644 --- a/tools/Dockerfile.gpu +++ b/tools/Dockerfile.gpu @@ -3,7 +3,7 @@ FROM nvidia/cuda:9.0-cudnn7-devel-centos7 as builder FROM nvidia/cuda:9.0-cudnn7-runtime-centos7 RUN yum -y install wget && \ yum -y install epel-release && yum -y install patchelf && \ - yum -y install gcc make python-devel && \ + yum -y install gcc gcc-c++ make python-devel && \ yum -y install libSM-1.2.2-2.el7.x86_64 --setopt=protected_multilib=false && \ yum -y install libXrender-0.9.10-1.el7.x86_64 --setopt=protected_multilib=false && \ yum -y install libXext-1.3.3-3.el7.x86_64 --setopt=protected_multilib=false && \ diff --git a/tools/Dockerfile.gpu.devel b/tools/Dockerfile.gpu.devel index 583b0566edf85f56c5fcc6f9f36dce6430ba7941..c101b32118bf735a100bdb07f2e33f7978a8a30c 100644 --- a/tools/Dockerfile.gpu.devel +++ b/tools/Dockerfile.gpu.devel @@ -1,7 +1,10 @@ FROM nvidia/cuda:9.0-cudnn7-devel-centos7 RUN yum -y install wget >/dev/null \ && yum -y install gcc gcc-c++ make glibc-static which \ - && yum -y install git openssl-devel curl-devel bzip2-devel python-devel + && yum -y install git openssl-devel curl-devel bzip2-devel python-devel \ + && yum -y install libSM-1.2.2-2.el7.x86_64 --setopt=protected_multilib=false \ + && yum -y install libXrender-0.9.10-1.el7.x86_64 --setopt=protected_multilib=false \ + && yum -y install libXext-1.3.3-3.el7.x86_64 --setopt=protected_multilib=false RUN wget https://cmake.org/files/v3.2/cmake-3.2.0-Linux-x86_64.tar.gz >/dev/null \ && tar xzf cmake-3.2.0-Linux-x86_64.tar.gz \