update trt version from major to full

PaddlePaddle · Jun 21, 2021 · 6f11fe6 · 6f11fe6 · paddle-bot-old · Jun 21, 2021
1 parent f91dfe1
commit 6f11fe6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake
@@ -342,7 +342,7 @@ function(version version_file)
     file(APPEND ${version_file} "CXX compiler version: ${CMAKE_CXX_COMPILER_VERSION}\n")
     if(TENSORRT_FOUND)
         file(APPEND ${version_file}
-                "WITH_TENSORRT: ${TENSORRT_FOUND}\n" "TensorRT version: v${TENSORRT_MAJOR_VERSION}\n")
+                "WITH_TENSORRT: ${TENSORRT_FOUND}\n" "TensorRT version: v${TENSORRT_MAJOR_VERSION}.${TENSORRT_MINOR_VERSION}.${TENSORRT_PATCH_VERSION}.${TENSORRT_BUILD_VERSION}\n")
     endif()
     if(WITH_LITE)
         file(APPEND ${version_file} "WITH_LITE: ${WITH_LITE}\n" "LITE_GIT_TAG: ${LITE_GIT_TAG}\n")

diff --git a/cmake/tensorrt.cmake b/cmake/tensorrt.cmake
@@ -47,11 +47,23 @@ if(TENSORRT_FOUND)
     file(READ ${TENSORRT_INCLUDE_DIR}/NvInfer.h TENSORRT_VERSION_FILE_CONTENTS)
     string(REGEX MATCH "define NV_TENSORRT_MAJOR +([0-9]+)" TENSORRT_MAJOR_VERSION
         "${TENSORRT_VERSION_FILE_CONTENTS}")
+    string(REGEX MATCH "define NV_TENSORRT_MINOR +([0-9]+)" TENSORRT_MINOR_VERSION
+        "${TENSORRT_VERSION_FILE_CONTENTS}")
+    string(REGEX MATCH "define NV_TENSORRT_PATCH +([0-9]+)" TENSORRT_PATCH_VERSION
+        "${TENSORRT_VERSION_FILE_CONTENTS}")
+    string(REGEX MATCH "define NV_TENSORRT_BUILD +([0-9]+)" TENSORRT_BUILD_VERSION
+        "${TENSORRT_VERSION_FILE_CONTENTS}")
 
     if("${TENSORRT_MAJOR_VERSION}" STREQUAL "")
         file(READ ${TENSORRT_INCLUDE_DIR}/NvInferVersion.h TENSORRT_VERSION_FILE_CONTENTS)
         string(REGEX MATCH "define NV_TENSORRT_MAJOR +([0-9]+)" TENSORRT_MAJOR_VERSION
         "${TENSORRT_VERSION_FILE_CONTENTS}")
+        string(REGEX MATCH "define NV_TENSORRT_MINOR +([0-9]+)" TENSORRT_MINOR_VERSION
+        "${TENSORRT_VERSION_FILE_CONTENTS}")
+        string(REGEX MATCH "define NV_TENSORRT_PATCH +([0-9]+)" TENSORRT_PATCH_VERSION
+        "${TENSORRT_VERSION_FILE_CONTENTS}")
+        string(REGEX MATCH "define NV_TENSORRT_BUILD +([0-9]+)" TENSORRT_BUILD_VERSION
+        "${TENSORRT_VERSION_FILE_CONTENTS}")
     endif()
 
     if("${TENSORRT_MAJOR_VERSION}" STREQUAL "")
@@ -60,9 +72,15 @@ if(TENSORRT_FOUND)
 
     string(REGEX REPLACE "define NV_TENSORRT_MAJOR +([0-9]+)" "\\1"
         TENSORRT_MAJOR_VERSION "${TENSORRT_MAJOR_VERSION}")
+    string(REGEX REPLACE "define NV_TENSORRT_MINOR +([0-9]+)" "\\1"
+        TENSORRT_MINOR_VERSION "${TENSORRT_MINOR_VERSION}")
+    string(REGEX REPLACE "define NV_TENSORRT_PATCH +([0-9]+)" "\\1"
+        TENSORRT_PATCH_VERSION "${TENSORRT_PATCH_VERSION}")
+    string(REGEX REPLACE "define NV_TENSORRT_BUILD +([0-9]+)" "\\1"
+        TENSORRT_BUILD_VERSION "${TENSORRT_BUILD_VERSION}")
 
     message(STATUS "Current TensorRT header is ${TENSORRT_INCLUDE_DIR}/NvInfer.h. "
-        "Current TensorRT version is v${TENSORRT_MAJOR_VERSION}. ")
+        "Current TensorRT version is v${TENSORRT_MAJOR_VERSION}.${TENSORRT_MINOR_VERSION}.${TENSORRT_PATCH_VERSION}.${TENSORRT_BUILD_VERSION} ")
     include_directories(${TENSORRT_INCLUDE_DIR})
     link_directories(${TENSORRT_LIBRARY})
     add_definitions(-DPADDLE_WITH_TENSORRT)