Merge pull request #22 from mstallmo/trt-plugins

Add support for loading built in TensorRT plugins
mstallmo · Sep 26, 2020 · 4d4e35d · 4d4e35d
2 parents 2565b27 + 4ab2014
commit 4d4e35d
Show file tree

Hide file tree

Showing 30 changed files with 601 additions and 300 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 Cargo.lock
 **/cmake-build-debug
 .idea
-*.engine
+*.engine
+assets/
diff --git a/assets/images/0.pgm b/assets/images/0.pgm
diff --git a/assets/images/1.pgm b/assets/images/1.pgm
diff --git a/assets/lenet5.uff b/assets/lenet5.uff
diff --git a/tensorrt-sys/3rdParty/TensorRT-5.1.5/libnvinfer_plugin_static.a b/tensorrt-sys/3rdParty/TensorRT-5.1.5/libnvinfer_plugin_static.a
diff --git a/tensorrt-sys/3rdParty/TensorRT-5.1.5/libnvinfer_static.a b/tensorrt-sys/3rdParty/TensorRT-5.1.5/libnvinfer_static.a
diff --git a/tensorrt-sys/3rdParty/TensorRT-5.1.5/libnvparsers_static.a b/tensorrt-sys/3rdParty/TensorRT-5.1.5/libnvparsers_static.a
diff --git a/tensorrt-sys/Cargo.toml b/tensorrt-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tensorrt-sys"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Mason Stallmo <[email protected]>"]
 license = "MIT"
 edition = "2018"

diff --git a/tensorrt-sys/README.md b/tensorrt-sys/README.md
@@ -17,7 +17,7 @@ CMake > 3.10
 
 
 TensorRT-sys' bindings depends on TensorRT 5.1.5 for the bindings to work correctly. While other versions of
-TensorRT *may* work with the bindings there are no guarantees as functions that are boudn to may have been depricated, 
+TensorRT *may* work with the bindings there are no guarantees as functions that are bound to may have been depricated, 
 removed, or changed in future versions of TensorRT.
 
 The prerequisites enumerated above are expected to be installed in their default location on Linux. See the [nvidia
@@ -27,6 +27,10 @@ further install information.
 __Note:__ The tarball installation method described in the TesnorRT documentation is likely to cause major headaches with
 getting everything to link correctly. It is highly recommended to use the package manager method if possible. 
 
+If there are issues with loading default TensoRT plugins it seems that there are some missing plugins that were not
+provided with the 5.1.5 binary installation at one point in time. To get these plugins follow the instructions for building
+and installing the TensorRT OSS components from [here](https://github.com/NVIDIA/TensorRT).
+
 Windows support is not currently supported but should be coming soon!
 
 ### Support Matrix for TensorRT Classes

diff --git a/tensorrt-sys/build.rs b/tensorrt-sys/build.rs
@@ -98,18 +98,18 @@ fn main() {
     println!("cargo:rustc-flags=-l dylib=stdc++");
 
     match get_shared_lib_link_path("libnvinfer") {
-       Some(link_path) => {
-          match std::fs::read_link(link_path) {
-              Ok(full_library_path) => {
-                  configuration(&full_library_path);
-              },
-              Err(_) => {
-                  panic!("libnvinfer.so not found! See https://docs.nvidia.com/deeplearning/tensorrt/archives/tensorrt-515/tensorrt-install-guide/index.html for install instructions");
-              }
-          }
-       },
-       None => {
-           panic!("libnvinfer.so not found! See https://docs.nvidia.com/deeplearning/tensorrt/archives/tensorrt-515/tensorrt-install-guide/index.html for install instructions");
-       }
+        Some(link_path) => {
+            match std::fs::read_link(link_path) {
+                Ok(full_library_path) => {
+                    configuration(&full_library_path);
+                }
+                Err(_) => {
+                    panic!("libnvinfer.so not found! See https://docs.nvidia.com/deeplearning/tensorrt/archives/tensorrt-515/tensorrt-install-guide/index.html for install instructions");
+                }
+            }
+        }
+        None => {
+            panic!("libnvinfer.so not found! See https://docs.nvidia.com/deeplearning/tensorrt/archives/tensorrt-515/tensorrt-install-guide/index.html for install instructions");
+        }
     }
 }