diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c8e5baef..facc1cbd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,6 +28,8 @@ jobs: - name: Build shell: cmd run: dotnet build -c Release src\Aardvark.sln + - name: Test + run: dotnet test src\Aardvark.sln -c Release --no-build --logger:"console;verbosity=quiet" - name: Pack env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4a695467..0184a2cf 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,5 +20,5 @@ jobs: uses: actions/setup-dotnet@v3 with: global-json-file: global.json - - name: build + - name: Build run: .\build.cmd diff --git a/build.sh b/build.sh index c84cc842..72c3b6e6 100755 --- a/build.sh +++ b/build.sh @@ -2,4 +2,4 @@ dotnet tool restore dotnet paket restore -dotnet build src/Aardvark.NonWindows.slnf \ No newline at end of file +dotnet build src/Aardvark.sln \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 00b2ba6e..e30ac9f0 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -41,14 +41,14 @@ group Test storage: none source https://api.nuget.org/v3/index.json - nuget NUnit ~> 3.13.3 - nuget FsUnit ~> 5.4.0 - nuget FsCheck ~> 2.16.4 - nuget FsCheck.NUnit ~> 2.16.4 + nuget NUnit ~> 3.14.0 + nuget FsUnit ~> 5.6.1 + nuget FsCheck ~> 2.16.6 + nuget FsCheck.NUnit ~> 2.16.6 nuget NUnit3TestAdapter ~> 4.5.0 - nuget Microsoft.NET.Test.Sdk ~> 17.7.2 - nuget Expecto ~> 10.1.0 - nuget Expecto.FsCheck ~> 10.1.0 - nuget YoloDev.Expecto.TestSdk ~> 0.14.2 + nuget Microsoft.NET.Test.Sdk ~> 17.9.0 + nuget Expecto ~> 10.2.1 + nuget Expecto.FsCheck ~> 10.2.1 + nuget YoloDev.Expecto.TestSdk ~> 0.14.3 - nuget BenchmarkDotNet ~> 0.13.9 \ No newline at end of file + nuget BenchmarkDotNet ~> 0.13.12 \ No newline at end of file diff --git a/paket.lock b/paket.lock index 81c1355b..38e34f4f 100644 --- a/paket.lock +++ b/paket.lock @@ -220,11 +220,11 @@ NUGET System.Management (>= 5.0) BenchmarkDotNet.Annotations (0.13.12) CommandLineParser (2.9.1) - Expecto (10.1) + Expecto (10.2.1) FSharp.Core (>= 7.0.200) Mono.Cecil (>= 0.11.4 < 1.0) - Expecto.FsCheck (10.1) - Expecto (>= 10.1) + Expecto.FsCheck (10.2.1) + Expecto (>= 10.2.1) FsCheck (>= 2.16.5 < 3.0) FsCheck (2.16.6) FSharp.Core (>= 4.2.3) @@ -232,9 +232,9 @@ NUGET FsCheck (2.16.6) NUnit (>= 3.13.1 < 4.0) FSharp.Core (8.0.200) - FsUnit (5.4) + FsUnit (5.6.1) FSharp.Core (>= 5.0.2) - NUnit (>= 3.13.3 < 3.14) + NUnit (>= 3.14 < 4.0) Gee.External.Capstone (2.3) Iced (1.21) Microsoft.CodeAnalysis.Analyzers (3.3.4) @@ -281,9 +281,9 @@ NUGET Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) Microsoft.Extensions.Primitives (>= 8.0) Microsoft.Extensions.Primitives (8.0) - Microsoft.NET.Test.Sdk (17.7.2) - Microsoft.CodeCoverage (>= 17.7.2) - Microsoft.TestPlatform.TestHost (>= 17.7.2) + Microsoft.NET.Test.Sdk (17.9) + Microsoft.CodeCoverage (>= 17.9) + Microsoft.TestPlatform.TestHost (>= 17.9) Microsoft.NETCore.Jit (2.0.8) Microsoft.NETCore.Platforms (7.0.4) Microsoft.NETCore.Portable.Compatibility (1.0.2) @@ -307,7 +307,7 @@ NUGET NETStandard.Library (2.0.3) Microsoft.NETCore.Platforms (>= 1.1) Newtonsoft.Json (13.0.3) - NUnit (3.13.3) + NUnit (3.14) NETStandard.Library (>= 2.0) NUnit3TestAdapter (4.5) Perfolizer (0.2.1) diff --git a/src/Tests/Aardvark.Base.Benchmarks/Log2Int.cs b/src/Tests/Aardvark.Base.Benchmarks/Log2Int.cs index 3f4405a3..71099349 100644 --- a/src/Tests/Aardvark.Base.Benchmarks/Log2Int.cs +++ b/src/Tests/Aardvark.Base.Benchmarks/Log2Int.cs @@ -229,7 +229,7 @@ public void Log2Int_AardvarkFloatExp_Floor() for(int i = 1; i < 1000; i++) { var a = Fun.Log2Int((float)i); // aardvark bithack - var b = (int)Fun.Log2(i).Floor(); + var b = (int)Math.Log2(i).Floor(); Assert.AreEqual(a, b); } } @@ -241,7 +241,7 @@ public void Log2Int_AardvarkFloatExp_Floor_Frac() { var v = i / 1000f; var a = Fun.Log2Int(v); // aardvark bithack - var b = (int)Fun.Log2(v).Floor(); + var b = (int)Math.Log2(v).Floor(); Assert.AreEqual(a, b); } } @@ -252,7 +252,7 @@ public void Log2Int_AardvarkDoubleExp_Floor() for(int i = 1; i < 1000; i++) { var a = Fun.Log2Int((double)i); // aardvark bithack - var b = (int)Fun.Log2(i).Floor(); + var b = (int)Math.Log2(i).Floor(); Assert.AreEqual(a, b); } } @@ -264,7 +264,7 @@ public void Log2Int_AardvarkDoubleExp_Floor_Frac() { var v = i / 1000.0; var a = Fun.Log2Int(v); // aardvark bithack - var b = (int)Fun.Log2(v).Floor(); + var b = (int)Math.Log2(v).Floor(); Assert.AreEqual(a, b); } } @@ -275,7 +275,7 @@ public void Log2Int_NetCore() for (int i = 1; i < 1000; i++) { var a = System.Numerics.BitOperations.Log2((uint)i); - var b = (int)Fun.Log2(i).Floor(); + var b = (int)Math.Log2(i).Floor(); Assert.AreEqual(a, b); } } @@ -286,7 +286,7 @@ public void Log2Int_SoftwareConvert() for (int i = 1; i < 1000; i++) { var a = Log2Int_Bithack_Unsafe(i); - var b = (int)Fun.Log2(i).Floor(); + var b = (int)Math.Log2(i).Floor(); Assert.AreEqual(a, b); } } @@ -297,7 +297,7 @@ public void Log2Int_SoftwareCompare() for (int i = 1; i < 1000; i++) { var a = Log2Int_Bithack_Cmp(i); - var b = (int)Fun.Log2(i).Floor(); + var b = (int)Math.Log2(i).Floor(); Assert.AreEqual(a, b); } } @@ -308,7 +308,7 @@ public void Log2CeilingInt_AardvarkFloatExp_Ceiling() for (int i = 1; i < 1000; i++) { var a = Fun.Log2CeilingInt((float)i); // aardvark bithack - var b = (int)Fun.Log2(i).Ceiling(); + var b = (int)Math.Log2(i).Ceiling(); Assert.AreEqual(a, b); } } @@ -320,7 +320,7 @@ public void Log2CeilingInt_AardvarkFloatExp_Ceiling_Frac() { var v = i / 1000f; var a = Fun.Log2CeilingInt(v); // aardvark bithack - var b = (int)Fun.Log2(v).Ceiling(); + var b = (int)Math.Log2(v).Ceiling(); Assert.AreEqual(a, b); } } @@ -331,7 +331,7 @@ public void Log2CeilingInt_AardvarkDoubleExp_Ceiling() for (int i = 1; i < 1000; i++) { var a = Fun.Log2CeilingInt((double)i); // aardvark bithack - var b = (int)Fun.Log2(i).Ceiling(); + var b = (int)Math.Log2(i).Ceiling(); Assert.AreEqual(a, b); } } @@ -343,7 +343,7 @@ public void Log2CeilingInt_AardvarkDoubleExp_Ceiling_Frac() { var v = i / 1000.0; var a = Fun.Log2CeilingInt(v); // aardvark bithack - var b = (int)Fun.Log2(v).Ceiling(); + var b = (int)Math.Log2(v).Ceiling(); Assert.AreEqual(a, b); } } diff --git a/src/Tests/Aardvark.Base.FSharp.Tests/TensorTests.fs b/src/Tests/Aardvark.Base.FSharp.Tests/TensorTests.fs index 170d03be..51e10175 100644 --- a/src/Tests/Aardvark.Base.FSharp.Tests/TensorTests.fs +++ b/src/Tests/Aardvark.Base.FSharp.Tests/TensorTests.fs @@ -184,6 +184,7 @@ module ``Tensor Tests`` = [] [] [] + [] let ``[NativeTensor] PixImage copy mirrored as NativeTensor4``(size : int) = let size = V2i size