From c7cdbbb3c76b4dd0b0449cac0a109e731aadd539 Mon Sep 17 00:00:00 2001 From: Jan Van Sweevelt Date: Mon, 28 Dec 2020 21:46:06 +0100 Subject: [PATCH 01/13] added batch_size to context execute --- tensorrt/src/context.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tensorrt/src/context.rs b/tensorrt/src/context.rs index e96bdc8..b87cf6a 100644 --- a/tensorrt/src/context.rs +++ b/tensorrt/src/context.rs @@ -122,6 +122,7 @@ impl Context { &self, input_data: ExecuteInput, mut output_data: Vec>, + batch_size: Option, ) -> Result<(), Error> { let mut buffers = Vec::::with_capacity(output_data.len() + 1); let dev_buffer = match input_data { @@ -146,7 +147,11 @@ impl Context { .collect::>(); unsafe { - execute(self.internal_context, bindings.as_mut_ptr(), 1); + execute( + self.internal_context, + bindings.as_mut_ptr(), + batch_size.unwrap_or(1), + ); } for (idx, output) in buffers.iter().skip(1).enumerate() { From a0037b35949db9882bf7e9c9e027856216bb8236 Mon Sep 17 00:00:00 2001 From: Jan Van Sweevelt Date: Mon, 28 Dec 2020 22:35:49 +0100 Subject: [PATCH 02/13] error fixed --- tensorrt/examples/mnist_uff/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorrt/examples/mnist_uff/main.rs b/tensorrt/examples/mnist_uff/main.rs index ec1b4cf..44a43fa 100644 --- a/tensorrt/examples/mnist_uff/main.rs +++ b/tensorrt/examples/mnist_uff/main.rs @@ -52,7 +52,7 @@ fn main() { let mut output = ndarray::Array1::::zeros(10); let outputs = vec![ExecuteInput::Float(&mut output)]; context - .execute(ExecuteInput::Float(&mut pre_processed), outputs) + .execute(ExecuteInput::Float(&mut pre_processed), outputs, None) .unwrap(); println!("output: {}", output); } From 33abe2761d8540a68d892f053b8903719980e8f1 Mon Sep 17 00:00:00 2001 From: Jan Van Sweevelt Date: Wed, 13 Jan 2021 21:58:15 +0100 Subject: [PATCH 03/13] c++ build --- tensorrt-sys/build.rs | 10 ++++++++++ tensorrt-sys/trt-sys/CMakeLists.txt | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tensorrt-sys/build.rs b/tensorrt-sys/build.rs index 28d0d99..ccf25b8 100644 --- a/tensorrt-sys/build.rs +++ b/tensorrt-sys/build.rs @@ -35,6 +35,15 @@ fn tensorrt_configuration() { fn main() -> Result<(), ()> { let mut cfg = Config::new("trt-sys"); + let trt_include = match option_env!("TRT_INSTALL_DIR") { + Some(trt_include_dir) => { + format!("{}/include", trt_include_dir) + } + None => { + format!(".") + } + }; + #[cfg(feature = "trt-5")] { println!("Setting Config to TRT5"); @@ -69,6 +78,7 @@ fn main() -> Result<(), ()> { let bindings = builder() .clang_arg("-DTRT7") .clang_args(&["-x", "c++"]) + .clang_args(&["-I", trt_include]) .header("trt-sys/tensorrt_api.h") .size_t_is_usize(true) .generate()?; diff --git a/tensorrt-sys/trt-sys/CMakeLists.txt b/tensorrt-sys/trt-sys/CMakeLists.txt index 10785fd..2b4748e 100644 --- a/tensorrt-sys/trt-sys/CMakeLists.txt +++ b/tensorrt-sys/trt-sys/CMakeLists.txt @@ -14,7 +14,11 @@ endif() set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_FLAGS "-fPIC -O3 -Wall -Wextra -Werror -Wno-unknown-pragmas -Wno-deprecated -Wno-deprecated-declarations") +if(WIN32) + set(CMAKE_CXX_FLAGS "-O3") +elseif(LINUX) + set(CMAKE_CXX_FLAGS "-fPIC -O3 -Wall -Wextra -Werror -Wno-unknown-pragmas -Wno-deprecated -Wno-deprecated-declarations") +endif() file(GLOB source_files "TRTLogger/*.cpp" From c81de425e13b0547a5aa36bc49cde77e54f0a883 Mon Sep 17 00:00:00 2001 From: Jan Van Sweevelt Date: Wed, 13 Jan 2021 23:01:38 +0100 Subject: [PATCH 04/13] include directories --- tensorrt-sys/build.rs | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tensorrt-sys/build.rs b/tensorrt-sys/build.rs index ccf25b8..691eecc 100644 --- a/tensorrt-sys/build.rs +++ b/tensorrt-sys/build.rs @@ -35,35 +35,37 @@ fn tensorrt_configuration() { fn main() -> Result<(), ()> { let mut cfg = Config::new("trt-sys"); - let trt_include = match option_env!("TRT_INSTALL_DIR") { - Some(trt_include_dir) => { - format!("{}/include", trt_include_dir) - } - None => { - format!(".") - } - }; - #[cfg(feature = "trt-5")] { + let trt_include = match option_env!("TRT_INSTALL_DIR") { + Some(trt_include_dir) => format!("{}/include", trt_include_dir), + None => ".".to_string(), + }; + println!("Setting Config to TRT5"); cfg.define("TRT5", ""); let bindings = builder() .clang_args(&["-x", "c++"]) + .clang_args(&["-I", &trt_include[..]]) .header("trt-sys/tensorrt_api.h") .size_t_is_usize(true) .generate()?; - + println!("{:?}", bindings); bindings.write_to_file("src/bindings.rs").unwrap(); } #[cfg(feature = "trt-6")] { + let trt_include = match option_env!("TRT_INSTALL_DIR") { + Some(trt_include_dir) => format!("{}/include", trt_include_dir), + None => ".".to_string(), + }; println!("Setting Config to TRT6"); cfg.define("TRT6", ""); let bindings = builder() .clang_arg("-DTRT6") .clang_args(&["-x", "c++"]) + .clang_args(&["-I", &trt_include[..]]) .header("trt-sys/tensorrt_api.h") .size_t_is_usize(true) .generate()?; @@ -73,12 +75,16 @@ fn main() -> Result<(), ()> { #[cfg(feature = "trt-7")] { + let trt_include = match option_env!("TRT_INSTALL_DIR") { + Some(trt_include_dir) => format!("{}/include", trt_include_dir), + None => ".".to_string(), + }; println!("Setting Config to TRT7"); cfg.define("TRT7", ""); let bindings = builder() .clang_arg("-DTRT7") .clang_args(&["-x", "c++"]) - .clang_args(&["-I", trt_include]) + .clang_args(&["-I", &trt_include[..]]) .header("trt-sys/tensorrt_api.h") .size_t_is_usize(true) .generate()?; From 8d1a75c582770291eab3083681231e2dae0c24f9 Mon Sep 17 00:00:00 2001 From: Jan Van Sweevelt Date: Sat, 16 Jan 2021 10:17:26 +0100 Subject: [PATCH 05/13] windows build --- tensorrt-sys/build.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tensorrt-sys/build.rs b/tensorrt-sys/build.rs index 691eecc..1caf2c2 100644 --- a/tensorrt-sys/build.rs +++ b/tensorrt-sys/build.rs @@ -80,12 +80,16 @@ fn main() -> Result<(), ()> { None => ".".to_string(), }; println!("Setting Config to TRT7"); + println!("include dir: {}", trt_include); + println!("test"); cfg.define("TRT7", ""); let bindings = builder() .clang_arg("-DTRT7") .clang_args(&["-x", "c++"]) - .clang_args(&["-I", &trt_include[..]]) .header("trt-sys/tensorrt_api.h") + .clang_arg("-v") + .clang_arg("-I \"C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v10.2\\include\"") +// .clang_arg("-I \"C:\\Program Files\\Azure Kinect SDK v1.3.0\\sdk\\include\"") .size_t_is_usize(true) .generate()?; From b1866045f7b93be1d62ea936cfb2c8872636e4b0 Mon Sep 17 00:00:00 2001 From: Jan Van Sweevelt Date: Sun, 17 Jan 2021 12:25:31 +0100 Subject: [PATCH 06/13] windows build: temp push --- tensorrt-sys/build.rs | 112 +++++++++++++++++++++--------------------- tensorrt/Cargo.toml | 8 +-- 2 files changed, 61 insertions(+), 59 deletions(-) diff --git a/tensorrt-sys/build.rs b/tensorrt-sys/build.rs index 1caf2c2..507c0c2 100644 --- a/tensorrt-sys/build.rs +++ b/tensorrt-sys/build.rs @@ -35,66 +35,68 @@ fn tensorrt_configuration() { fn main() -> Result<(), ()> { let mut cfg = Config::new("trt-sys"); - #[cfg(feature = "trt-5")] - { - let trt_include = match option_env!("TRT_INSTALL_DIR") { - Some(trt_include_dir) => format!("{}/include", trt_include_dir), - None => ".".to_string(), - }; + // #[cfg(feature = "trt-5")] + // { + // let trt_include = match option_env!("TRT_INSTALL_DIR") { + // Some(trt_include_dir) => format!("{}/include", trt_include_dir), + // None => ".".to_string(), + // }; - println!("Setting Config to TRT5"); - cfg.define("TRT5", ""); - let bindings = builder() - .clang_args(&["-x", "c++"]) - .clang_args(&["-I", &trt_include[..]]) - .header("trt-sys/tensorrt_api.h") - .size_t_is_usize(true) - .generate()?; - println!("{:?}", bindings); - bindings.write_to_file("src/bindings.rs").unwrap(); - } + // println!("Setting Config to TRT5"); + // cfg.define("TRT5", ""); + // let bindings = builder() + // .clang_args(&["-x", "c++"]) + // .clang_args(&["-I", &trt_include[..]]) + // .header("trt-sys/tensorrt_api.h") + // .size_t_is_usize(true) + // .generate()?; + // println!("{:?}", bindings); + // bindings.write_to_file("src/bindings.rs").unwrap(); + // } - #[cfg(feature = "trt-6")] - { - let trt_include = match option_env!("TRT_INSTALL_DIR") { - Some(trt_include_dir) => format!("{}/include", trt_include_dir), - None => ".".to_string(), - }; - println!("Setting Config to TRT6"); - cfg.define("TRT6", ""); - let bindings = builder() - .clang_arg("-DTRT6") - .clang_args(&["-x", "c++"]) - .clang_args(&["-I", &trt_include[..]]) - .header("trt-sys/tensorrt_api.h") - .size_t_is_usize(true) - .generate()?; + // #[cfg(feature = "trt-6")] + // { + // let trt_include = match option_env!("TRT_INSTALL_DIR") { + // Some(trt_include_dir) => format!("{}/include", trt_include_dir), + // None => ".".to_string(), + // }; + // println!("Setting Config to TRT6"); + // cfg.define("TRT6", ""); + // let bindings = builder() + // .clang_arg("-DTRT6") + // .clang_args(&["-x", "c++"]) + // .clang_args(&["-I", &trt_include[..]]) + // .header("trt-sys/tensorrt_api.h") + // .size_t_is_usize(true) + // .generate()?; - bindings.write_to_file("src/bindings.rs").unwrap(); - } + // bindings.write_to_file("src/bindings.rs").unwrap(); + // } - #[cfg(feature = "trt-7")] - { - let trt_include = match option_env!("TRT_INSTALL_DIR") { - Some(trt_include_dir) => format!("{}/include", trt_include_dir), - None => ".".to_string(), - }; - println!("Setting Config to TRT7"); - println!("include dir: {}", trt_include); - println!("test"); - cfg.define("TRT7", ""); - let bindings = builder() - .clang_arg("-DTRT7") - .clang_args(&["-x", "c++"]) - .header("trt-sys/tensorrt_api.h") - .clang_arg("-v") - .clang_arg("-I \"C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v10.2\\include\"") -// .clang_arg("-I \"C:\\Program Files\\Azure Kinect SDK v1.3.0\\sdk\\include\"") - .size_t_is_usize(true) - .generate()?; + // #[cfg(feature = "trt-7")] + // { + // let trt_include = match option_env!("TRT_INSTALL_DIR") { + // Some(trt_include_dir) => format!("{}", trt_include_dir), + // None => ".".to_string(), + // }; + println!("Setting Config to TRT7"); + println!("hello"); + cfg.define("TRT7", ""); + let bindings = builder() + .clang_arg("-DTRT7") + .clang_args(&["-x", "c++"]) + .header("trt-sys/tensorrt_api.h") + .clang_args(&[ + "-I", + "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v10.2/include", + ]) + .size_t_is_usize(true) + .generate()?; - bindings.write_to_file("src/bindings.rs").unwrap(); - } + // println!("{:?}", bindings); + + bindings.write_to_file("src/bindings.rs").unwrap(); + // } let dst = cfg.build(); println!("cargo:rustc-link-search=native={}", dst.display()); diff --git a/tensorrt/Cargo.toml b/tensorrt/Cargo.toml index dd010d3..84dcad7 100644 --- a/tensorrt/Cargo.toml +++ b/tensorrt/Cargo.toml @@ -19,10 +19,10 @@ trt-7 = ["tensorrt-sys/trt-7"] [dependencies] # Uncomment when working locally -#tensorrt-sys = { path = "../tensorrt-sys" } -tensorrt-sys = { git = "https://github.com/mstallmo/tensorrt-rs", branch = "develop" } -#tensorrt_rs_derive = { path = "../tensorrt_rs_derive" } -tensorrt_rs_derive = { git = "https://github.com/mstallmo/tensorrt-rs", branch = "develop" } +tensorrt-sys = { path = "../tensorrt-sys" } +#tensorrt-sys = { git = "https://github.com/mstallmo/tensorrt-rs", branch = "develop" } +tensorrt_rs_derive = { path = "../tensorrt_rs_derive" } +#tensorrt_rs_derive = { git = "https://github.com/mstallmo/tensorrt-rs", branch = "develop" } ndarray = "0.13" ndarray-image = "0.2" image = "0.23" From fd55ea798537fe8af9818ba01a1b1e18be3b2df0 Mon Sep 17 00:00:00 2001 From: Jan Van Sweevelt Date: Sun, 17 Jan 2021 13:21:07 +0100 Subject: [PATCH 07/13] windows build working --- tensorrt-sys/build.rs | 104 +++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 58 deletions(-) diff --git a/tensorrt-sys/build.rs b/tensorrt-sys/build.rs index 507c0c2..b471fa7 100644 --- a/tensorrt-sys/build.rs +++ b/tensorrt-sys/build.rs @@ -24,6 +24,13 @@ fn tensorrt_configuration() { println!("cargo:rustc-link-lib=dylib=nvinfer_plugin"); } +fn tensorrt_include_path() -> String { + match option_env!("TRT_INSTALL_DIR") { + Some(trt_include_dir) => format!("{}/include", trt_include_dir), + None => ".".to_string(), + } +} + // Not sure if I love this solution but I think it's relatively robust enough for now on Unix systems. // Still have to thoroughly test what happens with a TRT library installed that's not done by the // dpkg. It's possible that we'll just have to fall back to only supporting one system library and assuming that @@ -35,68 +42,49 @@ fn tensorrt_configuration() { fn main() -> Result<(), ()> { let mut cfg = Config::new("trt-sys"); - // #[cfg(feature = "trt-5")] - // { - // let trt_include = match option_env!("TRT_INSTALL_DIR") { - // Some(trt_include_dir) => format!("{}/include", trt_include_dir), - // None => ".".to_string(), - // }; - - // println!("Setting Config to TRT5"); - // cfg.define("TRT5", ""); - // let bindings = builder() - // .clang_args(&["-x", "c++"]) - // .clang_args(&["-I", &trt_include[..]]) - // .header("trt-sys/tensorrt_api.h") - // .size_t_is_usize(true) - // .generate()?; - // println!("{:?}", bindings); - // bindings.write_to_file("src/bindings.rs").unwrap(); - // } - - // #[cfg(feature = "trt-6")] - // { - // let trt_include = match option_env!("TRT_INSTALL_DIR") { - // Some(trt_include_dir) => format!("{}/include", trt_include_dir), - // None => ".".to_string(), - // }; - // println!("Setting Config to TRT6"); - // cfg.define("TRT6", ""); - // let bindings = builder() - // .clang_arg("-DTRT6") - // .clang_args(&["-x", "c++"]) - // .clang_args(&["-I", &trt_include[..]]) - // .header("trt-sys/tensorrt_api.h") - // .size_t_is_usize(true) - // .generate()?; + #[cfg(feature = "trt-5")] + { + println!("Setting Config to TRT5"); + cfg.define("TRT5", ""); + let bindings = builder() + .clang_args(&["-x", "c++"]) + .clang_args(&["-I", &tensorrt_include_path()[..]]) + .header("trt-sys/tensorrt_api.h") + .size_t_is_usize(true) + .generate()?; + println!("{:?}", bindings); + bindings.write_to_file("src/bindings.rs").unwrap(); + } - // bindings.write_to_file("src/bindings.rs").unwrap(); - // } + #[cfg(feature = "trt-6")] + { + println!("Setting Config to TRT6"); + cfg.define("TRT6", ""); + let bindings = builder() + .clang_arg("-DTRT6") + .clang_args(&["-x", "c++"]) + .clang_args(&["-I", &tensorrt_include_path()[..]]) + .header("trt-sys/tensorrt_api.h") + .size_t_is_usize(true) + .generate()?; - // #[cfg(feature = "trt-7")] - // { - // let trt_include = match option_env!("TRT_INSTALL_DIR") { - // Some(trt_include_dir) => format!("{}", trt_include_dir), - // None => ".".to_string(), - // }; - println!("Setting Config to TRT7"); - println!("hello"); - cfg.define("TRT7", ""); - let bindings = builder() - .clang_arg("-DTRT7") - .clang_args(&["-x", "c++"]) - .header("trt-sys/tensorrt_api.h") - .clang_args(&[ - "-I", - "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v10.2/include", - ]) - .size_t_is_usize(true) - .generate()?; + bindings.write_to_file("src/bindings.rs").unwrap(); + } - // println!("{:?}", bindings); + #[cfg(feature = "trt-7")] + { + println!("Setting Config to TRT7"); + cfg.define("TRT7", ""); + let bindings = builder() + .clang_arg("-DTRT7") + .clang_args(&["-x", "c++"]) + .clang_args(&["-I", &tensorrt_include_path()[..]]) + .header("trt-sys/tensorrt_api.h") + .size_t_is_usize(true) + .generate()?; - bindings.write_to_file("src/bindings.rs").unwrap(); - // } + bindings.write_to_file("src/bindings.rs").unwrap(); + } let dst = cfg.build(); println!("cargo:rustc-link-search=native={}", dst.display()); From e9f2aa2175ffe6c2531cc7d273365b5e797693b5 Mon Sep 17 00:00:00 2001 From: Jan Van Sweevelt Date: Sun, 17 Jan 2021 13:22:37 +0100 Subject: [PATCH 08/13] removed println --- tensorrt-sys/build.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/tensorrt-sys/build.rs b/tensorrt-sys/build.rs index b471fa7..5368b33 100644 --- a/tensorrt-sys/build.rs +++ b/tensorrt-sys/build.rs @@ -52,7 +52,6 @@ fn main() -> Result<(), ()> { .header("trt-sys/tensorrt_api.h") .size_t_is_usize(true) .generate()?; - println!("{:?}", bindings); bindings.write_to_file("src/bindings.rs").unwrap(); } From 0b39c5f97aa0de06352adea6bc4a5fe92460cdb8 Mon Sep 17 00:00:00 2001 From: Jan Van Sweevelt Date: Tue, 2 Feb 2021 22:23:40 +0100 Subject: [PATCH 09/13] removed stdc++ lib from build --- tensorrt-sys/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorrt-sys/build.rs b/tensorrt-sys/build.rs index 5368b33..0111475 100644 --- a/tensorrt-sys/build.rs +++ b/tensorrt-sys/build.rs @@ -88,7 +88,7 @@ fn main() -> Result<(), ()> { let dst = cfg.build(); println!("cargo:rustc-link-search=native={}", dst.display()); println!("cargo:rustc-link-lib=static=trt-sys"); - println!("cargo:rustc-link-lib=dylib=stdc++"); + //println!("cargo:rustc-link-lib=dylib=stdc++"); tensorrt_configuration(); cuda_configuration(); From 6787d6767899de8223cf5c8a82b026285986e35f Mon Sep 17 00:00:00 2001 From: Jan Van Sweevelt Date: Tue, 9 Feb 2021 21:46:39 +0100 Subject: [PATCH 10/13] test build voor benchmarking --- tensorrt-sys/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorrt-sys/build.rs b/tensorrt-sys/build.rs index 0111475..5368b33 100644 --- a/tensorrt-sys/build.rs +++ b/tensorrt-sys/build.rs @@ -88,7 +88,7 @@ fn main() -> Result<(), ()> { let dst = cfg.build(); println!("cargo:rustc-link-search=native={}", dst.display()); println!("cargo:rustc-link-lib=static=trt-sys"); - //println!("cargo:rustc-link-lib=dylib=stdc++"); + println!("cargo:rustc-link-lib=dylib=stdc++"); tensorrt_configuration(); cuda_configuration(); From 646b9128c6a6737a29d3f5ccd65c5c9d4c68f6cb Mon Sep 17 00:00:00 2001 From: Jan Van Sweevelt Date: Tue, 9 Feb 2021 23:16:06 +0100 Subject: [PATCH 11/13] inclusion of stdc++ lib is conditionally compiled now --- tensorrt-sys/build.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tensorrt-sys/build.rs b/tensorrt-sys/build.rs index 5368b33..600aa3d 100644 --- a/tensorrt-sys/build.rs +++ b/tensorrt-sys/build.rs @@ -88,6 +88,8 @@ fn main() -> Result<(), ()> { let dst = cfg.build(); println!("cargo:rustc-link-search=native={}", dst.display()); println!("cargo:rustc-link-lib=static=trt-sys"); + + #[cfg(target_os = "linux")] println!("cargo:rustc-link-lib=dylib=stdc++"); tensorrt_configuration(); From 5e46d2982979f98f89f2993f162efb1e48f6e9be Mon Sep 17 00:00:00 2001 From: Jan Van Sweevelt Date: Tue, 9 Mar 2021 22:01:11 +0100 Subject: [PATCH 12/13] update packages --- tensorrt/Cargo.toml | 4 ++-- tensorrt/examples/onnx/main.rs | 2 +- tensorrt/examples/ssd_uff/main.rs | 2 +- tensorrt/src/context.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tensorrt/Cargo.toml b/tensorrt/Cargo.toml index 84dcad7..43927fc 100644 --- a/tensorrt/Cargo.toml +++ b/tensorrt/Cargo.toml @@ -23,8 +23,8 @@ tensorrt-sys = { path = "../tensorrt-sys" } #tensorrt-sys = { git = "https://github.com/mstallmo/tensorrt-rs", branch = "develop" } tensorrt_rs_derive = { path = "../tensorrt_rs_derive" } #tensorrt_rs_derive = { git = "https://github.com/mstallmo/tensorrt-rs", branch = "develop" } -ndarray = "0.13" -ndarray-image = "0.2" +ndarray = "0.14.0" +ndarray-image = "0.3.0" image = "0.23" imageproc = "0.21.0" bitflags = "1.2" diff --git a/tensorrt/examples/onnx/main.rs b/tensorrt/examples/onnx/main.rs index 1f3229d..732b853 100644 --- a/tensorrt/examples/onnx/main.rs +++ b/tensorrt/examples/onnx/main.rs @@ -55,7 +55,7 @@ fn main() { let mut output = ndarray::Array1::::zeros(1000); let outputs = vec![ExecuteInput::Float(&mut output)]; context - .execute(ExecuteInput::Float(&mut pre_processed), outputs) + .execute(ExecuteInput::Float(&mut pre_processed), outputs, None) .unwrap(); println!("output: {}", output); } diff --git a/tensorrt/examples/ssd_uff/main.rs b/tensorrt/examples/ssd_uff/main.rs index 261f033..cd98ffd 100644 --- a/tensorrt/examples/ssd_uff/main.rs +++ b/tensorrt/examples/ssd_uff/main.rs @@ -58,7 +58,7 @@ fn infer(engine: &Engine, input: &mut Array1) -> (ndarray::Array1, nda ExecuteInput::Integer(&mut keep_count), ]; let execute_input = ExecuteInput::Float(input); - context.execute(execute_input, outputs).unwrap(); + context.execute(execute_input, outputs, None).unwrap(); (top_detections, keep_count) } diff --git a/tensorrt/src/context.rs b/tensorrt/src/context.rs index b87cf6a..fefda54 100644 --- a/tensorrt/src/context.rs +++ b/tensorrt/src/context.rs @@ -184,7 +184,7 @@ mod tests { use crate::data_size::GB; use crate::dims::DimsCHW; use crate::engine::Engine; - use crate::profiler::RustProfiler; + // use crate::profiler::RustProfiler; use crate::runtime::Logger; use crate::uff::{UffFile, UffInputOrder, UffParser}; use lazy_static::lazy_static; From e50f358281173b66f84e3b194200aff6722e1fe8 Mon Sep 17 00:00:00 2001 From: Jan Van Sweevelt Date: Mon, 4 Oct 2021 22:41:20 +0200 Subject: [PATCH 13/13] update to latest crates --- tensorrt/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tensorrt/Cargo.toml b/tensorrt/Cargo.toml index 43927fc..0324f2c 100644 --- a/tensorrt/Cargo.toml +++ b/tensorrt/Cargo.toml @@ -23,10 +23,10 @@ tensorrt-sys = { path = "../tensorrt-sys" } #tensorrt-sys = { git = "https://github.com/mstallmo/tensorrt-rs", branch = "develop" } tensorrt_rs_derive = { path = "../tensorrt_rs_derive" } #tensorrt_rs_derive = { git = "https://github.com/mstallmo/tensorrt-rs", branch = "develop" } -ndarray = "0.14.0" +ndarray = "0.15.3" ndarray-image = "0.3.0" image = "0.23" -imageproc = "0.21.0" +imageproc = "0.22.0" bitflags = "1.2" num-traits = "0.2.12" num-derive = "0.3.2"