Merge branch 'PaddlePaddle:develop' into develop

cmake/paddlepaddle.cmake

@@ -58,9 +58,9 @@ elseif (WITH_LITE)
     message("cpu arch: ${CMAKE_SYSTEM_PROCESSOR}")
     if (WITH_XPU)
         if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-            SET(PADDLE_LIB_VERSION "x86-64_gcc8.2_avx_mkl")
+            SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}/cxx_c/Linux/XPU/x86-64_gcc8.2_py36_avx_mkl")
         elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-            SET(PADDLE_LIB_VERSION "arm64_gcc7.3_openblas")
+            SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}/cxx_c/Linux/XPU/arm64_gcc7.3_py36_openblas")
         endif()
     elseif (WITH_ASCEND_CL)
         if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
@@ -97,7 +97,7 @@ endif()
 
 if(WITH_LITE)
     if (WITH_XPU)
-        SET(PADDLE_LIB_PATH "https://paddle-inference-lib.bj.bcebos.com/2.2.0-rc0/cxx_c/Linux/XPU/${PADDLE_LIB_VERSION}/paddle_inference_install_dir.tar.gz ")
+        SET(PADDLE_LIB_PATH "https://paddle-inference-lib.bj.bcebos.com/${PADDLE_LIB_VERSION}/paddle_inference_install_dir.tar.gz ")
     elseif (WITH_ASCEND_CL)
         SET(PADDLE_LIB_PATH "http://paddle-serving.bj.bcebos.com/inferlib/${PADDLE_LIB_VERSION}/paddle_inference_install_dir.tgz ")
     endif()