Tests: restructure test build targets

build.fsx

@@ -401,40 +401,58 @@ let testLibrary testsDir testsProj framework =
             testsProj
             framework)
 
-let testLibraryCsharp framework = testLibrary "src/UnitTests" "UnitTests.csproj" framework
-
-let testLibraryFsharp framework = testLibrary "src/FSharpUnitTests" "FSharpUnitTests.fsproj" framework
+let testManaged framework = testLibrary "src/UnitTests" "UnitTests.csproj" framework
+Target "TestManaged" DoNothing
+Target "TestManagedCore1.1" (fun _ -> testManaged "netcoreapp1.1")
+Target "TestManagedCore2.0" (fun _ -> testManaged "netcoreapp2.0")
+Target "TestManagedNET40" (fun _ -> testManaged "net40")
+Target "TestManagedNET45" (fun _ -> testManaged "net45")
+Target "TestManagedNET46" (fun _ -> testManaged "net46")
+Target "TestManagedNET47"  (fun _ -> testManaged "net47")
+"Build" ==> "TestManagedCore1.1" ==> "TestManaged"
+"Build" ==> "TestManagedCore2.0"
+"Build" =?> ("TestManagedNET40", isWindows)
+"Build" =?> ("TestManagedNET45", isWindows) ==> "TestManaged"
+"Build" =?> ("TestManagedNET46", isWindows)
+"Build" =?> ("TestManagedNET47", isWindows)
+
+let testFsharp framework = testLibrary "src/FSharpUnitTests" "FSharpUnitTests.fsproj" framework
+Target "TestFsharp" DoNothing
+Target "TestFsharpCore1.1" (fun _ -> testFsharp "netcoreapp1.1")
+Target "TestFsharpCore2.0" (fun _ -> testFsharp "netcoreapp2.0")
+Target "TestFsharpNET45" (fun _ -> testFsharp "net45")
+Target "TestFsharpNET46" (fun _ -> testFsharp "net46")
+Target "TestFsharpNET47" (fun _ -> testFsharp "net47")
+"Build" ==> "TestFsharpCore1.1" ==> "TestFsharp"
+"Build" ==> "TestFsharpCore2.0"
+"Build" =?> ("TestFsharpNET45", isWindows) ==> "TestFsharp"
+"Build" =?> ("TestFsharpNET46", isWindows)
+"Build" =?> ("TestFsharpNET47", isWindows)
+
+let testMKL framework = testLibrary "src/UnitTests" "UnitTests-MKL.csproj" framework
+Target "TestMKL" DoNothing
+Target "TestMKLCore2.0" (fun _ -> testMKL "netcoreapp2.0")
+Target "TestMKLNET40" (fun _ -> testMKL "net40")
+"Build" ==> "TestMKLCore2.0" ==> "TestMKL"
+"Build" =?> ("TestMKLNET40", isWindows) ==> "TestMKL"
+
+let testOpenBLAS framework = testLibrary "src/UnitTests" "UnitTests-OpenBLAS.csproj" framework
+Target "TestOpenBLAS" DoNothing
+Target "TestOpenBLASCore2.0" (fun _ -> testOpenBLAS "netcoreapp2.0")
+Target "TestOpenBLASNET40" (fun _ -> testOpenBLAS "net40")
+"Build" ==> "TestOpenBLASCore2.0" ==> "TestOpenBLAS"
+"Build" =?> ("TestOpenBLASNET40", isWindows) ==> "TestOpenBLAS"
+
+let testCUDA framework = testLibrary "src/UnitTests" "UnitTests-CUDA.csproj" framework
+Target "TestCUDA" DoNothing
+Target "TestCUDACore2.0" (fun _ -> testCUDA "netcoreapp2.0")
+Target "TestCUDANET40" (fun _ -> testCUDA "net40")
+"Build" ==> "TestCUDACore2.0" ==> "TestCUDA"
+"Build" =?> ("TestCUDANET40", isWindows) ==> "TestCUDA"
 
 Target "Test" DoNothing
