From f5dacd7e238a13d3f436ace4975e4b0774fcca62 Mon Sep 17 00:00:00 2001
From: Michael Sharp <misharp@microsoft.com>
Date: Thu, 25 Jan 2024 15:20:20 -0700
Subject: [PATCH 1/3] onnx update

---
 eng/Versions.props                            |  2 +-
 src/Microsoft.ML.OnnxTransformer/OnnxUtils.cs | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 3afb44aab2..05f6762584 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -39,7 +39,7 @@
     <MicrosoftCodeAnalysisAnalyzersVersion>3.3.0</MicrosoftCodeAnalysisAnalyzersVersion>
     <MicrosoftCodeAnalysisCSharpVersion>3.9.0</MicrosoftCodeAnalysisCSharpVersion>
     <MicrosoftDotNetInteractiveVersion>1.0.0-beta.23509.3</MicrosoftDotNetInteractiveVersion>
-    <MicrosoftMLOnnxRuntimeVersion>1.14.0</MicrosoftMLOnnxRuntimeVersion>
+    <MicrosoftMLOnnxRuntimeVersion>1.16.3</MicrosoftMLOnnxRuntimeVersion>
     <MlNetMklDepsVersion>0.0.0.12</MlNetMklDepsVersion>
     <!--  
 @("inteltbb.devel", "win", "2021.7.1.15305")
diff --git a/src/Microsoft.ML.OnnxTransformer/OnnxUtils.cs b/src/Microsoft.ML.OnnxTransformer/OnnxUtils.cs
index 154a3eeb6c..2680f143ff 100644
--- a/src/Microsoft.ML.OnnxTransformer/OnnxUtils.cs
+++ b/src/Microsoft.ML.OnnxTransformer/OnnxUtils.cs
@@ -299,7 +299,15 @@ private List<OnnxVariableInfo> GetOnnxVariablesFromMetadata(IReadOnlyDictionary<
                 else
                 {
                     // No user-specified shape is found, so the shape loaded from ONNX model file is used.
-                    info = new OnnxVariableInfo(name, meta.Dimensions.ToList(), meta.ElementType, dataViewType, caster);
+                    // If its not a tensor then its a Sequence or Map, dimensions should be null and type is always NamedOnnxValue.
+                    if (meta.IsTensor == false)
+                    {
+                        info = new OnnxVariableInfo(name, null, typeof(NamedOnnxValue), dataViewType, caster);
+                    }
+                    else
+                    {
+                        info = new OnnxVariableInfo(name, meta.Dimensions.ToList(), meta.ElementType, dataViewType, caster);
+                    }
                 }
 
                 onnxVariableInfos.Add(info);

From 7966d77093649c0623a302a60d76954f760b57ab Mon Sep 17 00:00:00 2001
From: Michael Sharp <misharp@microsoft.com>
Date: Thu, 25 Jan 2024 16:14:26 -0700
Subject: [PATCH 2/3] formatting update

---
 src/Microsoft.ML.OnnxTransformer/OnnxUtils.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Microsoft.ML.OnnxTransformer/OnnxUtils.cs b/src/Microsoft.ML.OnnxTransformer/OnnxUtils.cs
index 2680f143ff..68d9290676 100644
--- a/src/Microsoft.ML.OnnxTransformer/OnnxUtils.cs
+++ b/src/Microsoft.ML.OnnxTransformer/OnnxUtils.cs
@@ -300,14 +300,10 @@ private List<OnnxVariableInfo> GetOnnxVariablesFromMetadata(IReadOnlyDictionary<
                 {
                     // No user-specified shape is found, so the shape loaded from ONNX model file is used.
                     // If its not a tensor then its a Sequence or Map, dimensions should be null and type is always NamedOnnxValue.
-                    if (meta.IsTensor == false)
-                    {
+                    if (!meta.IsTensor)
                         info = new OnnxVariableInfo(name, null, typeof(NamedOnnxValue), dataViewType, caster);
-                    }
                     else
-                    {
                         info = new OnnxVariableInfo(name, meta.Dimensions.ToList(), meta.ElementType, dataViewType, caster);
-                    }
                 }
 
                 onnxVariableInfos.Add(info);

From 859c0781d2d312496467510aa83c7a3dd22593e4 Mon Sep 17 00:00:00 2001
From: Michael Sharp <misharp@microsoft.com>
Date: Wed, 21 Feb 2024 01:28:33 -0700
Subject: [PATCH 3/3] adding onnx runtime reference to automl tests

---
 test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj b/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
index dff9aea4b5..1f5aecb7b0 100644
--- a/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
+++ b/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
@@ -19,6 +19,7 @@
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionVersion)" />
     <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
     <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
+    <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
   </ItemGroup>
 
   <ItemGroup>