saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-29 20:14:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[TRT EP] Fix ProviderOptions functions (#17567)

Browse source 
### Description
When trying to use the TRT EP option trt_extra_plugin_lib_paths I
noticed that my custom op library was not being loaded by the EP. After
some digging I found that code was missing to update this option when
UpdateTensorRTProviderOptions() is used to set it.

At the same time I noticed that char arrays were allocated in that
function and wondered where they are de-allocated. When I found it was
done in ReleaseTensorRTProviderOptions(), I noticed that a few
de-allocations were missing.

### Motivation and Context
This PR fixes the problems described above.
This commit is contained in:
simonjub 2023-09-17 15:19:32 -04:00 committed by GitHub
parent 705f8a3718
commit c969237321
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
onnxruntime/core/providers/tensorrt/tensorrt_provider_factory.cc
View file

@ -202,6 +202,20 @@ struct Tensorrt_Provider : Provider {
trt_options.trt_tactic_sources = (const char*)dest;
}
str_size = internal_options.extra_plugin_lib_paths.size();
if (str_size == 0) {
trt_options.trt_extra_plugin_lib_paths = nullptr;
} else {
dest = new char[str_size + 1];
#ifdef _MSC_VER
strncpy_s(dest, str_size + 1, internal_options.extra_plugin_lib_paths.c_str(), str_size);
#else
strncpy(dest, internal_options.extra_plugin_lib_paths.c_str(), str_size);
#endif
dest[str_size] = '\0';
trt_options.trt_extra_plugin_lib_paths = (const char*)dest;
}
str_size = internal_options.profile_min_shapes.size();
if (str_size == 0) {
trt_options.trt_profile_min_shapes = nullptr;

11
onnxruntime/core/session/provider_bridge_ort.cc
View file

@ -1930,9 +1930,14 @@ ORT_API_STATUS_IMPL(OrtApis::GetTensorRTProviderOptionsByName,
ORT_API(void, OrtApis::ReleaseTensorRTProviderOptions, _Frees_ptr_opt_ OrtTensorRTProviderOptionsV2* ptr) {
#ifdef USE_TENSORRT
if (ptr != nullptr) {
delete ptr->trt_int8_calibration_table_name;
delete ptr->trt_engine_cache_path;
delete ptr->trt_engine_decryption_lib_path;
delete[] ptr->trt_int8_calibration_table_name;
delete[] ptr->trt_engine_cache_path;
delete[] ptr->trt_engine_decryption_lib_path;
delete[] ptr->trt_tactic_sources;
delete[] ptr->trt_extra_plugin_lib_paths;
delete[] ptr->trt_profile_min_shapes;
delete[] ptr->trt_profile_max_shapes;
delete[] ptr->trt_profile_opt_shapes;
}
std::unique_ptr<OrtTensorRTProviderOptionsV2> p(ptr);