-Target "TestF#" DoNothing
-Target "TestC#" DoNothing
-
-Target "TestC#Core1.1" (fun _ -> testLibraryCsharp "netcoreapp1.1")
-Target "TestC#Core2.0" (fun _ -> testLibraryCsharp "netcoreapp2.0")
-Target "TestC#NET40" (fun _ -> testLibraryCsharp "net40")
-Target "TestC#NET45" (fun _ -> testLibraryCsharp "net45")
-Target "TestC#NET46" (fun _ -> testLibraryCsharp "net46")
-Target "TestC#NET47"  (fun _ -> testLibraryCsharp "net47")
-
-Target "TestF#Core1.1" (fun _ -> testLibraryFsharp "netcoreapp1.1")
-Target "TestF#Core2.0" (fun _ -> testLibraryFsharp "netcoreapp2.0")
-Target "TestF#NET45" (fun _ -> testLibraryFsharp "net45")
-Target "TestF#NET46" (fun _ -> testLibraryFsharp "net46")
-Target "TestF#NET47" (fun _ -> testLibraryFsharp "net47")
-
-"Build" ==> "TestF#Core1.1" ==> "TestF#"
-"Build" ==> "TestF#Core2.0"
-"Build" =?> ("TestF#NET45", isWindows) ==> "TestF#"
-"Build" =?> ("TestF#NET46", isWindows)
-"Build" =?> ("TestF#NET47", isWindows)
-"Build" ==> "TestC#Core1.1" ==> "TestC#"
-"Build" ==> "TestC#Core2.0"
-"Build" =?> ("TestC#NET40", isWindows)
-"Build" =?> ("TestC#NET45", isWindows) ==> "TestC#"
-"Build" =?> ("TestC#NET46", isWindows)
-"Build" =?> ("TestC#NET47", isWindows)
-"TestC#" ==> "Test"
-"TestF#" ==> "Test"
+"TestManaged" ==> "Test"
+"TestFsharp" ==> "Test"
 
 Target "DataTest" (fun _ -> test !! "out/Data/test/**/*UnitTests*.dll")
 "DataBuild" ==> "DataTest"

paket.dependencies

@@ -7,6 +7,8 @@ nuget NUnit ~> 3.0
 nuget NUnitLite ~> 3.0
 nuget FsUnit ~> 3.0
 
+nuget System.Runtime.InteropServices.RuntimeInformation
+
 nuget System.Runtime framework:netstandard1.3,netstandard1.6,netcoreapp1.1
 nuget System.Runtime.Numerics framework:netstandard1.3,netstandard1.6,netcoreapp1.1
 nuget System.Runtime.Serialization.Xml framework:netstandard1.3,netstandard1.6,netcoreapp1.1

src/FSharp/FSharp.fsproj

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>

src/Numerics/Numerics.csproj

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
@@ -50,4 +51,4 @@ All: code quality fixes ~Jonas Nyrup</PackageReleaseNotes>
     <Reference Include="System.Runtime.Serialization" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>

src/UnitTests/LinearAlgebraTests/Complex/DenseMatrixTests.cs

@@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
     /// <summary>
     /// Dense matrix tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class DenseMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs

@@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
     /// <summary>
     /// Dense vector tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class DenseVectorTests : VectorTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Complex/DiagonalMatrixTests.cs

@@ -42,6 +42,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
     /// <summary>
     /// Diagonal matrix tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class DiagonalMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Complex/SparseMatrixTests.cs

@@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
     /// <summary>
     /// Sparse matrix tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class SparseMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs

@@ -41,6 +41,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
     /// <summary>
     /// Sparse vector tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class SparseVectorTest : VectorTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrixTests.cs

@@ -24,6 +24,7 @@
 // </copyright>
 
 using MathNet.Numerics.LinearAlgebra;
+using NUnit.Framework;
 
 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
@@ -32,6 +33,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
     /// <summary>
     /// Test class for user-defined matrix.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class UserDefinedMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Complex32/DenseMatrixTests.cs

@@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
     /// <summary>
     /// Dense matrix tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class DenseMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Complex32/DenseVectorTests.cs

@@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
     /// <summary>
     /// Dense vector tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class DenseVectorTests : VectorTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Complex32/DiagonalMatrixTests.cs

@@ -42,6 +42,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
     /// <summary>
     /// Diagonal matrix tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class DiagonalMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Complex32/SparseMatrixTests.cs

@@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
     /// <summary>
     /// Sparse matrix tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class SparseMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Complex32/SparseVectorTest.cs

@@ -41,6 +41,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
     /// <summary>
     /// Sparse vector tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class SparseVectorTest : VectorTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedMatrixTests.cs

@@ -24,6 +24,7 @@
 // </copyright>
 
 using MathNet.Numerics.LinearAlgebra;
