Merge pull request #539 from MRXLT/compatible

improve compatibility

core/general-client/CMakeLists.txt

 if(CLIENT)
 add_subdirectory(pybind11)
 pybind11_add_module(serving_client src/general_model.cpp src/pybind_general_model.cpp)
-target_link_libraries(serving_client PRIVATE -Wl,--whole-archive utils sdk-cpp pybind python -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl -lz)
+target_link_libraries(serving_client PRIVATE -Wl,--whole-archive utils sdk-cpp pybind python -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl -lz -Wl,-rpath,'$ORIGIN'/lib)
 endif()

python/examples/imagenet/README.md

@@ -8,6 +8,13 @@ The example uses the ResNet50_vd model to perform the imagenet 1000 classificati
 ```
 sh get_model.sh
 ```
+
+### Install preprocess module
+
+```
+pip install paddle_serving_app
+```
+
 ### HTTP Infer
 
 launch server side

python/examples/imagenet/README_CN.md

@@ -8,6 +8,13 @@
 ```
 sh get_model.sh
 ```
+
+### 安装数据预处理模块
+
+```
+pip install paddle_serving_app
+```
+
 ### 执行HTTP预测服务
 
 启动server端

python/examples/lac/lac_reader.py

@@ -14,8 +14,10 @@
 
 from paddle_serving_client import Client
 import sys
-reload(sys)
-sys.setdefaultencoding('utf-8')
+py_version = sys.version_info[0]
+if py_version == 2:
+    reload(sys)
+    sys.setdefaultencoding('utf-8')
 import os
 import io
 

python/examples/senta/README.md

@@ -4,6 +4,12 @@
 ```
 sh get_data.sh
 ```
+## Install preprocess module
+
+```
+pip install paddle_serving_app
+```
+
 ## Start http service
 ```
 python senta_web_service.py senta_bilstm_model/ workdir 9292

python/examples/senta/README_CN.md

@@ -4,6 +4,11 @@
 ```
 sh get_data.sh
 ```
+## 安装数据预处理模块
+```
+pip install paddle_serving_app
+```
+
 ## 启动HTTP服务
 ```
 python senta_web_service.py senta_bilstm_model/ workdir 9292

python/paddle_serving_app/reader/image_reader.py

@@ -16,7 +16,7 @@ import os
 import urllib
 import numpy as np
 import base64
-import functional as F
+from . import functional as F
 from PIL import Image, ImageDraw
 import json
 

python/paddle_serving_app/reader/lac_reader.py

@@ -12,10 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle_serving_client import Client
 import sys
-reload(sys)
-sys.setdefaultencoding('utf-8')
+py_version = sys.version_info[0]
+if py_version == 2:
+    reload(sys)
+    sys.setdefaultencoding('utf-8')
 import os
 import io
 

python/paddle_serving_client/__init__.py

@@ -112,7 +112,6 @@ class Client(object):
         self.feed_shapes_ = {}
         self.feed_types_ = {}
         self.feed_names_to_idx_ = {}
-        self.rpath()
         self.pid = os.getpid()
         self.predictor_sdk_ = None
         self.producers = []
@@ -121,16 +120,6 @@ class Client(object):
         self.all_numpy_input = True
         self.has_numpy_input = False
 
-    def rpath(self):
-        lib_path = os.path.dirname(paddle_serving_client.__file__)
-        client_path = os.path.join(lib_path, 'serving_client.so')
-        lib_path = os.path.join(lib_path, 'lib')
-        ld_path = os.getenv('LD_LIBRARY_PATH')
-        if ld_path == None:
-            os.environ['LD_LIBRARY_PATH'] = lib_path
-        elif ld_path not in lib_path:
-            os.environ['LD_LIBRARY_PATH'] = ld_path + ':' + lib_path
-
     def load_client_config(self, path):
         from .serving_client import PredictorClient
         from .serving_client import PredictorRes

python/setup.py.client.in

@@ -26,7 +26,7 @@ from setuptools import setup
 from paddle_serving_client.version import serving_client_version
 from pkg_resources import DistributionNotFound, get_distribution
 
-py_version = sys.version_info[0]
+py_version = sys.version_info
         
 def python_version():
     return [int(v) for v in platform.python_version().split(".")]
@@ -39,7 +39,12 @@ def find_package(pkgname):
         return False
 
 def copy_lib():
-    lib_list = ['libpython2.7.so.1.0', 'libssl.so.10', 'libcrypto.so.10'] if py_version == 2 else ['libpython3.6m.so.1.0', 'libssl.so.10', 'libcrypto.so.10']
+    if py_version[0] == 2:
+        lib_list = ['libpython2.7.so.1.0', 'libssl.so.10', 'libcrypto.so.10'] 
+    elif py_version[1] == 6:
+        lib_list = ['libpython3.6m.so.1.0', 'libssl.so.10', 'libcrypto.so.10']
+    elif py_version[1] == 7:
+        lib_list = ['libpython3.7m.so.1.0', 'libssl.so.10', 'libcrypto.so.10']
     os.popen('mkdir -p paddle_serving_client/lib')
     for lib in lib_list:
         r = os.popen('whereis {}'.format(lib))