diff --git a/cmake/paddlepaddle.cmake b/cmake/paddlepaddle.cmake index 78d700718ae6d737ccc422288e88d0b094fab4c3..c9ac3d2f04db833f34211af3cc7aaac2d5184bf9 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/python/CMakeLists.txt b/python/CMakeLists.txt index d6149590744c9ede91175eaf4e307474f74c10b2..855b006949e8b621260e7ed86c4a8c86e2332104 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -31,15 +31,14 @@ if (NOT CLIENT_ONLY) endif() endif() -set(SERVING_CLIENT_CORE ${PADDLE_SERVING_BINARY_DIR}/core/general-client/serving_client.so) - +set (SERVING_CLIENT_CORE ${PADDLE_SERVING_BINARY_DIR}/core/general-client/*.so) message("python env: " ${py_env}) if (CLIENT_ONLY) add_custom_command( OUTPUT ${PADDLE_SERVING_BINARY_DIR}/.timestamp COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/paddle_serving_client/ ${PADDLE_SERVING_BINARY_DIR}/python/ - COMMAND ${CMAKE_COMMAND} -E copy ${PADDLE_SERVING_BINARY_DIR}/core/general-client/serving_client.so ${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client/ + COMMAND ${CMAKE_COMMAND} -E copy ${SERVING_CLIENT_CORE} ${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client/serving_client.so COMMAND env ${py_env} ${PYTHON_EXECUTABLE} setup.py bdist_wheel DEPENDS ${SERVING_CLIENT_CORE} sdk_configure_py_proto ${PY_FILES}) add_custom_target(paddle_python ALL DEPENDS serving_client ${PADDLE_SERVING_BINARY_DIR}/.timestamp) diff --git a/python/paddle_serving_server/__init__.py b/python/paddle_serving_server/__init__.py index ed4c6b76110e6fb6a4bce41d04d3b84d3857d5ba..87c6b4960e439dd529cc0354c667c244369c133a 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 d8bcd7bbf6aa827ff80fa455726b6f3f356eb810..8ee1e137fb8fe282d26bda95e4b4bffa6f670f11 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