From be2a4cf4e3b7ea46663ebc7cbcb75e7239eab1e4 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 16 Dec 2024 13:45:05 -0800 Subject: [PATCH 1/4] Enable APICompat for non-stable projects --- eng/BranchInfo.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/BranchInfo.props b/eng/BranchInfo.props index b3f8f74aa3..ba06bbb352 100644 --- a/eng/BranchInfo.props +++ b/eng/BranchInfo.props @@ -38,5 +38,7 @@ 0 23 0 + + 0.$([MSBuild]::Subtract($(MinorVersion), 1)).0 From 291b435d489656659286969dc7ce04402e72e613 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 16 Dec 2024 15:15:00 -0800 Subject: [PATCH 2/4] Add suppression for GetSortIndices GetSortIndices was accidentally regressed in the last release. This compat suppression is permitting the fix for that regression. --- .../CompatibilitySuppressions.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/Microsoft.Data.Analysis/CompatibilitySuppressions.xml diff --git a/src/Microsoft.Data.Analysis/CompatibilitySuppressions.xml b/src/Microsoft.Data.Analysis/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..268bcb6ecf --- /dev/null +++ b/src/Microsoft.Data.Analysis/CompatibilitySuppressions.xml @@ -0,0 +1,18 @@ + + + + + CP0005 + M:Microsoft.Data.Analysis.DataFrameColumn.GetSortIndices(System.Boolean,System.Boolean) + lib/net8.0/Microsoft.Data.Analysis.dll + lib/net8.0/Microsoft.Data.Analysis.dll + true + + + CP0005 + M:Microsoft.Data.Analysis.DataFrameColumn.GetSortIndices(System.Boolean,System.Boolean) + lib/netstandard2.0/Microsoft.Data.Analysis.dll + lib/netstandard2.0/Microsoft.Data.Analysis.dll + true + + \ No newline at end of file From 0f7ac8413d9ffc62308d095dee8c5ff37d1d5f91 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 16 Dec 2024 16:32:37 -0800 Subject: [PATCH 3/4] Add suppressions for breaking changes in Microsoft.ML.GenAI.Core --- .../CompatibilitySuppressions.xml | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 src/Microsoft.ML.GenAI.Core/CompatibilitySuppressions.xml diff --git a/src/Microsoft.ML.GenAI.Core/CompatibilitySuppressions.xml b/src/Microsoft.ML.GenAI.Core/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..a062f40aca --- /dev/null +++ b/src/Microsoft.ML.GenAI.Core/CompatibilitySuppressions.xml @@ -0,0 +1,99 @@ + + + + + CP0002 + M:Microsoft.ML.GenAI.Core.CausalLMModelInput.#ctor(TorchSharp.torch.Tensor,TorchSharp.torch.Tensor,TorchSharp.torch.Tensor,System.Int32,TorchSharp.torch.Tensor,System.Boolean,System.Boolean,System.Boolean) + lib/net8.0/Microsoft.ML.GenAI.Core.dll + lib/net8.0/Microsoft.ML.GenAI.Core.dll + true + + + CP0002 + M:Microsoft.ML.GenAI.Core.CausalLMModelOutput.#ctor(TorchSharp.torch.Tensor,TorchSharp.torch.Tensor,TorchSharp.torch.Tensor[],TorchSharp.torch.Tensor[],Microsoft.ML.GenAI.Core.IKVCache) + lib/net8.0/Microsoft.ML.GenAI.Core.dll + lib/net8.0/Microsoft.ML.GenAI.Core.dll + true + + + CP0002 + M:Microsoft.ML.GenAI.Core.CausalLMPipeline`2.get_Model + lib/net8.0/Microsoft.ML.GenAI.Core.dll + lib/net8.0/Microsoft.ML.GenAI.Core.dll + true + + + CP0002 + M:Microsoft.ML.GenAI.Core.CausalLMPipeline`2.get_Tokenizer + lib/net8.0/Microsoft.ML.GenAI.Core.dll + lib/net8.0/Microsoft.ML.GenAI.Core.dll + true + + + CP0002 + M:Microsoft.ML.GenAI.Core.CausalLMPipelineChatClient`2.GetService``1(System.Object) + lib/net8.0/Microsoft.ML.GenAI.Core.dll + lib/net8.0/Microsoft.ML.GenAI.Core.dll + true + + + CP0002 + M:Microsoft.ML.GenAI.Core.ICausalLMPipeline`2.get_Model + lib/net8.0/Microsoft.ML.GenAI.Core.dll + lib/net8.0/Microsoft.ML.GenAI.Core.dll + true + + + CP0002 + M:Microsoft.ML.GenAI.Core.ICausalLMPipeline`2.get_Tokenizer + lib/net8.0/Microsoft.ML.GenAI.Core.dll + lib/net8.0/Microsoft.ML.GenAI.Core.dll + true + + + CP0002 + M:Microsoft.ML.GenAI.Core.IMEAIChatTemplateBuilder.BuildPrompt(System.Collections.Generic.IList{Microsoft.Extensions.AI.ChatMessage},Microsoft.Extensions.AI.ChatOptions) + lib/net8.0/Microsoft.ML.GenAI.Core.dll + lib/net8.0/Microsoft.ML.GenAI.Core.dll + true + + + CP0006 + M:Microsoft.ML.GenAI.Core.IMEAIChatTemplateBuilder.BuildPrompt(System.Collections.Generic.IList{Microsoft.Extensions.AI.ChatMessage},Microsoft.Extensions.AI.ChatOptions,System.Boolean) + lib/net8.0/Microsoft.ML.GenAI.Core.dll + lib/net8.0/Microsoft.ML.GenAI.Core.dll + true + + + CP0006 + P:Microsoft.ML.GenAI.Core.ICausalLMPipeline.Model + lib/net8.0/Microsoft.ML.GenAI.Core.dll + lib/net8.0/Microsoft.ML.GenAI.Core.dll + true + + + CP0006 + P:Microsoft.ML.GenAI.Core.ICausalLMPipeline.Tokenizer + lib/net8.0/Microsoft.ML.GenAI.Core.dll + lib/net8.0/Microsoft.ML.GenAI.Core.dll + true + + + CP0006 + P:Microsoft.ML.GenAI.Core.ICausalLMPipeline`2.TypedModel + lib/net8.0/Microsoft.ML.GenAI.Core.dll + lib/net8.0/Microsoft.ML.GenAI.Core.dll + true + + + CP0006 + P:Microsoft.ML.GenAI.Core.ICausalLMPipeline`2.TypedTokenizer + lib/net8.0/Microsoft.ML.GenAI.Core.dll + lib/net8.0/Microsoft.ML.GenAI.Core.dll + true + + + PKV006 + net6.0 + + \ No newline at end of file From e8045824b227976d0596cb0669a5a059927f18c5 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Tue, 17 Dec 2024 15:56:29 -0800 Subject: [PATCH 4/4] More GenAI suppressions --- .../CompatibilitySuppressions.xml | 15 +++++++++++++++ .../CompatibilitySuppressions.xml | 8 ++++++++ .../CompatibilitySuppressions.xml | 15 +++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 src/Microsoft.ML.GenAI.LLaMA/CompatibilitySuppressions.xml create mode 100644 src/Microsoft.ML.GenAI.Mistral/CompatibilitySuppressions.xml create mode 100644 src/Microsoft.ML.GenAI.Phi/CompatibilitySuppressions.xml diff --git a/src/Microsoft.ML.GenAI.LLaMA/CompatibilitySuppressions.xml b/src/Microsoft.ML.GenAI.LLaMA/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..8aa639baa9 --- /dev/null +++ b/src/Microsoft.ML.GenAI.LLaMA/CompatibilitySuppressions.xml @@ -0,0 +1,15 @@ + + + + + CP0002 + M:Microsoft.ML.GenAI.LLaMA.Llama3_1ChatTemplateBuilder.BuildPrompt(System.Collections.Generic.IList{Microsoft.Extensions.AI.ChatMessage},Microsoft.Extensions.AI.ChatOptions) + lib/net8.0/Microsoft.ML.GenAI.LLaMA.dll + lib/net8.0/Microsoft.ML.GenAI.LLaMA.dll + true + + + PKV006 + net6.0 + + \ No newline at end of file diff --git a/src/Microsoft.ML.GenAI.Mistral/CompatibilitySuppressions.xml b/src/Microsoft.ML.GenAI.Mistral/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..09034634f6 --- /dev/null +++ b/src/Microsoft.ML.GenAI.Mistral/CompatibilitySuppressions.xml @@ -0,0 +1,8 @@ + + + + + PKV006 + net6.0 + + \ No newline at end of file diff --git a/src/Microsoft.ML.GenAI.Phi/CompatibilitySuppressions.xml b/src/Microsoft.ML.GenAI.Phi/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..87637d34df --- /dev/null +++ b/src/Microsoft.ML.GenAI.Phi/CompatibilitySuppressions.xml @@ -0,0 +1,15 @@ + + + + + CP0002 + M:Microsoft.ML.GenAI.Phi.Phi3ChatTemplateBuilder.BuildPrompt(System.Collections.Generic.IList{Microsoft.Extensions.AI.ChatMessage},Microsoft.Extensions.AI.ChatOptions) + lib/net8.0/Microsoft.ML.GenAI.Phi.dll + lib/net8.0/Microsoft.ML.GenAI.Phi.dll + true + + + PKV006 + net6.0 + + \ No newline at end of file