Skip to content

Commit 2d7ef7a

Browse files
authored
update trt version from major to full (#33690)
1 parent 50f885f commit 2d7ef7a

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

cmake/inference_lib.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ function(version version_file)
342342
file(APPEND ${version_file} "CXX compiler version: ${CMAKE_CXX_COMPILER_VERSION}\n")
343343
if(TENSORRT_FOUND)
344344
file(APPEND ${version_file}
345-
"WITH_TENSORRT: ${TENSORRT_FOUND}\n" "TensorRT version: v${TENSORRT_MAJOR_VERSION}\n")
345+
"WITH_TENSORRT: ${TENSORRT_FOUND}\n" "TensorRT version: v${TENSORRT_MAJOR_VERSION}.${TENSORRT_MINOR_VERSION}.${TENSORRT_PATCH_VERSION}.${TENSORRT_BUILD_VERSION}\n")
346346
endif()
347347
if(WITH_LITE)
348348
file(APPEND ${version_file} "WITH_LITE: ${WITH_LITE}\n" "LITE_GIT_TAG: ${LITE_GIT_TAG}\n")

cmake/tensorrt.cmake

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,23 @@ if(TENSORRT_FOUND)
4747
file(READ ${TENSORRT_INCLUDE_DIR}/NvInfer.h TENSORRT_VERSION_FILE_CONTENTS)
4848
string(REGEX MATCH "define NV_TENSORRT_MAJOR +([0-9]+)" TENSORRT_MAJOR_VERSION
4949
"${TENSORRT_VERSION_FILE_CONTENTS}")
50+
string(REGEX MATCH "define NV_TENSORRT_MINOR +([0-9]+)" TENSORRT_MINOR_VERSION
51+
"${TENSORRT_VERSION_FILE_CONTENTS}")
52+
string(REGEX MATCH "define NV_TENSORRT_PATCH +([0-9]+)" TENSORRT_PATCH_VERSION
53+
"${TENSORRT_VERSION_FILE_CONTENTS}")
54+
string(REGEX MATCH "define NV_TENSORRT_BUILD +([0-9]+)" TENSORRT_BUILD_VERSION
55+
"${TENSORRT_VERSION_FILE_CONTENTS}")
5056

5157
if("${TENSORRT_MAJOR_VERSION}" STREQUAL "")
5258
file(READ ${TENSORRT_INCLUDE_DIR}/NvInferVersion.h TENSORRT_VERSION_FILE_CONTENTS)
5359
string(REGEX MATCH "define NV_TENSORRT_MAJOR +([0-9]+)" TENSORRT_MAJOR_VERSION
5460
"${TENSORRT_VERSION_FILE_CONTENTS}")
61+
string(REGEX MATCH "define NV_TENSORRT_MINOR +([0-9]+)" TENSORRT_MINOR_VERSION
62+
"${TENSORRT_VERSION_FILE_CONTENTS}")
63+
string(REGEX MATCH "define NV_TENSORRT_PATCH +([0-9]+)" TENSORRT_PATCH_VERSION
64+
"${TENSORRT_VERSION_FILE_CONTENTS}")
65+
string(REGEX MATCH "define NV_TENSORRT_BUILD +([0-9]+)" TENSORRT_BUILD_VERSION
66+
"${TENSORRT_VERSION_FILE_CONTENTS}")
5567
endif()
5668

5769
if("${TENSORRT_MAJOR_VERSION}" STREQUAL "")
@@ -60,9 +72,15 @@ if(TENSORRT_FOUND)
6072

6173
string(REGEX REPLACE "define NV_TENSORRT_MAJOR +([0-9]+)" "\\1"
6274
TENSORRT_MAJOR_VERSION "${TENSORRT_MAJOR_VERSION}")
75+
string(REGEX REPLACE "define NV_TENSORRT_MINOR +([0-9]+)" "\\1"
76+
TENSORRT_MINOR_VERSION "${TENSORRT_MINOR_VERSION}")
77+
string(REGEX REPLACE "define NV_TENSORRT_PATCH +([0-9]+)" "\\1"
78+
TENSORRT_PATCH_VERSION "${TENSORRT_PATCH_VERSION}")
79+
string(REGEX REPLACE "define NV_TENSORRT_BUILD +([0-9]+)" "\\1"
80+
TENSORRT_BUILD_VERSION "${TENSORRT_BUILD_VERSION}")
6381

6482
message(STATUS "Current TensorRT header is ${TENSORRT_INCLUDE_DIR}/NvInfer.h. "
65-
"Current TensorRT version is v${TENSORRT_MAJOR_VERSION}. ")
83+
"Current TensorRT version is v${TENSORRT_MAJOR_VERSION}.${TENSORRT_MINOR_VERSION}.${TENSORRT_PATCH_VERSION}.${TENSORRT_BUILD_VERSION} ")
6684
include_directories(${TENSORRT_INCLUDE_DIR})
6785
link_directories(${TENSORRT_LIBRARY})
6886
add_definitions(-DPADDLE_WITH_TENSORRT)

0 commit comments

Comments
 (0)