Torch sharp version updates and test fixes

build/ci/job-template.yml

@@ -121,7 +121,7 @@ jobs:
     - ${{ if eq(parameters.nightlyBuild, 'false') }}:
       - ${{ if eq(parameters.innerLoop, 'false') }}:
         - ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
-          - script: set PATH=%PATH%;%USERPROFILE%\.nuget\packages\libtorch-cpu-win-x64\1.13.0.1\runtimes\win-x64\native;%USERPROFILE%\.nuget\packages\torchsharp\0.99.5\runtimes\win-x64\native & ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework)
+          - script: set PATH=%PATH%;%USERPROFILE%\.nuget\packages\libtorch-cpu-win-x64\2.1.0.1\runtimes\win-x64\native;%USERPROFILE%\.nuget\packages\torchsharp\0.101.5\runtimes\win-x64\native & ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework)
             displayName: Run All Tests.
         - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
           - script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest /p:TestRunnerAdditionalArguments='-trait$(spaceValue)Category=RunSpecificTest' /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework)

eng/Versions.props

@@ -62,8 +62,8 @@
     <TensorflowDotNETVersion>0.20.1</TensorflowDotNETVersion>
     <TensorFlowMajorVersion>2</TensorFlowMajorVersion>
     <TensorFlowVersion>2.3.1</TensorFlowVersion>
-    <TorchSharpVersion>0.99.5</TorchSharpVersion>
-    <LibTorchVersion>1.13.0.1</LibTorchVersion>
+    <TorchSharpVersion>0.101.5</TorchSharpVersion>
+    <LibTorchVersion>2.1.0.1</LibTorchVersion>
     <!-- Build/infrastructure Dependencies -->
     <CodecovVersion>1.12.4</CodecovVersion>
     <CoverletCollectorVersion>3.1.2</CoverletCollectorVersion>

src/Microsoft.ML.TorchSharp/AutoFormerV2/ObjectDetectionTrainer.cs

@@ -225,7 +225,7 @@ public Trainer(ObjectDetectionTrainer parent, IChannel ch, IDataView input)
                 Device = TorchUtils.InitializeDevice(Parent.Host);
 
                 // Move to GPU if we are running there
-                if (Device == CUDA)
+                if (Device.type == DeviceType.CUDA)
                     Model.cuda();
 
                 // Get the parameters that need optimization and set up the optimizer
@@ -531,7 +531,7 @@ internal ObjectDetectionTransformer(IHostEnvironment env, ObjectDetectionTrainer
             Model = model;
             Model.eval();
 
-            if (Device == CUDA)
+            if (Device.type == DeviceType.CUDA)
                 Model.cuda();
         }
 

src/Microsoft.ML.TorchSharp/Roberta/QATrainer.cs

@@ -207,7 +207,7 @@ public Trainer(QATrainer parent, IChannel ch, IDataView input)
                 Device = TorchUtils.InitializeDevice(Parent.Host);
 
                 // Move to GPU if we are running there
-                if (Device == CUDA)
+                if (Device.type == DeviceType.CUDA)
                     Model.cuda();
 
                 Tokenizer = TokenizerExtensions.GetInstance(ch);
@@ -574,7 +574,7 @@ internal QATransformer(IHostEnvironment env, QATrainer.Options options, RobertaM
             Model = model;
             Model.eval();
 
-            if (Device == CUDA)
+            if (Device.type == DeviceType.CUDA)
                 Model.cuda();
             using (var ch = Host.Start("Initialize Tokenizer"))
                 Tokenizer = TokenizerExtensions.GetInstance(ch);

src/Microsoft.ML.TorchSharp/TorchSharpBaseTrainer.cs

@@ -158,7 +158,7 @@ public TrainerBase(TorchSharpBaseTrainer<TLabelCol, TTargetsCol> parent, IChanne
                 Device = TorchUtils.InitializeDevice(Parent.Host);
 
                 // Move to GPU if we are running there
-                if (Device == CUDA)
+                if (Device.type == DeviceType.CUDA)
                     Model.cuda();
             }
 
@@ -395,7 +395,7 @@ internal TorchSharpBaseTransformer(IHostEnvironment env, TorchSharpBaseTrainer.O
 
             Model = model;
 
-            if (Device == CUDA)
+            if (Device.type == DeviceType.CUDA)
                 Model.cuda();
         }
 

test/Microsoft.ML.TensorFlow.Tests/Properties/AssemblyInfo.cs

@@ -0,0 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]

test/Microsoft.ML.TensorFlow.Tests/TensorflowTests.cs

@@ -23,9 +23,8 @@
 using static Microsoft.ML.DataOperationsCatalog;
 using InMemoryImage = Microsoft.ML.Tests.ImageTests.InMemoryImage;
 
-namespace Microsoft.ML.Scenarios
+namespace Microsoft.ML.TensorFlow.Scenarios
 {
-
     internal sealed class TensorFlowScenariosTestsFixture : IDisposable
     {
         public static string tempFolder;
@@ -57,7 +56,6 @@ public void Dispose()
         }
     }
 
