Merge pull request #1003 from wangjiawei04/v0.4.1

cherry-pick 1002 1001

python/examples/encryption/README.md

@@ -12,6 +12,7 @@ sh get_data.sh
 
 ## Encrypt Model
 
+The `paddlepaddle` package is used in this example, you may need to download the corresponding package(`pip install paddlepaddle`).
 ```
 python encrypt.py
 ```

python/examples/encryption/README_CN.md

@@ -11,7 +11,7 @@ sh get_data.sh
 ```
 
 ## 模型加密
-
+本示例中使用了`paddlepaddle`包中的模块，需要进行下载（`pip install paddlepaddle`）。
 ```
 python encrypt.py
 ```

python/paddle_serving_server/serve.py

@@ -23,9 +23,12 @@ import json
 import base64
 import time
 from multiprocessing import Process
-from web_service import WebService, port_is_available
+from .web_service import WebService, port_is_available
 from flask import Flask, request
-from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+if sys.version_info.major == 2:
+    from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+elif sys.version_info.major == 3:
+    from http.server import BaseHTTPRequestHandler, HTTPServer
 
 
 def parse_args():  # pylint: disable=doc-string-missing

python/paddle_serving_server_gpu/__init__.py

@@ -771,6 +771,9 @@ class MultiLangServer(object):
         self.concurrency_ = concurrency
         self.bserver_.set_max_concurrency(concurrency)
 
+    def set_device(self, device="cpu"):
+        self.device = device
+
     def set_num_threads(self, threads):
         self.worker_num_ = threads
         self.bserver_.set_num_threads(threads)

python/paddle_serving_server_gpu/serve.py

@@ -25,7 +25,10 @@ import time
 from multiprocessing import Pool, Process
 from paddle_serving_server_gpu import serve_args
 from flask import Flask, request
-from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+if sys.version_info.major == 2:
+    from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+elif sys.version_info.major == 3:
+    from http.server import BaseHTTPRequestHandler, HTTPServer
 
 
 def start_gpu_card_model(index, gpuid, port, args):  # pylint: disable=doc-string-missing