Update Projects to .NET 8 in MLNET 4.0 Branch #6749

JakeRadMSFT · 2023-06-29T22:47:36Z

This PR drops netfx and .netstandard support.
ML.NET 4.0 will target .NET 8
Fixes various issues hit targeting .NET 8
Cleans up build/project files to remove multi-targeting related things (probably still more work to do here)

TODO:

Open bug for looking at our code analysis things
Open bug enabling the nullable things for entire repo
Open bug to consolidate to a shared ApiCompatSuppressionFile
- Reference: https://github.com/search?q=repo%3Adotnet%2Fruntime%20ApiCompatSuppressionFile&type=code
Open bug for removing TargetFramework/NET8 from Build Definition

JakeRadMSFT · 2023-06-29T22:49:53Z

src/Microsoft.ML.CpuMath/SseIntrinsics.cs

@@ -19,7 +19,7 @@
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 using Microsoft.ML.Internal.CpuMath.Core;
-using nuint = System.UInt64;
+using nUInt = System.UInt64;


Thoughts on name? It didn't like all lowercase.

I would prefer lowercase - because this is standard for .net

wait. .net have nuint native type. why nuint = uint64??

Right - I'm not sure why this is here. I think the alias should be removed since it's not actually behaving like a native integer.

JakeRadMSFT · 2023-06-29T22:51:08Z

src/Microsoft.ML.OnnxConverter/OnnxMl.cs

 //     Generated by the protocol buffer compiler.  DO NOT EDIT!
 //     source: onnx-ml.proto3
 // </auto-generated>
 #pragma warning disable 1591, 0612, 3021
 #region Designer generated code

+#pragma warning disable CS8981 // The type name only contains lower-cased ascii characters. Such names may become reserved for the language.


This could be moved up to the other disables

JakeRadMSFT · 2023-07-10T21:56:47Z

.vsts-dotnet-ci.yml

    buildScript: ./build.sh
    container: UbuntuCrossArmContainer
    customMatrixes:
      Debug_Build:
        _configuration: Debug
        _config_short: DI
        _includeBenchmarkData: false
-        _targetFramework: net6.0
+        _targetFramework: net8.0


TODO: Try to remove _targetFramework stuff

src/Microsoft.Extensions.ML/CompatibilitySuppressions.xml

codecov · 2023-07-11T18:10:17Z

Codecov Report

Merging #6749 (1c49d1e) into feature/4.0 (b48e9b7) will increase coverage by 0.23%.
The diff coverage is 76.19%.

@@               Coverage Diff               @@
##           feature/4.0    #6749      +/-   ##
===============================================
+ Coverage        69.64%   69.87%   +0.23%     
===============================================
  Files             1237     1367     +130     
  Lines           247617   256527    +8910     
  Branches         25436    26325     +889     
===============================================
+ Hits            172446   179247    +6801     
- Misses           68561    70376    +1815     
- Partials          6610     6904     +294

