Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions csharp/src/Microsoft.ML.OnnxRuntime/NativeMethods.cs
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,29 @@ public struct OrtApi
public IntPtr ModelMetadataGetGraphDescription;
}

#region ORT Provider options
[StructLayout(LayoutKind.Sequential)]
public struct OrtTensorRTProviderOptionsNative
{
public int device_id; // cuda device id.
public int has_user_compute_stream; // indicator of user specified CUDA compute stream.
public IntPtr user_compute_stream; // user specified CUDA compute stream.
public int has_trt_options; // override environment variables with following TensorRT settings at runtime.
public UIntPtr trt_max_workspace_size; // maximum workspace size for TensorRT.
public int trt_fp16_enable; // enable TensorRT FP16 precision. Default 0 = false, nonzero = true
public int trt_int8_enable; // enable TensorRT INT8 precision. Default 0 = false, nonzero = true
public IntPtr trt_int8_calibration_table_name; // TensorRT INT8 calibration table name.
public int trt_int8_use_native_calibration_table; // use native TensorRT generated calibration table. Default 0 = false, nonzero = true
public int trt_max_partition_iterations; // maximum number of iterations allowed in model partitioning for TensorRT.
public int trt_min_subgraph_size; // minimum node size in a subgraph after partitioning.
public int trt_dump_subgraphs; // dump the subgraphs that are transformed into TRT engines in onnx format to the filesystem. Default 0 = false, nonzero = true
public int trt_engine_cache_enable; // enable TensorRT engine caching. Default 0 = false, nonzero = true
public IntPtr trt_cache_path; // specify path for TensorRT engine and profile files if engine_cache_enable is enabled, or INT8 calibration table file if trt_int8_enable is enabled.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trt_cache_path

Need to clarify how to initialize this, since paths in Windows are in UTF-16 and in Linux it is UTF-8.

}
#endregion



