Update TensorRT parser (microsoft#3650)

* update onnx-tensorrt submodule * add more model dumping point * update trt kernel name and docker readme file * fix minior issues * fix format issue * update onnx-tensorrt submodule Co-authored-by: stevenlix <stevenlix>
pranav-prakash · Apr 24, 2020 · 2ab78c5 · 2ab78c5
1 parent 939d036
commit 2ab78c5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/cmake/external/onnx-tensorrt b/cmake/external/onnx-tensorrt
diff --git a/dockerfiles/README.md b/dockerfiles/README.md
@@ -80,7 +80,7 @@ Use `docker pull` with any of the images and tags below to pull an image and try
   ```
 
 ## TensorRT
-**Ubuntu 18.04, CUDA 10.1.243, TensorRT 6.0.1**
+**Ubuntu 18.04, CUDA 10.2, TensorRT 7.0.0**
 
 1. Build the docker image from the Dockerfile in this repository.
   ```

diff --git a/onnxruntime/core/providers/tensorrt/tensorrt_execution_provider.cc b/onnxruntime/core/providers/tensorrt/tensorrt_execution_provider.cc
@@ -335,7 +335,7 @@ std::unique_ptr<IndexedSubGraph> TensorrtExecutionProvider::GetSubGraph(SubGraph
 
   // Assign inputs and outputs to subgraph's meta_def
   auto meta_def = onnxruntime::make_unique<::onnxruntime::IndexedSubGraph::MetaDef>();
-  meta_def->name = "TRTKernel_" + std::to_string(kernels_index++);
+  meta_def->name = "TRTKernel_" + graph.Name() + "_" + std::to_string(kernels_index++);
   meta_def->domain = kMSDomain;
 
   for (const auto& input : inputs) {
@@ -454,6 +454,12 @@ SubGraphCollection_t TensorrtExecutionProvider::GetSupportedList(SubGraphCollect
         std::string string_buf;
         model_proto.SerializeToString(&string_buf);
 
+        if (dump_subgraphs_) {
+          // Dump TensorRT subgraph for debugging if enabled via ORT_TENSORRT_DUMP_SUBGRAPHS env variable.
+          std::fstream dump("TensorrtExecutionProvider_TRT_Subgraph.onnx", std::ios::out | std::ios::trunc | std::ios::binary);
+          model_proto.SerializeToOstream(&dump);
+        }
+
         // Get supported node list recursively
         SubGraphCollection_t parser_nodes_list;
         TensorrtLogger& trt_logger = GetTensorrtLogger();
+1 −1		CMakeLists.txt
+5 −0		ImporterContext.hpp
+24 −4		ModelImporter.cpp
+9 −0		README.md
+6 −2		TensorOrWeights.hpp
+171 −90		builtin_op_importers.cpp
+25 −1		common.hpp
+64 −2		main.cpp
+2 −0		onnx2trt.hpp
+92 −2		onnx2trt_utils.cpp
+3 −0		onnx2trt_utils.hpp