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

Vectorizes IndexOfMin/Max/Magnitude #93469

Merged
merged 20 commits into from
Oct 20, 2023
Merged

Vectorizes IndexOfMin/Max/Magnitude #93469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6364892
resolved merge conflicts
michaelgsharp Oct 13, 2023
5eb6c91
net core full done
michaelgsharp Oct 13, 2023
1886a46
minor code cleanup
michaelgsharp Oct 13, 2023
cc68a75
NetStandard and PR fixes.
michaelgsharp Oct 13, 2023
d53fb0c
minor pr changes
michaelgsharp Oct 13, 2023
8f6a4d4
Fix IndexOfMaxMagnitudeOperator
ericstj Oct 16, 2023
b0d4c83
Fix IndexOfMaxMagnitudeOperator on netcore
ericstj Oct 16, 2023
2c1fbc9
updates from PR comments
michaelgsharp Oct 17, 2023
b1a9efc
netcore fixed
michaelgsharp Oct 18, 2023
8162b83
Merge branch 'main' into indexof
michaelgsharp Oct 18, 2023
e143ff7
net standard updated
michaelgsharp Oct 18, 2023
7a91a73
add reference assembly exclusions
michaelgsharp Oct 18, 2023
b0a0685
made naive approach better
michaelgsharp Oct 19, 2023
c681855
resolved PR comments
michaelgsharp Oct 19, 2023
95103d1
minor comment changes
michaelgsharp Oct 19, 2023
10aaaee
minor formatting fixes
michaelgsharp Oct 19, 2023
e9c5534
added inlining
michaelgsharp Oct 19, 2023
f92123a
fixes from PR comments
michaelgsharp Oct 19, 2023
13f756a
comments from pr
michaelgsharp Oct 20, 2023
d409ad6
fixed spacing
michaelgsharp Oct 20, 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
2 changes: 2 additions & 0 deletions src/libraries/System.Numerics.Tensors/src/ReferenceAssemblyExclusions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
M:System.Numerics.Tensors.TensorPrimitives.ConvertToHalf(System.ReadOnlySpan{System.Single},System.Span{System.Half})
M:System.Numerics.Tensors.TensorPrimitives.ConvertToSingle(System.ReadOnlySpan{System.Half},System.Span{System.Single})
michaelgsharp marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
Once this package has shipped a stable version, the following line
should be removed in order to re-enable validation. -->
<DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
<GenAPIExcludeApiList>ReferenceAssemblyExclusions.txt</GenAPIExcludeApiList>
</PropertyGroup>

<ItemGroup>
Expand Down
140 changes: 12 additions & 128 deletions src/libraries/System.Numerics.Tensors/src/System/Numerics/Tensors/TensorPrimitives.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,39 +316,12 @@ public static void Exp(ReadOnlySpan<float> x, Span<float> destination) =>
/// </remarks>
public static int IndexOfMax(ReadOnlySpan<float> x)
{
int result = -1;

if (!x.IsEmpty)
if (x.IsEmpty)
{
result = 0;
float max = float.NegativeInfinity;

for (int i = 0; i < x.Length; i++)
{
float current = x[i];

if (current != max)
{
if (float.IsNaN(current))
{
return i;
}

if (max < current)
{
result = i;
max = current;
}
}
else if (IsNegative(max) && !IsNegative(current))
{
result = i;
max = current;
}
}
return -1;
}

return result;
return IndexOfMinMaxCore<IndexOfMaxOperator>(x);
michaelgsharp marked this conversation as resolved.
Show resolved Hide resolved
}

/// <summary>Searches for the index of the single-precision floating-point number with the largest magnitude in the specified tensor.</summary>
Expand All @@ -367,43 +340,12 @@ public static int IndexOfMax(ReadOnlySpan<float> x)
/// </remarks>
public static int IndexOfMaxMagnitude(ReadOnlySpan<float> x)
{
int result = -1;

if (!x.IsEmpty)
if (x.IsEmpty)
{
result = 0;
float max = float.NegativeInfinity;
float maxMag = float.NegativeInfinity;

for (int i = 0; i < x.Length; i++)
{
float current = x[i];
float currentMag = Math.Abs(current);

if (currentMag != maxMag)
{
if (float.IsNaN(currentMag))
{
return i;
}

if (maxMag < currentMag)
{
result = i;
max = current;
maxMag = currentMag;
}
}
else if (IsNegative(max) && !IsNegative(current))
{
result = i;
max = current;
maxMag = currentMag;
}
}
return -1;
}

return result;
return IndexOfMinMaxCore<IndexOfMaxMagnitudeOperator>(x);
michaelgsharp marked this conversation as resolved.
Show resolved Hide resolved
}

/// <summary>Searches for the index of the smallest single-precision floating-point number in the specified tensor.</summary>
Expand All @@ -421,39 +363,12 @@ public static int IndexOfMaxMagnitude(ReadOnlySpan<float> x)
/// </remarks>
public static int IndexOfMin(ReadOnlySpan<float> x)
{
int result = -1;

if (!x.IsEmpty)
if (x.IsEmpty)
{
result = 0;
float min = float.PositiveInfinity;

for (int i = 0; i < x.Length; i++)
{
float current = x[i];

if (current != min)
{
if (float.IsNaN(current))
{
return i;
}

if (current < min)
{
result = i;
min = current;
}
}
else if (IsNegative(current) && !IsNegative(min))
{
result = i;
min = current;
}
}
return -1;
}

return result;
return IndexOfMinMaxCore<IndexOfMinOperator>(x);
michaelgsharp marked this conversation as resolved.
Show resolved Hide resolved
}

/// <summary>Searches for the index of the single-precision floating-point number with the smallest magnitude in the specified tensor.</summary>
Expand All @@ -472,43 +387,12 @@ public static int IndexOfMin(ReadOnlySpan<float> x)
/// </remarks>
public static int IndexOfMinMagnitude(ReadOnlySpan<float> x)
{
int result = -1;

if (!x.IsEmpty)
if (x.IsEmpty)
{
result = 0;
float min = float.PositiveInfinity;
float minMag = float.PositiveInfinity;

for (int i = 0; i < x.Length; i++)
{
float current = x[i];
float currentMag = Math.Abs(current);

if (currentMag != minMag)
{
if (float.IsNaN(currentMag))
{
return i;
}

if (currentMag < minMag)
{
result = i;
min = current;
minMag = currentMag;
}
}
else if (IsNegative(current) && !IsNegative(min))
{
result = i;
min = current;
minMag = currentMag;
}
}
return -1;
}

return result;
return IndexOfMinMaxCore<IndexOfMinMagnitudeOperator>(x);
michaelgsharp marked this conversation as resolved.
Show resolved Hide resolved
}

/// <summary>Computes the element-wise natural (base <c>e</c>) logarithm of single-precision floating-point numbers in the specified tensor.</summary>
Expand Down
Loading
Loading