-    [Collection("NoParallelization")]
     public sealed class TensorFlowScenariosTests : BaseTestClass, IClassFixture<TensorFlowScenariosTestsFixture>
     {
         private readonly string _fullImagesetFolderPath;

test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj

@@ -56,21 +56,11 @@
     <PackageReference Include="System.Data.SQLite.Core" Version="$(SystemDataSQLiteCoreVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Include="Data\**">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="ExpressionLanguageTests\TestData\ExprBindExInput.txt" />
     <EmbeddedResource Include="ExpressionLanguageTests\TestData\ExprBindInput.txt" />
     <EmbeddedResource Include="ExpressionLanguageTests\TestData\ExprCodeGenInput.txt" />
     <EmbeddedResource Include="ExpressionLanguageTests\TestData\ExprEvalInput.txt" />
     <EmbeddedResource Include="ExpressionLanguageTests\TestData\ExprParseInput.txt" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
 </Project>

test/Microsoft.ML.Tests/Properties/AssemblyInfo.cs

@@ -3,6 +3,3 @@
 // See the LICENSE file in the project root for more information.
 
 using Xunit;
-
-// TODO: [TEST_STABILITY] disable test parallelization for this assembly as running test in parallel sometimes cause test host process to crash
-[assembly: CollectionBehavior(DisableTestParallelization = true)]

test/Microsoft.ML.TorchSharp.Tests/Microsoft.ML.TorchSharp.Tests.csproj

@@ -3,6 +3,9 @@
     <AssemblyName>Microsoft.ML.TorchSharp.Tests</AssemblyName>
     <StrongNameKeyId>Test</StrongNameKeyId>
 
+    <!-- Remove once we have resolved the TorchSharp issue. -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+
   </PropertyGroup>
 
   <!-- Import the test signing certificate -->
@@ -23,7 +26,7 @@
 
   <ItemGroup Condition="'$(TargetArchitecture)' == 'x64'">
     <PackageReference Include="libtorch-cpu-win-x64" Version="$(LibTorchVersion)" Condition="$([MSBuild]::IsOSPlatform('Windows')) AND '$(TargetArchitecture)' == 'x64'" />
-    <!-- <PackageReference Include="TorchSharp-cuda-windows" Version="0.99.5" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />   -->
+    <!-- <PackageReference Include="TorchSharp-cuda-windows" Version="$(TorchSharpVersion)" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />    -->
     <PackageReference Include="libtorch-cpu-linux-x64" Version="$(LibTorchVersion)" Condition="$([MSBuild]::IsOSPlatform('Linux')) AND '$(TargetArchitecture)' == 'x64'" />
     <PackageReference Include="libtorch-cpu-osx-x64" Version="$(LibTorchVersion)" Condition="$([MSBuild]::IsOSPlatform('OSX')) AND '$(TargetArchitecture)' == 'x64'" />
 

test/Microsoft.ML.TorchSharp.Tests/NerTests.cs

@@ -11,9 +11,8 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Microsoft.ML.Tests
+namespace Microsoft.ML.TorchSharp.Tests
 {
-    [Collection("NoParallelization")]
     public class NerTests : TestDataPipeBase
     {
         public NerTests(ITestOutputHelper output) : base(output)

test/Microsoft.ML.TorchSharp.Tests/ObjectDetectionTests.cs

@@ -14,7 +14,7 @@
 using Microsoft.ML.Runtime;
 using System.Collections.Generic;
 
-namespace Microsoft.ML.Tests
+namespace Microsoft.ML.TorchSharp.Tests
 {
     [Collection("NoParallelization")]
 

test/Microsoft.ML.TorchSharp.Tests/Properties/AssemblyInfo.cs

@@ -0,0 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]

test/Microsoft.ML.TorchSharp.Tests/QATests.cs

@@ -10,9 +10,8 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Microsoft.ML.Tests
+namespace Microsoft.ML.TorchSharp.Tests
 {
-    [Collection("NoParallelization")]
     public class QATests : TestDataPipeBase
     {
         public QATests(ITestOutputHelper output) : base(output)

test/Microsoft.ML.TorchSharp.Tests/TextClassificationTests.cs

@@ -15,9 +15,8 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Microsoft.ML.Tests
+namespace Microsoft.ML.TorchSharp.Tests
 {
-    [Collection("NoParallelization")]
     public class TextClassificationTests : TestDataPipeBase
     {
         public TextClassificationTests(ITestOutputHelper output) : base(output)
@@ -172,7 +171,7 @@ public void TestTextClassificationWithBigDataOnGpu()
             var mlContext = new MLContext();
             mlContext.GpuDeviceId = 0;
             mlContext.FallbackToCpu = false;
-            var df = DataFrame.LoadCsv(@"Data\github-issues-train.tsv", separator: '\t', header: true, columnNames: new[] { "ID", "Label", "Title", "Description" });
+            var df = DataFrame.LoadCsv(GetDataPath("github-issues-train.tsv"), separator: '\t', header: true, columnNames: new[] { "ID", "Label", "Title", "Description" });
             var trainTestSplit = mlContext.Data.TrainTestSplit(df, testFraction: 0.2);
             var pipeline =
                     mlContext.Transforms.Conversion.MapValueToKey("Label")