Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes some of the CPU Math implemenation from our current version to use the new TensorPrimitives package. #6875

Merged
merged 27 commits into from
Nov 15, 2023
Merged

Changes some of the CPU Math implemenation from our current version to use the new TensorPrimitives package. #6875

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
11a3a50
using tensor primitives
michaelgsharp Oct 12, 2023
3270d4c
added missing files
michaelgsharp Oct 12, 2023
ab1516a
some with indexes changed
michaelgsharp Nov 1, 2023
dbf574e
Initial swap for TensorPrimitives done
michaelgsharp Nov 2, 2023
549a8b4
Rebased and cleaned code
michaelgsharp Nov 2, 2023
cf545b8
more minor cleanup
michaelgsharp Nov 2, 2023
036f91b
added system.numerics.tensors version to props
michaelgsharp Nov 2, 2023
6629ec7
build fixes
michaelgsharp Nov 2, 2023
e07b34d
added net6 again
michaelgsharp Nov 2, 2023
c3c37c9
updates from PR comments
michaelgsharp Nov 8, 2023
0524ac1
fixed sumabsu
michaelgsharp Nov 8, 2023
699a54f
fixed baseline tests
michaelgsharp Nov 9, 2023
486b7ea
test fixes
michaelgsharp Nov 9, 2023
2623b60
fixed test failure for kmeans
michaelgsharp Nov 9, 2023
d7d8d62
changed decimal comparison
michaelgsharp Nov 14, 2023
6277b0c
updated more baselines
michaelgsharp Nov 14, 2023
dc62198
Test fixes.
michaelgsharp Nov 14, 2023
fbdc84d
template update
michaelgsharp Nov 14, 2023
35160fb
Test Fixes.
michaelgsharp Nov 14, 2023
8ed17e4
fixed performance test csproj
michaelgsharp Nov 14, 2023
d69e6e3
added baselines for linux arm/64
michaelgsharp Nov 14, 2023
1af712b
fixed linux arm baselines
michaelgsharp Nov 14, 2023
47fec68
fixed arm baselines
michaelgsharp Nov 14, 2023
6d33274
removed extra files
michaelgsharp Nov 14, 2023
21ca19b
Merge branch 'tensor-math2' of https://github.com/michaelgsharp/machi…
michaelgsharp Nov 14, 2023
c0c53fb
arm32 baselines updated
michaelgsharp Nov 15, 2023
54e876a
fixed arm baselines
michaelgsharp Nov 15, 2023
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
4 changes: 2 additions & 2 deletions .vsts-dotnet-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,12 @@ jobs:
_configuration: Debug
_config_short: DFX
_includeBenchmarkData: false
_targetFramework: net461
_targetFramework: net462
Release_Build:
_configuration: Release
_config_short: RFX
_includeBenchmarkData: false
_targetFramework: net461
_targetFramework: net462
innerLoop: true
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v4.0"
pool:
Expand Down
4 changes: 2 additions & 2 deletions build/.night-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ jobs:
_configuration: Debug
_config_short: DFX
_includeBenchmarkData: false
_targetFramework: net461
_targetFramework: net462
Release_Build:
_configuration: Release
_config_short: RFX
_includeBenchmarkData: false
_targetFramework: net461
_targetFramework: net462
nightlyBuild: true
pool:
vmImage: windows-2019
Expand Down
4 changes: 2 additions & 2 deletions build/.outer-loop-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ jobs:
_configuration: Debug
_config_short: DFX
_includeBenchmarkData: false
_targetFramework: net461
_targetFramework: net462
Release_Build:
_configuration: Release
_config_short: RFX
_includeBenchmarkData: false
_targetFramework: net461
_targetFramework: net462
pool:
vmImage: windows-2019

Expand Down
4 changes: 2 additions & 2 deletions eng/helix.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,9 @@
<ItemGroup>
<HelixWorkItem Include="%(ProjectsWithTargetFramework.Filename)">
<PayloadDirectory>$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)\</PayloadDirectory>
<PayloadDirectory Condition="%(ProjectsWithTargetFramework.TargetFrameworks) == 'net461'">$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)\win-x64</PayloadDirectory>
<PayloadDirectory Condition="%(ProjectsWithTargetFramework.TargetFrameworks) == 'net462'">$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)\win-x64</PayloadDirectory>
<Command>dotnet exec --roll-forward Major --runtimeconfig %(ProjectsWithTargetFramework.Filename).runtimeconfig.json --depsfile %(ProjectsWithTargetFramework.Filename).deps.json $(HelixCorrelationPayloadPath)/xunit-runner/tools/netcoreapp2.0/xunit.console.dll %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command>
<Command Condition="$(TestTargetFramework.EndsWith('net461')) And %(ProjectsWithTargetFramework.TargetFrameworks) != 'net6.0'">$(HelixCorrelationPayloadPath)/xunit-runner/tools/net461/xunit.console.exe %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command>
<Command Condition="$(TestTargetFramework.EndsWith('net462')) And %(ProjectsWithTargetFramework.TargetFrameworks) != 'net6.0'">$(HelixCorrelationPayloadPath)/xunit-runner/tools/net462/xunit.console.exe %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command>
<Timeout>01:00:00</Timeout>
<Timeout Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">00:30:00</Timeout>
<Timeout Condition="'$(WorkItemTimeout)' != ''">$(WorkItemTimeout)</Timeout>
Expand Down
2 changes: 0 additions & 2 deletions src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);CPUMATH_INFRASTRUCTURE</DefineConstants>
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
<!-- System.Numerics.Tensors only supports net462 while we support 461 (But recommend 462) so we need this -->
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Microsoft.ML.Core\Utilities\Contracts.cs" />
Expand Down
Loading
Loading