+using NUnit.Framework;
 
 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
 {
@@ -32,6 +33,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
     /// <summary>
     /// Test class for user-defined matrix.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class UserDefinedMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Double/DenseMatrixTests.cs

@@ -38,6 +38,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
     /// <summary>
     /// Dense matrix tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class DenseMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Double/DenseVectorTests.cs

@@ -38,6 +38,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
     /// <summary>
     /// Dense vector tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class DenseVectorTests : VectorTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Double/DiagonalMatrixTests.cs

@@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
     /// <summary>
     /// Diagonal matrix tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class DiagonalMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Double/SparseMatrixTests.cs

@@ -38,6 +38,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
     /// <summary>
     /// Sparse matrix tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class SparseMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.cs

@@ -39,6 +39,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
     /// <summary>
     /// Sparse vector tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class SparseVectorTest : VectorTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Double/UserDefinedMatrixTests.cs

@@ -24,12 +24,14 @@
 // </copyright>
 
 using MathNet.Numerics.LinearAlgebra;
+using NUnit.Framework;
 
 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
 {
     /// <summary>
     /// Test class for user-defined matrix.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class UserDefinedMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Single/DenseMatrixTests.cs

@@ -38,6 +38,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
     /// <summary>
     /// Dense matrix tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class DenseMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Single/DenseVectorTests.cs

@@ -38,6 +38,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
     /// <summary>
     /// Dense vector tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class DenseVectorTests : VectorTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Single/DiagonalMatrixTests.cs

@@ -39,6 +39,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
     /// <summary>
     /// Diagonal matrix tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class DiagonalMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Single/SparseMatrixTests.cs

@@ -38,6 +38,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
     /// <summary>
     /// Sparse matrix tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class SparseMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.cs

@@ -39,6 +39,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
     /// <summary>
     /// Sparse vector tests.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class SparseVectorTest : VectorTests
     {
         /// <summary>

src/UnitTests/LinearAlgebraTests/Single/UserDefinedMatrixTests.cs

@@ -24,12 +24,14 @@
 // </copyright>
 
 using MathNet.Numerics.LinearAlgebra;
+using NUnit.Framework;
 
 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
 {
     /// <summary>
     /// Test class for user-defined matrix.
     /// </summary>
+    [TestFixture, Category("LA")]
     public class UserDefinedMatrixTests : MatrixTests
     {
         /// <summary>

src/UnitTests/UnitTests-CUDA.csproj

@@ -27,4 +27,4 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>

src/UnitTests/UseLinearAlgebraProvider.cs

@@ -3,7 +3,7 @@
 // http://numerics.mathdotnet.com
 // http://github.com/mathnet/mathnet-numerics
 //
-// Copyright (c) 2009-2016 Math.NET
+// Copyright (c) 2009-2018 Math.NET
 //
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
@@ -28,6 +28,7 @@
 // </copyright>
 
 using System;
+using System.Runtime.InteropServices;
 using NUnit.Framework;
 using NUnit.Framework.Interfaces;
 
@@ -38,6 +39,7 @@ namespace MathNet.Numerics.UnitTests
     {
         public void BeforeTest(ITest testDetails)
         {
+
 #if NATIVE && !NETCOREAPP1_1
 #if MKL
             Control.UseNativeMKL();
@@ -49,6 +51,22 @@ namespace MathNet.Numerics.UnitTests
 #else
             Control.UseManaged();
 #endif
+
+            // ReSharper disable LocalizableElement
+            Console.WriteLine();
+            Console.WriteLine("Math.NET Numerics Test Configuration:");
+            Console.WriteLine($"Operating System: {RuntimeInformation.OSDescription}");
+            Console.WriteLine($"Framework: {RuntimeInformation.FrameworkDescription}");
+            Console.WriteLine($"Operating System Architecture: {RuntimeInformation.OSArchitecture}");
+            Console.WriteLine($"Process Architecture: {RuntimeInformation.ProcessArchitecture}");
+            #if !NETCOREAPP1_1
+            Console.WriteLine($"CLR Version: {Environment.Version}");
+            Console.WriteLine($"OS Version: {Environment.OSVersion}");
+            #endif
+            Console.WriteLine($"Linear Algebra Provider: {Control.LinearAlgebraProvider}");
+            Console.WriteLine($"Fourier Transform Provider: {Control.FourierTransformProvider}");
+            Console.WriteLine();
+            // ReSharper restore LocalizableElement
         }
 
         public void AfterTest(ITest details)

src/UnitTests/paket.references

@@ -1,5 +1,7 @@
 NUnit
 NUnitLite content:none
+System.Runtime.InteropServices.RuntimeInformation
+
 System.Reflection framework:netcoreapp1.1,netcoreapp2.0
 System.Reflection.Extensions framework:netcoreapp1.1,netcoreapp2.0
 System.Reflection.TypeExtensions framework:netcoreapp1.1,netcoreapp2.0