Update OnnxRuntime to latest version. (dotnet#4337)

* Update OnnxRuntime to latest version. OnnxRuntime supports win-x86, so start running tests on the win-x86 leg. * Update README - ONNX is supported on 32-bit. * Consolidate "is onnx runtime supported" logic in the tests.
ibrahim324 · Oct 17, 2019 · d871655 · d871655
1 parent a54a431
commit d871655
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -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
 

diff --git a/build/Dependencies.props b/build/Dependencies.props
@@ -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>

diff --git a/test/Microsoft.ML.TestFramework/Attributes/OnnxFactAttribute.cs b/test/Microsoft.ML.TestFramework/Attributes/OnnxFactAttribute.cs
@@ -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));
     }
 }
diff --git a/test/Microsoft.ML.Tests/OnnxConversionTest.cs b/test/Microsoft.ML.Tests/OnnxConversionTest.cs
@@ -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>