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

python/examples/imagenet/README.md

@@ -21,7 +21,7 @@ python image_http_client.py
 
 启动server端
 ```
-python image_server.py conf_and_model/serving_server_model workdir 9393
+python -m paddle_serving_server.serve --model conf_and_model/serving_server_model/ --port 9393
 ```
 
 client端进行预测

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.1.2"
-serving_server_version = "0.1.2"
-module_proto_version = "0.1.2"
+serving_client_version = "0.1.3"
+serving_server_version = "0.1.3"
+module_proto_version = "0.1.3"

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.1.2"
-serving_server_version = "0.1.2"
-module_proto_version = "0.1.2"
+serving_client_version = "0.1.3"
+serving_server_version = "0.1.3"
+module_proto_version = "0.1.3"

python/paddle_serving_server_gpu/serve.py

@@ -17,6 +17,7 @@ Usage:
     Example:
         python -m paddle_serving_server.serve --model ./serving_server_model --port 9292
 """
+import os
 import argparse
 from multiprocessing import Pool, Process
 from paddle_serving_server_gpu import serve_args

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.1.2"
-serving_server_version = "0.1.2"
-module_proto_version = "0.1.2"
+serving_client_version = "0.1.3"
+serving_server_version = "0.1.3"
+module_proto_version = "0.1.3"

python/setup.py.client.in

@@ -23,10 +23,19 @@ from setuptools import setup, Distribution, Extension
 from setuptools import find_packages
 from setuptools import setup
 from paddle_serving_client.version import serving_client_version
+from pkg_resources import DistributionNotFound, get_distribution
+
         
 def python_version():
     return [int(v) for v in platform.python_version().split(".")]
 
+def find_package(pkgname):
+    try:
+        get_distribution(pkgname)
+        return True
+    except DistributionNotFound:
+        return False
+
 def copy_lib():
     os.popen('mkdir -p paddle_serving_client/lib')
     for lib in ['libpython2.7.so.1.0', 'libssl.so.10', 'libcrypto.so.10']:
@@ -41,9 +50,12 @@ if '${PACK}' == 'ON':
 
 
 REQUIRED_PACKAGES = [
-    'six >= 1.10.0', 'protobuf >= 3.1.0','paddlepaddle'
+    'six >= 1.10.0', 'protobuf >= 3.1.0'
 ]
 
+if not find_package("paddlepaddle") and not find_package("paddlepaddle-gpu"):
+    REQUIRED_PACKAGES.append("paddlepaddle")
+
 packages=['paddle_serving_client',
           'paddle_serving_client.proto',
           'paddle_serving_client.io',

python/setup.py.server.in

@@ -22,6 +22,14 @@ from setuptools import setup, Distribution, Extension
 from setuptools import find_packages
 from setuptools import setup
 from paddle_serving_server.version import serving_server_version
+from pkg_resources import DistributionNotFound, get_distribution
+
+def find_package(pkgname):
+    try:
+        get_distribution(pkgname)
+        return True
+    except DistributionNotFound:
+        return False
 
 def python_version():
     return [int(v) for v in platform.python_version().split(".")]
@@ -29,10 +37,13 @@ def python_version():
 max_version, mid_version, min_version = python_version()
 
 REQUIRED_PACKAGES = [
-    'six >= 1.10.0', 'protobuf >= 3.1.0','paddlepaddle',
+    'six >= 1.10.0', 'protobuf >= 3.1.0',
     'paddle_serving_client', 'flask >= 1.1.1'
 ]
 
+if not find_package("paddlepaddle") and not find_package("paddlepaddle-gpu"):
+    REQUIRED_PACKAGES.append("paddlepaddle")
+
 packages=['paddle_serving_server',
           'paddle_serving_server.proto']
 

python/setup.py.server_gpu.in

@@ -22,6 +22,14 @@ from setuptools import setup, Distribution, Extension
 from setuptools import find_packages
 from setuptools import setup
 from paddle_serving_server_gpu.version import serving_server_version
+from pkg_resources import DistributionNotFound, get_distribution
+
+def find_package(pkgname):
+    try:
+        get_distribution(pkgname)
+        return True
+    except DistributionNotFound:
+        return False
 
 def python_version():
     return [int(v) for v in platform.python_version().split(".")]
@@ -29,10 +37,13 @@ def python_version():
 max_version, mid_version, min_version = python_version()
 
 REQUIRED_PACKAGES = [
-    'six >= 1.10.0', 'protobuf >= 3.1.0','paddlepaddle',
-    'paddle_serving_client'
+    'six >= 1.10.0', 'protobuf >= 3.1.0',
+    'paddle_serving_client', 'flask >= 1.1.1'
 ]
 
+if not find_package("paddlepaddle") and not find_package("paddlepaddle-gpu"):
+    REQUIRED_PACKAGES.append("paddlepaddle") 
+
 packages=['paddle_serving_server_gpu',
           'paddle_serving_server_gpu.proto']