提交 7f2e46ec 编写于 作者: M MRXLT

update inference lib to 1.7.1 && support py3

上级 48baddc2
...@@ -31,7 +31,7 @@ message( "WITH_GPU = ${WITH_GPU}") ...@@ -31,7 +31,7 @@ message( "WITH_GPU = ${WITH_GPU}")
# Paddle Version should be one of: # Paddle Version should be one of:
# latest: latest develop build # latest: latest develop build
# version number like 1.5.2 # version number like 1.5.2
SET(PADDLE_VERSION "1.6.3") SET(PADDLE_VERSION "1.7.1")
if (WITH_GPU) if (WITH_GPU)
SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-gpu-cuda${CUDA_VERSION_MAJOR}-cudnn7-avx-mkl") SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-gpu-cuda${CUDA_VERSION_MAJOR}-cudnn7-avx-mkl")
......
...@@ -2,4 +2,6 @@ if(CLIENT_ONLY) ...@@ -2,4 +2,6 @@ if(CLIENT_ONLY)
add_subdirectory(pybind11) add_subdirectory(pybind11)
pybind11_add_module(serving_client src/general_model.cpp src/pybind_general_model.cpp) 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)
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() endif()
...@@ -19,7 +19,7 @@ import google.protobuf.text_format ...@@ -19,7 +19,7 @@ import google.protobuf.text_format
import tarfile import tarfile
import socket import socket
import paddle_serving_server as paddle_serving_server import paddle_serving_server as paddle_serving_server
from version import serving_server_version from .version import serving_server_version
from contextlib import closing from contextlib import closing
......
...@@ -20,7 +20,7 @@ import google.protobuf.text_format ...@@ -20,7 +20,7 @@ import google.protobuf.text_format
import tarfile import tarfile
import socket import socket
import paddle_serving_server_gpu as paddle_serving_server 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 from contextlib import closing
import argparse import argparse
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册