diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fdf84a1..23712e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' include-prerelease: true - name: Download Native run: ./Scripts/Download-Devel win-x64 @@ -29,7 +29,7 @@ jobs: name: win-x64 path: MKL.NET.Native/bin/build/win-x64/Release/MKL.NET.Native.dll - name: Test - run: dotnet run --project Tests -c Release -f net6.0 -r win-x64 --no-self-contained -- -perf --info --nost --time 60 --wait 10 --skip + run: dotnet run --project Tests -c Release -f net8.0 -r win-x64 --no-self-contained -- -perf --info --nost --time 60 --wait 10 --skip linux_core_64: runs-on: ubuntu-latest env: @@ -39,7 +39,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' include-prerelease: true - name: Download Native shell: pwsh @@ -55,9 +55,9 @@ jobs: name: linux-x64 path: MKL.NET.Native/bin/build/linux-x64/MKL.NET.Native.so - name: Test - run: dotnet run --project Tests -c Release -f net6.0 -r linux-x64 --no-self-contained -- -perf --info --nost --time 60 --wait 10 --memo 130 --skip + run: dotnet run --project Tests -c Release -f net8.0 -r linux-x64 --no-self-contained -- -perf --info --nost --time 60 --wait 10 --memo 130 --skip osx_core_64: - runs-on: macos-13 + runs-on: macos-15-intel env: DOTNET_NOLOGO: true DOTNET_CLI_TELEMETRY_OPTOUT: true @@ -65,7 +65,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' include-prerelease: true - name: Download Native shell: pwsh @@ -81,4 +81,4 @@ jobs: name: osx-x64 path: MKL.NET.Native/bin/build/osx-x64/MKL.NET.Native.dylib - name: Test - run: dotnet run --project Tests -c Release -f net6.0 -r osx-x64 --no-self-contained -- -perf --info --nost --time 60 --wait 10 --skip \ No newline at end of file + run: dotnet run --project Tests -c Release -f net8.0 -r osx-x64 --no-self-contained -- -perf --info --nost --time 60 --wait 10 --skip \ No newline at end of file diff --git a/MKL.NET.Matrix/MKL.NET.Matrix.csproj b/MKL.NET.Matrix/MKL.NET.Matrix.csproj index c075de0..401317b 100644 --- a/MKL.NET.Matrix/MKL.NET.Matrix.csproj +++ b/MKL.NET.Matrix/MKL.NET.Matrix.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net6.0 + netstandard2.0;net8.0 10.0 enable 5 diff --git a/MKL.NET.Optimization/MKL.NET.Optimization.csproj b/MKL.NET.Optimization/MKL.NET.Optimization.csproj index 5186cf9..b09d4ee 100644 --- a/MKL.NET.Optimization/MKL.NET.Optimization.csproj +++ b/MKL.NET.Optimization/MKL.NET.Optimization.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net6.0 + netstandard2.0;net8.0 10.0 enable 5 diff --git a/MKL.NET.Statistics/MKL.NET.Statistics.csproj b/MKL.NET.Statistics/MKL.NET.Statistics.csproj index 0638b77..8414aeb 100644 --- a/MKL.NET.Statistics/MKL.NET.Statistics.csproj +++ b/MKL.NET.Statistics/MKL.NET.Statistics.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 10.0 enable 5 diff --git a/MKL.NET.WrapperGenerator.Tests/MKL.NET.WrapperGenerator.Tests.csproj b/MKL.NET.WrapperGenerator.Tests/MKL.NET.WrapperGenerator.Tests.csproj index 4a44837..004e312 100644 --- a/MKL.NET.WrapperGenerator.Tests/MKL.NET.WrapperGenerator.Tests.csproj +++ b/MKL.NET.WrapperGenerator.Tests/MKL.NET.WrapperGenerator.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable false diff --git a/MKL.NET/MKL.NET.csproj b/MKL.NET/MKL.NET.csproj index 6c585ae..ba73486 100644 --- a/MKL.NET/MKL.NET.csproj +++ b/MKL.NET/MKL.NET.csproj @@ -20,10 +20,10 @@ false ../SigningKey.snk -Enable 2d FFT. Thanks minghao-guo. +Use AnyCPU for reference assembly. README.md - 1.6.0 + 1.7.0 diff --git a/Tests/Optimize.CalculusTests.fs b/Tests/Optimize.CalculusTests.fs index 8a33d0f..4833fb8 100644 --- a/Tests/Optimize.CalculusTests.fs +++ b/Tests/Optimize.CalculusTests.fs @@ -109,10 +109,10 @@ let all = let struct (F, G, H, Min, Max) = problems[i] let check1 = Seq.forall (fun r -> Optimize.Derivative_Check(1e-8, 1e-5, F, G, Min * r + Max * (1.0 - r), 0.1) - ) {0.01..0.01..0.99} + ) (seq {0.01..0.01..0.99}) let check2 = Seq.forall (fun r -> Optimize.Derivative_Check(1e-8, 1e-5, G, H, Min * r + Max * (1.0 - r), 0.1) - ) {0.01..0.01..0.99} + ) (seq {0.01..0.01..0.99}) Check.isTrue (check1 && check2) |> Check.message "%i %f %f" i Min Max } } \ No newline at end of file diff --git a/Tests/TestFramework.fs b/Tests/TestFramework.fs index 073f7d7..d43bf40 100644 --- a/Tests/TestFramework.fs +++ b/Tests/TestFramework.fs @@ -272,7 +272,7 @@ type FasterAggregation = val Message : string val Result : FasterResult val mutable Error : bool - new(message:string) = {Message=message;Result=FasterResult(10.0);Error=false} + new(message:string) = {Message=message;Result=FasterResult(10.0,1);Error=false} type TestResult = | Success diff --git a/Tests/Tests.fsproj b/Tests/Tests.fsproj index 144fb5a..e0272bd 100644 --- a/Tests/Tests.fsproj +++ b/Tests/Tests.fsproj @@ -1,14 +1,14 @@  Exe - net6.0 + net8.0 preview win-x64 false - + diff --git a/TestsCSharp/TestsCSharp.csproj b/TestsCSharp/TestsCSharp.csproj index 8f17f72..37679fe 100644 --- a/TestsCSharp/TestsCSharp.csproj +++ b/TestsCSharp/TestsCSharp.csproj @@ -1,6 +1,6 @@ - net6.0;netstandard2.0 + net8.0;netstandard2.0 10.0 enable 5