diff --git a/cmake/paddlepaddle.cmake b/cmake/paddlepaddle.cmake index 78c398010153d9aa482388bfad34cb71ffd01c6e..240c85762e41dc15fa9c9e559c0857352d1ba39c 100644 --- a/cmake/paddlepaddle.cmake +++ b/cmake/paddlepaddle.cmake @@ -31,48 +31,50 @@ message( "WITH_GPU = ${WITH_GPU}") # Paddle Version should be one of: # latest: latest develop build # version number like 1.5.2 -SET(PADDLE_VERSION "2.1.0") +SET(PADDLE_VERSION "2.2.0-rc0") if (WITH_GPU) - if(CUDA_VERSION EQUAL 11.0) - set(CUDA_SUFFIX "cuda11.0-cudnn8-mkl-gcc8.2") + # cuda 11.0 is not supported, 11.2 would be added. + if(CUDA_VERSION EQUAL 10.1) + set(CUDA_SUFFIX "x86-64_gcc8.2_avx_mkl_cuda10.1_cudnn7.6.5_trt6.0.1.5") set(WITH_TRT ON) elseif(CUDA_VERSION EQUAL 10.2) - set(CUDA_SUFFIX "cuda10.2-cudnn8-mkl-gcc8.2") - set(WITH_TRT ON) - elseif(CUDA_VERSION EQUAL 10.1) - set(CUDA_SUFFIX "cuda10.1-cudnn7-mkl-gcc8.2") + if(CUDNN_MAJOR_VERSION EQUAL 7) + set(CUDA_SUFFIX "x86-64_gcc5.4_avx_mkl_cuda10.2_cudnn7.6.5_trt6.0.1.5") + set(WITH_TRT ON) + elseif(CUDNN_MAJOR_VERSION EQUAL 8) + set(CUDA_SUFFIX "x86-64_gcc8.2_avx_mkl_cuda10.2_cudnn8.1.1_trt7.2.3.4") + set(WITH_TRT ON) + endif() + elseif(CUDA_VERSION EQUAL 11.2) + set(CUDA_SUFFIX "x86-64_gcc8.2_avx_mkl_cuda11.2_cudnn8.2.1_trt8.0.3.4") set(WITH_TRT ON) - elseif(CUDA_VERSION EQUAL 10.0) - set(CUDA_SUFFIX "cuda10-cudnn7-avx-mkl") - elseif(CUDA_VERSION EQUAL 9.0) - set(CUDA_SUFFIX "cuda9-cudnn7-avx-mkl") endif() else() set(WITH_TRT OFF) endif() if (WITH_GPU) - SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-gpu-${CUDA_SUFFIX}") + SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}/cxx_c/Linux/GPU/${CUDA_SUFFIX}") elseif (WITH_LITE) if (WITH_XPU) - SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-${CMAKE_SYSTEM_PROCESSOR}-xpu") + SET(PADDLE_LIB_VERSION "arm64_gcc7.3_openblas") else() SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-${CMAKE_SYSTEM_PROCESSOR}") endif() else() if (WITH_AVX) if (WITH_MKLML) - SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-cpu-avx-mkl") + SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}/cxx_c/Linux/CPU/gcc8.2_avx_mkl") else() - SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-cpu-avx-openblas") + SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}/cxx_c/Linux/CPU/gcc8.2_avx_openblas") endif() else() - SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-cpu-noavx-openblas") + SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}/cxx_c/Linux/CPU/gcc8.2_openblas") endif() endif() if(WITH_LITE) - SET(PADDLE_LIB_PATH "http://paddle-serving.bj.bcebos.com/inferlib/${PADDLE_LIB_VERSION}/paddle_inference.tgz") + 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 ") else() SET(PADDLE_LIB_PATH "http://paddle-inference-lib.bj.bcebos.com/${PADDLE_LIB_VERSION}/paddle_inference.tgz") endif()