Skip to content

Update OnnxRuntime to latest version. #4337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 17, 2019
Merged

Update OnnxRuntime to latest version. #4337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfeaa31
Update OnnxRuntime to latest version.
eerhardt Oct 15, 2019
5f1091a
Update README - ONNX is supported on 32-bit.
eerhardt Oct 15, 2019
5f8bcba
Consolidate "is onnx runtime supported" logic in the tests.
eerhardt Oct 15, 2019
a5358ea
Merge remote-tracking branch 'upstream/master' into UpdateOnnx
Oct 17, 2019
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ There a list of short videos each one focusing on a particular single topic of M

ML.NET runs on Windows, Linux, and macOS using [.NET Core](https://github.com/dotnet/core), or Windows using .NET Framework.

64 bit is supported on all platforms. 32 bit is supported on Windows, except for TensorFlow, LightGBM, and ONNX related functionality.
64 bit is supported on all platforms. 32 bit is supported on Windows, except for TensorFlow and LightGBM related functionality.

## ML.NET Nuget packages status

Expand Down
2 changes: 1 addition & 1 deletion build/Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<GoogleProtobufPackageVersion>3.5.1</GoogleProtobufPackageVersion>
<LightGBMPackageVersion>2.2.3</LightGBMPackageVersion>
<MicrosoftExtensionsPackageVersion>2.1.0</MicrosoftExtensionsPackageVersion>
<MicrosoftMLOnnxRuntimePackageVersion>0.4.0</MicrosoftMLOnnxRuntimePackageVersion>
<MicrosoftMLOnnxRuntimePackageVersion>0.5.1</MicrosoftMLOnnxRuntimePackageVersion>
<MlNetMklDepsPackageVersion>0.0.0.9</MlNetMklDepsPackageVersion>
<ParquetDotNetPackageVersion>2.1.3</ParquetDotNetPackageVersion>
<SystemDrawingCommonPackageVersion>4.5.0</SystemDrawingCommonPackageVersion>
Expand Down
8 changes: 6 additions & 2 deletions test/Microsoft.ML.TestFramework/Attributes/OnnxFactAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,18 @@ namespace Microsoft.ML.TestFramework.Attributes
/// </summary>
public sealed class OnnxFactAttribute : EnvironmentSpecificFactAttribute
{
public OnnxFactAttribute() : base("Onnx is 64-bit Windows only")
public OnnxFactAttribute() : base("Onnx is not supported on Linux with libc < v2.23")
{
}

/// <inheritdoc />
protected override bool IsEnvironmentSupported()
{
return Environment.Is64BitProcess && (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || AttributeHelpers.CheckLibcVersionGreaterThanMinimum(new Version(2, 23)));
return IsOnnxRuntimeSupported;
}

public static bool IsOnnxRuntimeSupported { get; } =
!RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
|| AttributeHelpers.CheckLibcVersionGreaterThanMinimum(new Version(2, 23));
}
}
2 changes: 1 addition & 1 deletion test/Microsoft.ML.Tests/OnnxConversionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public OnnxConversionTest(ITestOutputHelper output) : base(output)

private bool IsOnnxRuntimeSupported()
{
return Environment.Is64BitProcess && (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || AttributeHelpers.CheckLibcVersionGreaterThanMinimum(new System.Version(2, 23)));
return OnnxFactAttribute.IsOnnxRuntimeSupported;
}

/// <summary>
Expand Down