Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -55,17 +55,17 @@ 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
steps:
- 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
Expand All @@ -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
run: dotnet run --project Tests -c Release -f net8.0 -r osx-x64 --no-self-contained -- -perf --info --nost --time 60 --wait 10 --skip
2 changes: 1 addition & 1 deletion MKL.NET.Matrix/MKL.NET.Matrix.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<LangVersion>10.0</LangVersion>
<Nullable>enable</Nullable>
<WarningLevel>5</WarningLevel>
Expand Down
2 changes: 1 addition & 1 deletion MKL.NET.Optimization/MKL.NET.Optimization.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<LangVersion>10.0</LangVersion>
<Nullable>enable</Nullable>
<WarningLevel>5</WarningLevel>
Expand Down
2 changes: 1 addition & 1 deletion MKL.NET.Statistics/MKL.NET.Statistics.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<LangVersion>10.0</LangVersion>
<Nullable>enable</Nullable>
<WarningLevel>5</WarningLevel>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
Expand Down
4 changes: 2 additions & 2 deletions MKL.NET/MKL.NET.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>../SigningKey.snk</AssemblyOriginatorKeyFile>
<PackageReleaseNotes>
Enable 2d FFT. Thanks minghao-guo.
Use AnyCPU for reference assembly.
</PackageReleaseNotes>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Version>1.6.0</Version>
<Version>1.7.0</Version>
</PropertyGroup>
<ItemGroup>
<None Include="../matrix.png" Pack="true" PackagePath="" Visible="False" />
Expand Down
4 changes: 2 additions & 2 deletions Tests/Optimize.CalculusTests.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
2 changes: 1 addition & 1 deletion Tests/TestFramework.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Tests/Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<LangVersion>preview</LangVersion>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>false</SelfContained>
</PropertyGroup>
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="7.0.0" />
<PackageReference Include="CsCheck" Version="3.1.0" />
<PackageReference Include="CsCheck" Version="4.5.0" />
<!--<PackageReference Include="MKL.NET" Version="1.1.0" />-->
<ProjectReference Include="../MKL.NET/MKL.NET.csproj" />
<ProjectReference Include="../MKL.NET.Matrix/MKL.NET.Matrix.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion TestsCSharp/TestsCSharp.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
<LangVersion>10.0</LangVersion>
<Nullable>enable</Nullable>
<WarningLevel>5</WarningLevel>
Expand Down
Loading