From cea8f6cc23f643ab15943f55af3f58f44c00eaf4 Mon Sep 17 00:00:00 2001 From: MRXLT Date: Tue, 17 Mar 2020 13:55:05 +0800 Subject: [PATCH] update inference lib to 1.7.1 && support py3 --- cmake/paddlepaddle.cmake | 2 +- core/general-client/CMakeLists.txt | 2 ++ python/paddle_serving_server/__init__.py | 2 +- python/paddle_serving_server_gpu/__init__.py | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake/paddlepaddle.cmake b/cmake/paddlepaddle.cmake index 78d70071..c9ac3d2f 100644 --- a/cmake/paddlepaddle.cmake +++ b/cmake/paddlepaddle.cmake @@ -31,7 +31,7 @@ message( "WITH_GPU = ${WITH_GPU}") # Paddle Version should be one of: # latest: latest develop build # version number like 1.5.2 -SET(PADDLE_VERSION "1.6.3") +SET(PADDLE_VERSION "1.7.1") if (WITH_GPU) SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-gpu-cuda${CUDA_VERSION_MAJOR}-cudnn7-avx-mkl") diff --git a/core/general-client/CMakeLists.txt b/core/general-client/CMakeLists.txt index f3bb666a..b6d2eeab 100644 --- a/core/general-client/CMakeLists.txt +++ b/core/general-client/CMakeLists.txt @@ -2,4 +2,6 @@ if(CLIENT_ONLY) 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) +file(GLOB so ${PADDLE_SERVING_BINARY_DIR}/core/general-client/serving_client.*) +file(RENAME ${so} ${PADDLE_SERVING_BINARY_DIR}/core/general-client/serving_client.so) endif() diff --git a/python/paddle_serving_server/__init__.py b/python/paddle_serving_server/__init__.py index ed4c6b76..87c6b496 100644 --- a/python/paddle_serving_server/__init__.py +++ b/python/paddle_serving_server/__init__.py @@ -19,7 +19,7 @@ import google.protobuf.text_format import tarfile import socket import paddle_serving_server as paddle_serving_server -from version import serving_server_version +from .version import serving_server_version from contextlib import closing diff --git a/python/paddle_serving_server_gpu/__init__.py b/python/paddle_serving_server_gpu/__init__.py index d8bcd7bb..8ee1e137 100644 --- a/python/paddle_serving_server_gpu/__init__.py +++ b/python/paddle_serving_server_gpu/__init__.py @@ -20,7 +20,7 @@ import google.protobuf.text_format import tarfile import socket import paddle_serving_server_gpu as paddle_serving_server -from version import serving_server_version +from .version import serving_server_version from contextlib import closing import argparse -- GitLab