@@ -15,9 +15,7 @@ set(DEEPMD_C_ROOT
1515 ""
1616 CACHE PATH "Path to imported DeePMD-kit C library" )
1717
18- if (NOT DEFINED CMAKE_CXX_STANDARD)
19- set (CMAKE_CXX_STANDARD 11)
20- endif ()
18+ set (CMAKE_CXX_STANDARD 11)
2119macro (set_if_higher VARIABLE VALUE )
2220 # ${VARIABLE} is a variable name, not a string
2321 if (${VARIABLE} LESS "${VALUE} " )
@@ -37,21 +35,23 @@ if(ENABLE_PADDLE)
3735 find_package (CUDAToolkit REQUIRED)
3836 string (REGEX MATCH "^[0-9]+" CUDA_MAJOR_VERSION "${CUDAToolkit_VERSION} " )
3937 message (STATUS "Find CUDAToolkit_VERSION: ${CUDAToolkit_VERSION} " )
38+ # "6ed5dd3" is the commit id of paddle release/3.0, see:
39+ # https://github.com/PaddlePaddle/Paddle/tree/v3.0.0
4040 if (CUDA_MAJOR_VERSION VERSION_EQUAL "11" )
4141 message (
4242 STATUS
43- "PADDLE_INFERENCE_DIR is not defined, downloading CUDA11.8 infernece lib to: ${CMAKE_BINARY_DIR} /"
43+ "PADDLE_INFERENCE_DIR is not defined, downloading CUDA11.8 inference lib to: ${CMAKE_BINARY_DIR} /"
4444 )
4545 set (DOWNLOAD_URL
46- "https://paddle-qa.bj.bcebos.com/paddle-pipeline/GITHUB_Docker_Compile_Test_Cuda118_cudnn860_Trt8531_D1/latest /paddle_inference.tgz"
46+ "https://paddle-qa.bj.bcebos.com/paddle-pipeline/GITHUB_Docker_Compile_Test_Cuda118_cudnn897_Trt8616_D1/6ed5dd3833c32c3b21e14b1fb1a71f5a535a0fcc /paddle_inference.tgz"
4747 )
4848 elseif (CUDA_MAJOR_VERSION VERSION_EQUAL "12" )
4949 message (
5050 STATUS
51- "PADDLE_INFERENCE_DIR is not defined, downloading CUDA12.3 infernece lib to: ${CMAKE_BINARY_DIR} /"
51+ "PADDLE_INFERENCE_DIR is not defined, downloading CUDA12.6 inference lib to: ${CMAKE_BINARY_DIR} /"
5252 )
5353 set (DOWNLOAD_URL
54- "https://paddle-qa.bj.bcebos.com/paddle-pipeline/GITHUB_Docker_Compile_Test_Cuda123_cudnn900_Trt8616_D1/latest /paddle_inference.tgz"
54+ "https://paddle-qa.bj.bcebos.com/paddle-pipeline/GITHUB_Docker_Compile_Test_Cuda126_cudnn951_Trt105018_D1/6ed5dd3833c32c3b21e14b1fb1a71f5a535a0fcc /paddle_inference.tgz"
5555 )
5656 else ()
5757 message (
@@ -62,10 +62,10 @@ if(ENABLE_PADDLE)
6262 else ()
6363 message (
6464 STATUS
65- "PADDLE_INFERENCE_DIR is not defined, downloading CPU infernece lib to: ${CMAKE_BINARY_DIR} /"
65+ "PADDLE_INFERENCE_DIR is not defined, downloading CPU inference lib to: ${CMAKE_BINARY_DIR} /"
6666 )
6767 set (DOWNLOAD_URL
68- "https://paddle-qa.bj.bcebos.com/paddle-pipeline/GITHUB_Docker_Compile_Test_Cpu_Mkl_Avx_D1/latest /paddle_inference.tgz"
68+ "https://paddle-qa.bj.bcebos.com/paddle-pipeline/GITHUB_Docker_Compile_Test_Cpu_Mkl_Avx_D1/6ed5dd3833c32c3b21e14b1fb1a71f5a535a0fcc /paddle_inference.tgz"
6969 )
7070 endif ()
7171 set (TGZ_FILE "${CMAKE_BINARY_DIR} /paddle_inference.tgz" )
@@ -580,7 +580,7 @@ if(BUILD_CPP_IF
580580 set (version_file "${generated_dir} /${CMAKE_PROJECT_NAME} ConfigVersion.cmake" )
581581 write_basic_package_version_file(
582582 ${version_file}
583- VERSION $<IF:${GIT_SUMM} ?${GIT_SUMM} :0.0.0>
583+ VERSION $<IF:${GIT_SUMM} ?${GIT_SUMM} :" 0.0.0" >
584584 COMPATIBILITY AnyNewerVersion)
585585 install (
586586 EXPORT ${targets_export_name}
0 commit comments