internal static class NativeMethods
{
private const string nativeLib = "onnxruntime";
Expand Down Expand Up @@ -574,6 +597,9 @@ IntPtr[] outputValues /* An array of output value pointers. Array must be alloca
[DllImport(nativeLib, CharSet = charSet)]
public static extern IntPtr /*(OrtStatus*)*/ OrtSessionOptionsAppendExecutionProvider_Tensorrt(IntPtr /*(OrtSessionOptions*)*/ options, int device_id);

[DllImport(nativeLib, CharSet = charSet)]
public static extern IntPtr /*(OrtStatus*)*/ SessionOptionsAppendExecutionProvider_TensorRT(IntPtr /*(OrtSessionOptions*)*/ options, ref OrtTensorRTProviderOptionsNative trt_options);

[DllImport(nativeLib, CharSet = charSet)]
public static extern IntPtr /*(OrtStatus*)*/ OrtSessionOptionsAppendExecutionProvider_MIGraphX(IntPtr /*(OrtSessionOptions*)*/ options, int device_id);

Expand Down
114 changes: 114 additions & 0 deletions csharp/src/Microsoft.ML.OnnxRuntime/ProviderOptions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;

namespace Microsoft.ML.OnnxRuntime
{
/// <summary>
/// Provider options for TensorRT.
/// </summary>
// Example for setting:
// SessionOptions.OrtTensorRTProviderOptions trt_options;
// trt_options.device_id = 0;
// trt_options.has_trt_options = 1;
// trt_options.trt_max_workspace_size = (UIntPtr) (1<<30);
// trt_options.trt_fp16_enable = 1;
// trt_options.trt_int8_enable = 1;
// trt_options.trt_int8_calibration_table_name = "calibration.flatbuffers";
// trt_options.trt_int8_use_native_calibration_table = 0;
public struct OrtTensorRTProviderOptions
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OrtTensorRTProviderOptions

Here we two have two duplicate structures essentially for the same purpose. Can we unify them?

{
public int device_id; //!< cuda device id. Default is 0. </typeparam>
public int has_trt_options; //!< override environment variables with following TensorRT settings at runtime. Default 0 = false, nonzero = true.
public UIntPtr trt_max_workspace_size; //!< maximum workspace size for TensorRT. ORT C++ DLL has this field to be the type of size_t, hence using UIntPtr for conversion.
public int trt_fp16_enable; //!< enable TensorRT FP16 precision. Default 0 = false, nonzero = true.
public int trt_int8_enable; //!< enable TensorRT INT8 precision. Default 0 = false, nonzero = true.
public String trt_int8_calibration_table_name; //!< TensorRT INT8 calibration table name.
public int trt_int8_use_native_calibration_table; //!< use native TensorRT generated calibration table. Default 0 = false, nonzero = true
public int trt_max_partition_iterations; //!< maximum number of iterations allowed in model partitioning for TensorRT.
public int trt_min_subgraph_size; //!< minimum node size in a subgraph after partitioning.
public int trt_dump_subgraphs; //!< dump the subgraphs that are transformed into TRT engines in onnx format to the filesystem. Default 0 = false, nonzero = true
public int trt_engine_cache_enable; //!< enable TensorRT engine caching. Default 0 = false, nonzero = true
public String trt_cache_path; //!< specify path for TensorRT engine and profile files if engine_cache_enable is enabled, or INT8 calibration table file if trt_int8_enable is enabled.
}

/// <summary>
/// Holds provider options configuration for creating an InferenceSession.
/// </summary>
public class ProviderOptions : SafeHandle
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SafeHandle

Similar comment. Need to decide if we want to keep this as a SafeHandle. If there is a little chance that this will ever hold a native resource, then it would be a burden on a user always dipose of it.

{
internal IntPtr Handle
{
get
{
return handle;
}
}

#region Constructor and Factory methods

/// <summary>
/// Constructs an empty ProviderOptions
/// </summary>
public ProviderOptions()
: base(IntPtr.Zero, true)
{
}

#endregion

#region Public Methods

/// <summary>
/// Get TensorRT provider options with default setting.
/// </summary>
/// <returns> TRT provider options instance. </returns>
public static OrtTensorRTProviderOptions GetDefaultTensorRTProviderOptions()
{
OrtTensorRTProviderOptions trt_options;
trt_options.device_id = 0;
trt_options.has_trt_options = 0;
trt_options.trt_max_workspace_size = (UIntPtr)(1 << 30);
trt_options.trt_fp16_enable = 0;
trt_options.trt_int8_enable = 0;
trt_options.trt_int8_calibration_table_name = "";
trt_options.trt_int8_use_native_calibration_table = 0;
trt_options.trt_max_partition_iterations = 1000;
trt_options.trt_min_subgraph_size = 1;
trt_options.trt_dump_subgraphs = 0;
trt_options.trt_engine_cache_enable = 0;
trt_options.trt_cache_path = "";

return trt_options;
}
#endregion

#region Public Properties

/// <summary>
/// Overrides SafeHandle.IsInvalid
/// </summary>
/// <value>returns true if handle is equal to Zero</value>
public override bool IsInvalid { get { return handle == IntPtr.Zero; } }

#endregion

#region SafeHandle
/// <summary>
/// Overrides SafeHandle.ReleaseHandle() to properly dispose of
/// the native instance of SessionOptions
/// </summary>
/// <returns>always returns true</returns>
protected override bool ReleaseHandle()
{
handle = IntPtr.Zero;
return true;
}

#endregion
}
}
107 changes: 107 additions & 0 deletions csharp/src/Microsoft.ML.OnnxRuntime/SessionOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public class SessionOptions : SafeHandle
{
// Delay-loaded CUDA or cuDNN DLLs. Currently, delayload is disabled. See cmake/CMakeLists.txt for more information.
private static string[] cudaDelayLoadedLibs = { };
private static string[] trtDelayLoadedLibs = { };

#region Constructor and Factory methods

Expand Down Expand Up @@ -75,6 +76,42 @@ public static SessionOptions MakeSessionOptionWithCudaProvider(int deviceId = 0)
return options;
}

/// <summary>
/// A helper method to construct a SessionOptions object for TensorRT execution.
/// Use only if CUDA/TensorRT are installed and you have the onnxruntime package specific to this Execution Provider.
/// </summary>
/// <param name="deviceId"></param>
/// <returns>A SessionsOptions() object configured for execution on deviceId</returns>
public static SessionOptions MakeSessionOptionWithTensorrtProvider(int deviceId = 0)
{
CheckTensorrtExecutionProviderDLLs();
SessionOptions options = new SessionOptions();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SessionOptions options = new SessionOptions();

Same comment on handling leaking options when the below throws.

NativeApiStatus.VerifySuccess(NativeMethods.OrtSessionOptionsAppendExecutionProvider_Tensorrt(options.Handle, deviceId));
NativeApiStatus.VerifySuccess(NativeMethods.OrtSessionOptionsAppendExecutionProvider_CUDA(options.Handle, deviceId));
NativeApiStatus.VerifySuccess(NativeMethods.OrtSessionOptionsAppendExecutionProvider_CPU(options.Handle, 1));
return options;
}

/// <summary>
/// A helper method to construct a SessionOptions object for TensorRT execution.
/// Use only if CUDA/TensorRT are installed and you have the onnxruntime package specific to this Execution Provider.
/// </summary>
/// <param name="trt_options">Provider Options for TensorRT EP.</param>
/// <returns>A SessionsOptions() object configured for execution on deviceId</returns>
public static SessionOptions MakeSessionOptionWithTensorrtProvider(OrtTensorRTProviderOptions trt_options)
{
CheckTensorrtExecutionProviderDLLs();
SessionOptions options = new SessionOptions();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SessionOptions

Ditto.Need to be dispose of on exception


OrtTensorRTProviderOptionsNative trt_options_native;
trt_options_native = PrepareNativeTensorRTProviderOptions(trt_options);

NativeApiStatus.VerifySuccess(NativeMethods.SessionOptionsAppendExecutionProvider_TensorRT(options.Handle, ref trt_options_native));
NativeApiStatus.VerifySuccess(NativeMethods.OrtSessionOptionsAppendExecutionProvider_CUDA(options.Handle, trt_options.device_id));
NativeApiStatus.VerifySuccess(NativeMethods.OrtSessionOptionsAppendExecutionProvider_CPU(options.Handle, 1));
return options;
}

/// <summary>
/// A helper method to construct a SessionOptions object for Nuphar execution.
/// Use only if you have the onnxruntime package specific to this Execution Provider.
Expand Down Expand Up @@ -180,6 +217,18 @@ public void AppendExecutionProvider_Tensorrt(int deviceId)
NativeApiStatus.VerifySuccess(NativeMethods.OrtSessionOptionsAppendExecutionProvider_Tensorrt(handle, deviceId));
}

