Merge remote-tracking branch 'upstream/develop' into general-server-doc

README.md

@@ -93,6 +93,8 @@ print(fetch_map)
 
 [Compile from source code(Chinese)](doc/COMPILE.md)
 
+[How profile serving efficiency?(Chinese)](https://github.com/PaddlePaddle/Serving/tree/develop/python/examples/util)
+
 [FAQ(Chinese)](doc/FAQ.md)
 
 [Design Doc(Chinese)](doc/DESIGN.md)

doc/COMPILE.md

@@ -25,20 +25,20 @@ export PYTHONROOT=/usr/
 
 #### 集成CPU版本Paddle Inference Library
 ``` shell
-cmake -DPYTHON_INCLUDE_DIR=$PYTHONROOT/include/python2.7/ -DPYTHON_LIBRARIES=$PYTHONROOT/lib/libpython2.7.so -DPYTHON_EXECUTABLE=/home/users/dongdaxiang/software/baidu/third-party/python/bin/python -DCLIENT_ONLY=OFF ..
+cmake -DPYTHON_INCLUDE_DIR=$PYTHONROOT/include/python2.7/ -DPYTHON_LIBRARIES=$PYTHONROOT/lib/libpython2.7.so -DPYTHON_EXECUTABLE=$PYTHONROOT/bin/python -DCLIENT_ONLY=OFF ..
 make -j10
 ```
 
 #### 集成GPU版本Paddle Inference Library
 ``` shell
-cmake -DPYTHON_INCLUDE_DIR=$PYTHONROOT/include/python2.7/ -DPYTHON_LIBRARIES=$PYTHONROOT/lib/libpython2.7.so -DPYTHON_EXECUTABLE=/home/users/dongdaxiang/software/baidu/third-party/python/bin/python -DCLIENT_ONLY=ON -DWITH_GPU=ON ..
+cmake -DPYTHON_INCLUDE_DIR=$PYTHONROOT/include/python2.7/ -DPYTHON_LIBRARIES=$PYTHONROOT/lib/libpython2.7.so -DPYTHON_EXECUTABLE=$PYTHONROOT/bin/python -DCLIENT_ONLY=OFF -DWITH_GPU=ON ..
 make -j10
 ```
 
 ### 编译Client部分
 
 ``` shell
-cmake -DPYTHON_INCLUDE_DIR=$PYTHONROOT/include/python2.7/ -DPYTHON_LIBRARIES=$PYTHONROOT/lib/libpython2.7.so -DPYTHON_EXECUTABLE=/home/users/dongdaxiang/software/baidu/third-party/python/bin/python -DCLIENT_ONLY=ON ..
+cmake -DPYTHON_INCLUDE_DIR=$PYTHONROOT/include/python2.7/ -DPYTHON_LIBRARIES=$PYTHONROOT/lib/libpython2.7.so -DPYTHON_EXECUTABLE=$PYTHONROOT/bin/python -DCLIENT_ONLY=ON ..
 make -j10
 ```
 

doc/CONTRIBUTE.md

@@ -38,20 +38,27 @@ Paddle Serving uses this [Git branching model](http://nvie.com/posts/a-successfu
    pre-commit install
    ```
 
-   Our pre-commit configuration requires clang-format 3.8 for auto-formating C/C++ code and yapf for Python.
+   Our pre-commit configuration requires clang-format 3.8 for auto-formating C/C++ code and yapf for Python. At the same time, cpplint and pylint are required to check the code style of C/C++ and Python respectively. You may need to install cpplint and pylint by running the following commands:
+
+   ```bash
+   pip install cpplint pylint
+   ```
 
    Once installed, `pre-commit` checks the style of code and documentation in every commit.  We will see something like the following when you run `git commit`:
 
    ```shell
    $  git commit
    CRLF end-lines remover...............................(no files to check)Skipped
-   yapf.................................................(no files to check)Skipped
+   yapf.....................................................................Passed
    Check for added large files..............................................Passed
    Check for merge conflicts................................................Passed
    Check for broken symlinks................................................Passed
    Detect Private Key...................................(no files to check)Skipped
-   Fix End of Files.....................................(no files to check)Skipped
-   clang-formater.......................................(no files to check)Skipped
+   Fix End of Files.........................................................Passed
+   clang-format.............................................................Passed
+   cpplint..................................................................Passed
+   pylint...................................................................Passed
+   copyright_checker........................................................Passed
    [my-cool-stuff c703c041] add test file
     1 file changed, 0 insertions(+), 0 deletions(-)
     create mode 100644 233
@@ -149,6 +156,6 @@ GLOG_minloglevel=1 bin/serving
 
 1 - WARNING
 
-2 -ERROR
+2 - ERROR
 
 3 - FATAL (Be careful as FATAL log will generate a coredump)

python/examples/imagenet/get_model.sh

-wget https://paddle-serving.bj.bcebos.com/imagenet-example/conf_and_model.tar.gz
+wget --no-check-certificate https://paddle-serving.bj.bcebos.com/imagenet-example/conf_and_model.tar.gz
 tar -xzvf conf_and_model.tar.gz

python/examples/imagenet/image_classification_service_gpu.py

+# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from paddle_serving_server_gpu.web_service import WebService
+import sys
+import os
+import base64
+from image_reader import ImageReader
+
+
+class ImageService(WebService):
+    """
+    preprocessing function for image classification
+    """
+
+    def preprocess(self, feed={}, fetch=[]):
+        reader = ImageReader()
+        if "image" not in feed:
+            raise ("feed data error!")
+        sample = base64.b64decode(feed["image"])
+        img = reader.process_image(sample)
+        res_feed = {}
+        res_feed["image"] = img.reshape(-1)
+        return res_feed, fetch
+
+
+image_service = ImageService(name="image")
+image_service.load_model_config(sys.argv[1])
+gpu_ids = os.environ["CUDA_VISIBLE_DEVICES"]
+gpus = [int(x) for x in gpu_ids.split(",")]
+image_service.set_gpus(gpus)
+image_service.prepare_server(
+    workdir=sys.argv[2], port=int(sys.argv[3]), device="gpu")
+image_service.run_server()

python/examples/imagenet/image_http_client.py

@@ -15,6 +15,7 @@
 import requests
 import base64
 import json
+import time
 
 
 def predict(image_path, server):
@@ -22,10 +23,14 @@ def predict(image_path, server):
     req = json.dumps({"image": image, "fetch": ["score"]})
     r = requests.post(
         server, data=req, headers={"Content-Type": "application/json"})
-    print(r.json()["score"])
 
 
 if __name__ == "__main__":
-    server = "http://127.0.0.1:9393/image/prediction"
+    server = "http://127.0.0.1:9292/image/prediction"
     image_path = "./data/n01440764_10026.JPEG"
-    predict(image_path, server)
+    start = time.time()
+    for i in range(1000):
+        predict(image_path, server)
+        print(i)
+    end = time.time()
+    print(end - start)

python/examples/imagenet/image_rpc_client.py

@@ -15,15 +15,21 @@
 import sys
 from image_reader import ImageReader
 from paddle_serving_client import Client
+import time
 
 client = Client()
 client.load_client_config(sys.argv[1])
-client.connect(["127.0.0.1:9393"])
+client.connect(["127.0.0.1:9292"])
 reader = ImageReader()
-with open("./data/n01440764_10026.JPEG") as f:
-    img = f.read()
 
-img = reader.process_image(img).reshape(-1)
-fetch_map = client.predict(feed={"image": img}, fetch=["score"])
+start = time.time()
+for i in range(1000):
+    with open("./data/n01440764_10026.JPEG") as f:
+        img = f.read()
+    img = reader.process_image(img).reshape(-1)
+    fetch_map = client.predict(feed={"image": img}, fetch=["score"])
+    print(i)
+end = time.time()
+print(end - start)
 
-print(fetch_map["score"])
+#print(fetch_map["score"])

python/paddle_serving_server/__init__.py

@@ -206,9 +206,11 @@ class Server(object):
             print('Frist time run, downloading PaddleServing components ...')
             r = os.system('wget ' + bin_url + ' --no-check-certificate')
             if r != 0:
-                print('Download failed')
                 if os.path.exists(tar_name):
                     os.remove(tar_name)
+                raise SystemExit(
+                    'Download failed, please check your network or permission of {}.'.
+                    format(self.module_path))
             else:
                 try:
                     print('Decompressing files ..')
@@ -218,6 +220,9 @@ class Server(object):
                 except:
                     if os.path.exists(exe_path):
                         os.remove(exe_path)
+                    raise SystemExit(
+                        'Decompressing failed, please check your permission of {} or disk space left.'.
+                        foemat(self.module_path))
                 finally:
                     os.remove(tar_name)
         os.chdir(self.cur_path)
@@ -231,7 +236,7 @@ class Server(object):
             os.system("mkdir {}".format(workdir))
         os.system("touch {}/fluid_time_file".format(workdir))
 
-        if not self.check_port(port):
+        if not self.port_is_available(port):
             raise SystemExit("Prot {} is already used".format(port))
         self._prepare_resource(workdir)
         self._prepare_engine(self.model_config_path, device)
@@ -248,7 +253,7 @@ class Server(object):
         self._write_pb_str(resource_fn, self.resource_conf)
         self._write_pb_str(model_toolkit_fn, self.model_toolkit_conf)
 
-    def check_port(self, port):
+    def port_is_available(self, port):
         with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as sock:
             sock.settimeout(2)
             result = sock.connect_ex(('127.0.0.1', port))

python/paddle_serving_server_gpu/__init__.py

@@ -214,9 +214,11 @@ class Server(object):
             print('Frist time run, downloading PaddleServing components ...')
             r = os.system('wget ' + bin_url + ' --no-check-certificate')
             if r != 0:
-                print('Download failed')
                 if os.path.exists(tar_name):
                     os.remove(tar_name)
+                raise SystemExit(
+                    'Download failed, please check your network or permission of {}.'.
+                    format(self.module_path))
             else:
                 try:
                     print('Decompressing files ..')
@@ -226,6 +228,9 @@ class Server(object):
                 except:
                     if os.path.exists(exe_path):
                         os.remove(exe_path)
+                    raise SystemExit(
+                        'Decompressing failed, please check your permission of {} or disk space left.'.
+                        format(self.module_path))
                 finally:
                     os.remove(tar_name)
         os.chdir(self.cur_path)
@@ -239,7 +244,7 @@ class Server(object):
             os.system("mkdir {}".format(workdir))
         os.system("touch {}/fluid_time_file".format(workdir))
 
-        if not self.check_port(port):
+        if not self.port_is_available(port):
             raise SystemExit("Prot {} is already used".format(port))
 
         self.set_port(port)
@@ -258,7 +263,7 @@ class Server(object):
         self._write_pb_str(resource_fn, self.resource_conf)
         self._write_pb_str(model_toolkit_fn, self.model_toolkit_conf)
 
-    def check_port(self, port):
+    def port_is_available(self, port):
         with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as sock:
             sock.settimeout(2)
             result = sock.connect_ex(('127.0.0.1', port))

python/paddle_serving_server_gpu/serve.py

@@ -64,6 +64,7 @@ def start_gpu_card_model(gpuid, args):  # pylint: disable=doc-string-missing
 def start_multi_card(args):  # pylint: disable=doc-string-missing
     gpus = ""
     if args.gpu_ids == "":
+        import os
         gpus = os.environ["CUDA_VISIBLE_DEVICES"]
     else:
         gpus = args.gpu_ids.split(",")

python/paddle_serving_server_gpu/web_serve.py

@@ -36,4 +36,4 @@ if __name__ == "__main__":
         web_service.set_gpus(gpus)
     web_service.prepare_server(
         workdir=args.workdir, port=args.port, device=args.device)
-    service.run_server()
+    web_service.run_server()

python/paddle_serving_server_gpu/web_service.py

@@ -107,6 +107,8 @@ class WebService(object):
             if "fetch" not in request.json:
                 abort(400)
             feed, fetch = self.preprocess(request.json, request.json["fetch"])
+            if "fetch" in feed:
+                del feed["fetch"]
             fetch_map = client_list[0].predict(feed=feed, fetch=fetch)
             fetch_map = self.postprocess(
                 feed=request.json, fetch=fetch, fetch_map=fetch_map)