Flag	Coverage Δ
Debug	`69.87% <76.19%> (+0.23%)`	⬆️
production	`64.72% <73.68%> (+0.53%)`	⬆️
test	`88.89% <100.00%> (+<0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
src/Microsoft.ML.Core/CommandLine/CmdParser.cs	`56.81% <100.00%> (+0.11%)`	⬆️
...oft.ML.Core/Utilities/FuncInstanceMethodInfo1`2.cs	`90.32% <ø> (ø)`
...oft.ML.Core/Utilities/FuncInstanceMethodInfo1`3.cs	`80.64% <ø> (ø)`
...oft.ML.Core/Utilities/FuncInstanceMethodInfo1`4.cs	`80.64% <ø> (ø)`
...oft.ML.Core/Utilities/FuncInstanceMethodInfo2`4.cs	`80.64% <ø> (ø)`
...oft.ML.Core/Utilities/FuncInstanceMethodInfo3`3.cs	`0.00% <ø> (ø)`
...oft.ML.Core/Utilities/FuncInstanceMethodInfo3`4.cs	`0.00% <ø> (ø)`
src/Microsoft.ML.Core/Utilities/Random.cs	`80.12% <ø> (-5.13%)`	⬇️
src/Microsoft.ML.CpuMath/AvxIntrinsics.cs	`96.68% <100.00%> (ø)`
src/Microsoft.ML.CpuMath/SseIntrinsics.cs	`95.24% <100.00%> (-1.11%)`	⬇️
... and 10 more

... and 142 files with indirect coverage changes

.vsts-dotnet-ci.yml

src/Microsoft.ML.Core/CommandLine/CmdParser.cs

test/BaselineOutput/Common/EntryPoints/core_manifest.json

ericstj · 2023-07-12T22:48:55Z

src/Microsoft.ML.CpuMath/AvxIntrinsics.cs

@@ -15,7 +15,7 @@
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 using Microsoft.ML.Internal.CpuMath.Core;
-using nuint = System.UInt64;
+using nUInt = System.UInt64;


I'd just as soon remove this type alias to avoid confusion. Doesn't seem all that useful since it's not ifdef'ed.

ericstj · 2023-07-12T22:49:53Z

src/Microsoft.ML.CpuMath/SseIntrinsics.cs

@@ -19,7 +19,7 @@
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 using Microsoft.ML.Internal.CpuMath.Core;
-using nuint = System.UInt64;
+using nUInt = System.UInt64;


Right - I'm not sure why this is here. I think the alias should be removed since it's not actually behaving like a native integer.

ericstj · 2023-07-12T22:52:49Z

src/Microsoft.ML.TensorFlow/TensorflowUtils.cs

            }
+
+            if (Directory.Exists(folder))


Was there a reason you duplicated this check?

ericstj · 2023-07-12T22:55:48Z

src/Microsoft.ML.Tokenizers/Model/BPE.cs

@@ -248,9 +248,17 @@ public override string[] Save(string path, string? prefix = null)
        internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadFile(string? vocab, string? merges)
        {
            Dictionary<string, int>? dic;
-            using (Stream stream = File.OpenRead(vocab))
+
+            if (vocab != null)


Did we intend to support null here? Before I bet File.OpenRead would throw. Should we throw ANE instead?

- Disabled Nullable on FuncInstanceMethodInfos - Updated web request to use HTTPClient - Resolved some "WindowsOnly" issues. - Remove .NET Standard only related things

…ing to resolve difference in Enum serialization between .NET 6 and .NET 8.

…um values.

ericstj · 2024-01-23T17:17:29Z

src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj

@@ -2,7 +2,7 @@
  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />

  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>


For this project we probably want to keep netstandard2.0. We could consider cross-targeting if we want to benefit from net6.0+/net8.0+ APIs.

ghost assigned JakeRadMSFT Jun 29, 2023

JakeRadMSFT commented Jun 29, 2023

View reviewed changes

JakeRadMSFT changed the title ~~Update Projects to .NET 8 in MLNET 4.0 Branch~~ WUP - Update Projects to .NET 8 in MLNET 4.0 Branch Jun 30, 2023

JakeRadMSFT changed the title ~~WUP - Update Projects to .NET 8 in MLNET 4.0 Branch~~ WIP - Update Projects to .NET 8 in MLNET 4.0 Branch Jun 30, 2023

JakeRadMSFT commented Jul 10, 2023

View reviewed changes

src/Microsoft.Extensions.ML/CompatibilitySuppressions.xml Show resolved Hide resolved

JakeRadMSFT commented Jul 11, 2023

View reviewed changes

.vsts-dotnet-ci.yml Show resolved Hide resolved

JakeRadMSFT commented Jul 11, 2023

View reviewed changes

src/Microsoft.ML.Core/CommandLine/CmdParser.cs Show resolved Hide resolved

JakeRadMSFT commented Jul 11, 2023

View reviewed changes

test/BaselineOutput/Common/EntryPoints/core_manifest.json Show resolved Hide resolved

JakeRadMSFT changed the title ~~WIP - Update Projects to .NET 8 in MLNET 4.0 Branch~~ Update Projects to .NET 8 in MLNET 4.0 Branch Jul 11, 2023

JakeRadMSFT requested review from ericstj and michaelgsharp July 11, 2023 18:54

JakeRadMSFT force-pushed the u/jakerad/net8 branch from ad1243a to 4157319 Compare July 11, 2023 21:56

ericstj reviewed Jul 12, 2023

View reviewed changes

JakeRadMSFT added 12 commits October 5, 2023 15:09

Update all projects to be .NET 8

0735dea

Fix .NET 8 Build

7cb5d4e

- Disabled Nullable on FuncInstanceMethodInfos - Updated web request to use HTTPClient - Resolved some "WindowsOnly" issues. - Remove .NET Standard only related things

Update tests and targets from NET6.0 to NET8.0

752458f

More .NET6.0/461 clean up

c4a6233

Remove TargetsForTfmSpecificBuildOutput for CPUMath.

9024a90

Add CompatibilitySuppressions

5832978

Switch InternalDataKind to use GetString instead of the default ToStr…

fe6f259

…ing to resolve difference in Enum serialization between .NET 6 and .NET 8.

Clean up CpuMath related csproj

5cba4cb

Update baseline

e9339fe

Update baseline for entry points - change was for re-ordering some en…

2bc7974

…um values.

Target 8.0 for CodeAnalyzer

470215b

Try updating Coverlet

684fae9

JakeRadMSFT force-pushed the u/jakerad/net8 branch from 4157319 to 684fae9 Compare October 5, 2023 22:10

Remove TargetFramework from Data Analysis Perf Test Project.

1c49d1e

Romfos mentioned this pull request Jan 9, 2024

Re-evaluate supported .NET products rabbitmq/rabbitmq-dotnet-client#1424

Open

ericstj reviewed Jan 23, 2024

View reviewed changes

ericstj mentioned this pull request Mar 21, 2024

Make ML.NET tests target net8.0 and net9.0 instead of net6.0 #7097

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Projects to .NET 8 in MLNET 4.0 Branch #6749

Update Projects to .NET 8 in MLNET 4.0 Branch #6749

JakeRadMSFT commented Jun 29, 2023 •

edited

JakeRadMSFT Jun 29, 2023

Romfos Jul 10, 2023

Romfos Jul 10, 2023

ericstj Jul 12, 2023

JakeRadMSFT Jun 29, 2023

JakeRadMSFT Jul 10, 2023

codecov bot commented Jul 11, 2023 •

edited

ericstj Jul 12, 2023

ericstj Jul 12, 2023

ericstj Jul 12, 2023

ericstj Jul 12, 2023

ericstj Jan 23, 2024

Update Projects to .NET 8 in MLNET 4.0 Branch #6749

Are you sure you want to change the base?

Update Projects to .NET 8 in MLNET 4.0 Branch #6749

Conversation

JakeRadMSFT commented Jun 29, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Jul 11, 2023 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JakeRadMSFT commented Jun 29, 2023 •

edited

codecov bot commented Jul 11, 2023 •

edited