/// <summary>
/// Use only if you have the onnxruntime package specific to this Execution Provider.
/// </summary>
/// <param name="trt_options">Provider Options for TensorRT EP.</param>
public void AppendExecutionProvider_Tensorrt(OrtTensorRTProviderOptions trt_options)
{
OrtTensorRTProviderOptionsNative trt_options_native;
trt_options_native = PrepareNativeTensorRTProviderOptions(trt_options);

NativeApiStatus.VerifySuccess(NativeMethods.SessionOptionsAppendExecutionProvider_TensorRT(handle, ref trt_options_native));
}

/// <summary>
/// Use only if you have the onnxruntime package specific to this Execution Provider.
/// </summary>
Expand Down Expand Up @@ -325,6 +374,7 @@ public void AddFreeDimensionOverrideByName(string dimName, long dimValue)
NativeApiStatus.VerifySuccess(NativeMethods.OrtAddFreeDimensionOverrideByName(handle, pinnedDimName.Pointer, dimValue));
}
}

#endregion

internal IntPtr Handle
Expand Down Expand Up @@ -624,6 +674,63 @@ private static bool CheckCudaExecutionProviderDLLs()
return true;
}

private static bool CheckTensorrtExecutionProviderDLLs()
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
foreach (var dll in trtDelayLoadedLibs)
{
IntPtr handle = LoadLibrary(dll);
if (handle != IntPtr.Zero)
continue;
var sysdir = new StringBuilder(String.Empty, 2048);
GetSystemDirectory(sysdir, (uint)sysdir.Capacity);
throw new OnnxRuntimeException(
ErrorCode.NoSuchFile,
$"kernel32.LoadLibrary():'{dll}' not found. TensorRT/CUDA are required for GPU execution. " +
$". Verify it is available in the system directory={sysdir}. Else copy it to the output folder."
);
}
}
return true;
}

private static OrtTensorRTProviderOptionsNative PrepareNativeTensorRTProviderOptions(OrtTensorRTProviderOptions trt_options)
{
OrtTensorRTProviderOptionsNative trt_options_native;
trt_options_native.device_id = trt_options.device_id;
trt_options_native.has_user_compute_stream = 0;
trt_options_native.user_compute_stream = IntPtr.Zero;
trt_options_native.has_trt_options = trt_options.has_trt_options;
if ((ulong)trt_options.trt_max_workspace_size > (1 << 30))
{
trt_options_native.trt_max_workspace_size = (UIntPtr)(1 << 30);
}
else
{
trt_options_native.trt_max_workspace_size = trt_options.trt_max_workspace_size;
}
trt_options_native.trt_fp16_enable = trt_options.trt_fp16_enable;
trt_options_native.trt_int8_enable = trt_options.trt_int8_enable;
var tableNamePinned = GCHandle.Alloc(NativeOnnxValueHelper.StringToZeroTerminatedUtf8(trt_options.trt_int8_calibration_table_name), GCHandleType.Pinned);
using (var pinnedSettingsName = new PinnedGCHandle(tableNamePinned))
{
trt_options_native.trt_int8_calibration_table_name = pinnedSettingsName.Pointer;
Copy link
Member

@yuslepukhin yuslepukhin Apr 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pinnedSettingsName

But using clause will unpin this and will invalidate the Pointer value.

}
trt_options_native.trt_int8_use_native_calibration_table = trt_options.trt_int8_use_native_calibration_table;
trt_options_native.trt_max_partition_iterations = trt_options.trt_max_partition_iterations;
trt_options_native.trt_min_subgraph_size = trt_options.trt_min_subgraph_size;
trt_options_native.trt_dump_subgraphs = trt_options.trt_dump_subgraphs;
trt_options_native.trt_engine_cache_enable = trt_options.trt_engine_cache_enable;
var cachePathPinned = GCHandle.Alloc(NativeOnnxValueHelper.StringToZeroTerminatedUtf8(trt_options.trt_cache_path), GCHandleType.Pinned);
using (var pinnedSettingsName2 = new PinnedGCHandle(cachePathPinned))
{
trt_options_native.trt_cache_path = pinnedSettingsName2.Pointer;
Copy link
Member

@yuslepukhin yuslepukhin Apr 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pinnedSettingsName2

Same thing here. Memory should say pinned for the duration of the native call.This is done, so GC does not move memory while it is accessed from the native code. Thus, pinning should take place just prior to native call that is using this and then unpinned right after the call.

}

return trt_options_native;
}


