cherry-pick prs. (#33932)

cmake/inference_lib.cmake

@@ -345,7 +345,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")

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)

paddle/fluid/inference/api/paddle_analysis_config.h

@@ -678,7 +678,7 @@ struct PD_INFER_DECL AnalysisConfig {
   bool xpu_adaptive_seqlen_;
 
   // mkldnn related.
-  int mkldnn_cache_capacity_{0};
+  int mkldnn_cache_capacity_{10};
   bool use_mkldnn_quantizer_{false};
   std::shared_ptr<MkldnnQuantizerConfig> mkldnn_quantizer_config_;
   bool use_mkldnn_bfloat16_{false};

tools/remove_grad_op_and_kernel.py

@@ -20,6 +20,7 @@ import os
 import sys
 import re
 import glob
+import io
 
 
 def find_type_files(cur_dir, file_type, file_list=[]):
@@ -124,7 +125,7 @@ if __name__ == '__main__':
             custom_pattern2 = custom_pattern2[:-1]
 
         all_matches = []
-        with open(op_file, 'r') as f:
+        with io.open(op_file, 'r', encoding='utf-8') as f:
             content = ''.join(f.readlines())
 
             op, op_count = remove_grad_op_and_kernel(content, op_pattern1,
@@ -157,8 +158,8 @@ if __name__ == '__main__':
         for i in all_matches:
             content = content.replace(i, '')
 
-        with open(op_file, 'w') as f:
-            f.write(content)
+        with io.open(op_file, 'w', encoding='utf-8') as f:
+            f.write(u'{}'.format(content))
 
     # 2. update operators/CMakeLists.txt
     cmake_file = os.path.join(tool_dir,