diff --git a/build.fsx b/build.fsx index b808add4..2fe303f5 100644 --- a/build.fsx +++ b/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" diff --git a/paket.dependencies b/paket.dependencies index e947ce5a..c4e01843 100644 --- a/paket.dependencies +++ b/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 diff --git a/src/FSharp/FSharp.fsproj b/src/FSharp/FSharp.fsproj index 9bc26046..793e459a 100644 --- a/src/FSharp/FSharp.fsproj +++ b/src/FSharp/FSharp.fsproj @@ -1,3 +1,4 @@ + Library diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj index 20a71e14..22392a3a 100644 --- a/src/Numerics/Numerics.csproj +++ b/src/Numerics/Numerics.csproj @@ -1,3 +1,4 @@ + Library @@ -50,4 +51,4 @@ All: code quality fixes ~Jonas Nyrup - + \ No newline at end of file diff --git a/src/UnitTests/LinearAlgebraTests/Complex/DenseMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/DenseMatrixTests.cs index d6a5c0c6..6cd708f5 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/DenseMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/DenseMatrixTests.cs @@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex /// /// Dense matrix tests. /// + [TestFixture, Category("LA")] public class DenseMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs index efbbdfb9..32d7a10a 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs @@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex /// /// Dense vector tests. /// + [TestFixture, Category("LA")] public class DenseVectorTests : VectorTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex/DiagonalMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/DiagonalMatrixTests.cs index 6d50c748..bb20c59a 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/DiagonalMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/DiagonalMatrixTests.cs @@ -42,6 +42,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex /// /// Diagonal matrix tests. /// + [TestFixture, Category("LA")] public class DiagonalMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex/SparseMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/SparseMatrixTests.cs index ba1b7d16..8e9a1841 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/SparseMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/SparseMatrixTests.cs @@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex /// /// Sparse matrix tests. /// + [TestFixture, Category("LA")] public class SparseMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs index 41539478..560314fc 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs @@ -41,6 +41,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex /// /// Sparse vector tests. /// + [TestFixture, Category("LA")] public class SparseVectorTest : VectorTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrixTests.cs index 839c3a7c..4ab2ec15 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrixTests.cs @@ -24,6 +24,7 @@ // using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { @@ -32,6 +33,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex /// /// Test class for user-defined matrix. /// + [TestFixture, Category("LA")] public class UserDefinedMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/DenseMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/DenseMatrixTests.cs index 41dee525..b2e725f4 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/DenseMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/DenseMatrixTests.cs @@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 /// /// Dense matrix tests. /// + [TestFixture, Category("LA")] public class DenseMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/DenseVectorTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/DenseVectorTests.cs index ef22640d..00a2875e 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/DenseVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/DenseVectorTests.cs @@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 /// /// Dense vector tests. /// + [TestFixture, Category("LA")] public class DenseVectorTests : VectorTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/DiagonalMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/DiagonalMatrixTests.cs index 00441ac0..2f586bdb 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/DiagonalMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/DiagonalMatrixTests.cs @@ -42,6 +42,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 /// /// Diagonal matrix tests. /// + [TestFixture, Category("LA")] public class DiagonalMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/SparseMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/SparseMatrixTests.cs index 7298e308..06042c6c 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/SparseMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/SparseMatrixTests.cs @@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 /// /// Sparse matrix tests. /// + [TestFixture, Category("LA")] public class SparseMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/SparseVectorTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/SparseVectorTest.cs index dbc15c8e..06878283 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/SparseVectorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/SparseVectorTest.cs @@ -41,6 +41,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 /// /// Sparse vector tests. /// + [TestFixture, Category("LA")] public class SparseVectorTest : VectorTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedMatrixTests.cs index cbe0a60f..e171350c 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedMatrixTests.cs @@ -24,6 +24,7 @@ // using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 { @@ -32,6 +33,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 /// /// Test class for user-defined matrix. /// + [TestFixture, Category("LA")] public class UserDefinedMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/DenseMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Double/DenseMatrixTests.cs index 3726f5da..86f10409 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/DenseMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/DenseMatrixTests.cs @@ -38,6 +38,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double /// /// Dense matrix tests. /// + [TestFixture, Category("LA")] public class DenseMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/DenseVectorTests.cs b/src/UnitTests/LinearAlgebraTests/Double/DenseVectorTests.cs index ab728dbf..51d751e4 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/DenseVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/DenseVectorTests.cs @@ -38,6 +38,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double /// /// Dense vector tests. /// + [TestFixture, Category("LA")] public class DenseVectorTests : VectorTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/DiagonalMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Double/DiagonalMatrixTests.cs index 014fe673..3009e6a4 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/DiagonalMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/DiagonalMatrixTests.cs @@ -40,6 +40,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double /// /// Diagonal matrix tests. /// + [TestFixture, Category("LA")] public class DiagonalMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/SparseMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Double/SparseMatrixTests.cs index a3f09fc6..8ed665f5 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/SparseMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/SparseMatrixTests.cs @@ -38,6 +38,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double /// /// Sparse matrix tests. /// + [TestFixture, Category("LA")] public class SparseMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.cs b/src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.cs index 3b4ab80b..17f61184 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.cs @@ -39,6 +39,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double /// /// Sparse vector tests. /// + [TestFixture, Category("LA")] public class SparseVectorTest : VectorTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/UserDefinedMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Double/UserDefinedMatrixTests.cs index b6a37acb..dc9fb603 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/UserDefinedMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/UserDefinedMatrixTests.cs @@ -24,12 +24,14 @@ // using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { /// /// Test class for user-defined matrix. /// + [TestFixture, Category("LA")] public class UserDefinedMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/DenseMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Single/DenseMatrixTests.cs index de7a5119..ea3e3cf0 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/DenseMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/DenseMatrixTests.cs @@ -38,6 +38,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single /// /// Dense matrix tests. /// + [TestFixture, Category("LA")] public class DenseMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/DenseVectorTests.cs b/src/UnitTests/LinearAlgebraTests/Single/DenseVectorTests.cs index 02d91b25..a0abe188 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/DenseVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/DenseVectorTests.cs @@ -38,6 +38,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single /// /// Dense vector tests. /// + [TestFixture, Category("LA")] public class DenseVectorTests : VectorTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/DiagonalMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Single/DiagonalMatrixTests.cs index aaa1df9b..3c501228 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/DiagonalMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/DiagonalMatrixTests.cs @@ -39,6 +39,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single /// /// Diagonal matrix tests. /// + [TestFixture, Category("LA")] public class DiagonalMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/SparseMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Single/SparseMatrixTests.cs index 9e5bdc17..fede82c7 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/SparseMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/SparseMatrixTests.cs @@ -38,6 +38,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single /// /// Sparse matrix tests. /// + [TestFixture, Category("LA")] public class SparseMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.cs b/src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.cs index ada5f4b1..827754db 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.cs @@ -39,6 +39,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single /// /// Sparse vector tests. /// + [TestFixture, Category("LA")] public class SparseVectorTest : VectorTests { /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/UserDefinedMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Single/UserDefinedMatrixTests.cs index 87652f15..febfff20 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/UserDefinedMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/UserDefinedMatrixTests.cs @@ -24,12 +24,14 @@ // using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single { /// /// Test class for user-defined matrix. /// + [TestFixture, Category("LA")] public class UserDefinedMatrixTests : MatrixTests { /// diff --git a/src/UnitTests/UnitTests-CUDA.csproj b/src/UnitTests/UnitTests-CUDA.csproj index 29f1095c..b8de7f99 100644 --- a/src/UnitTests/UnitTests-CUDA.csproj +++ b/src/UnitTests/UnitTests-CUDA.csproj @@ -27,4 +27,4 @@ - + \ No newline at end of file diff --git a/src/UnitTests/UseLinearAlgebraProvider.cs b/src/UnitTests/UseLinearAlgebraProvider.cs index 693148df..9c8ed79b 100644 --- a/src/UnitTests/UseLinearAlgebraProvider.cs +++ b/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 @@ // 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) diff --git a/src/UnitTests/paket.references b/src/UnitTests/paket.references index a2c97fee..dfdec293 100644 --- a/src/UnitTests/paket.references +++ b/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