#endregion
#region SafeHandle
Expand Down
49 changes: 49 additions & 0 deletions csharp/test/Microsoft.ML.OnnxRuntime.Tests/InferenceTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,54 @@ public void CanCreateAndDisposeSessionWithModelPath()
}
}



#if USE_TENSORRT
[Fact]
private void TestTensorRTProviderOptions()
{
string modelPath = Path.Combine(Directory.GetCurrentDirectory(), "squeezenet.onnx");
string calTablPath = Path.Combine(Directory.GetCurrentDirectory(), "squeezenet_calibration.flatbuffers");
//Environment.SetEnvironmentVariable("ORT_TENSORRT_ENGINE_CACHE_ENABLE", "1");

OrtTensorRTProviderOptions trt_options = ProviderOptions.GetDefaultTensorRTProviderOptions();
trt_options.device_id = 0;
trt_options.trt_int8_calibration_table_name = calTablPath;
trt_options.has_trt_options = 1;
trt_options.trt_max_workspace_size = (UIntPtr)(1 << 30);
trt_options.trt_fp16_enable = 1;
trt_options.trt_int8_enable = 1;
trt_options.trt_int8_use_native_calibration_table = 0;

var session = new InferenceSession(modelPath, SessionOptions.MakeSessionOptionWithTensorrtProvider(trt_options));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

session

Session is a disposable class. So this should either be wrapped into a using clause, tyr/finally. OR, if you have trouble managing so many disposables, you can add then to a disposable list which alone would require disposal. See examples in this file. The issue here, people copy this code as examples, and then complain about leaks.

var inputMeta = session.InputMetadata;
var container = new List<NamedOnnxValue>();
float[] inputData = LoadTensorFromFile(@"bench.in"); // this is the data for only one input tensor for this model
foreach (var name in inputMeta.Keys)
{
Assert.Equal(typeof(float), inputMeta[name].ElementType);
Assert.True(inputMeta[name].IsTensor);
var tensor = new DenseTensor<float>(inputData, inputMeta[name].Dimensions);
container.Add(NamedOnnxValue.CreateFromTensor<float>(name, tensor));
}


using (var results = session.Run(container))
{
// Following code is temporarily commented.
// Even though we enable fp16 or int8 through provider options, it could be disabled from TRT EP due to GPU not supporting fp16 or int8.
// Once From/ToProviderOptions() has been implemented in TRT EP, better test cases will be added.
/*
string[] files = Directory.GetFiles(Directory.GetCurrentDirectory(), "*int8*.engine");
Assert.True(files.Any());
files = Directory.GetFiles(Directory.GetCurrentDirectory(), "*fp16*.engine");
Assert.True(files.Any());
*/
}
}
#endif


[Theory]
[InlineData(GraphOptimizationLevel.ORT_DISABLE_ALL, true)]
[InlineData(GraphOptimizationLevel.ORT_DISABLE_ALL, false)]
Expand Down Expand Up @@ -2361,6 +2409,7 @@ private void VerifyNativeMethodsExist()
#endif
#if USE_TENSORRT
,"OrtSessionOptionsAppendExecutionProvider_Tensorrt"
,"SessionOptionsAppendExecutionProvider_TensorRT"
#endif
#if USE_MIGRAPHX
,"OrtSessionOptionsAppendExecutionProvider_MIGraphX"
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ extern "C" {
#endif

ORT_API_STATUS(OrtSessionOptionsAppendExecutionProvider_Tensorrt, _In_ OrtSessionOptions* options, int device_id);
ORT_API_STATUS(SessionOptionsAppendExecutionProvider_TensorRT, _In_ OrtSessionOptions* options, const OrtTensorRTProviderOptions* tensorrt_options);

#ifdef __cplusplus
}
Expand Down
Loading