Skip to content

Introduce Numerics class and Refactor Clamp Utils #1436

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

Merged
JimBobSquarePants merged 11 commits into from
Nov 23, 2020
Merged

Introduce Numerics class and Refactor Clamp Utils #1436

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
216257a
Introduce Numerics and migrate ImageMaths methods
JimBobSquarePants Nov 22, 2020
4565fda
ImageMaths => ImageMath
JimBobSquarePants Nov 22, 2020
f177b91
Replace clamp extensions
JimBobSquarePants Nov 23, 2020
6eb53e9
Move FastClamp to Numerics
JimBobSquarePants Nov 23, 2020
d6b38c1
Utils FTW
JimBobSquarePants Nov 23, 2020
7b7a606
Moar Utils
JimBobSquarePants Nov 23, 2020
bb74f5f
Add benchmark results.
JimBobSquarePants Nov 23, 2020
6b1e603
Merge branch 'master' into js/clamp-utils
JimBobSquarePants Nov 23, 2020
619544f
Fix Numerics fallback logic for 32 bit
JimBobSquarePants Nov 23, 2020
9216ae0
Update src/ImageSharp/Common/Helpers/Numerics.cs
JimBobSquarePants Nov 23, 2020
d6f4821
No more Vector4Utils & ImageMath
JimBobSquarePants Nov 23, 2020
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
Prev Previous commit
Next Next commit
Utils FTW
  • Loading branch information
@JimBobSquarePants
JimBobSquarePants committed Nov 23, 2020
commit d6b38c1803ec50aa360376499edf30237c691a3e
12 changes: 6 additions & 6 deletions src/ImageSharp/Common/Helpers/DenseMatrixUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static void Convolve2D3<TPixel>(
ref Vector4 target = ref Unsafe.Add(ref targetRowRef, column);
vector.W = target.W;

Vector4Utilities.UnPremultiply(ref vector);
Vector4Utils.UnPremultiply(ref vector);
Copy link
Copy Markdown
Member

@antonfirsov antonfirsov Nov 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Numerics or ColorNumerics ?

Copy link
Copy Markdown
Member Author

@JimBobSquarePants JimBobSquarePants Nov 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll move both to Numerics.

target = vector;
}

Expand Down Expand Up @@ -105,7 +105,7 @@ public static void Convolve2D4<TPixel>(
out Vector4 vector);

ref Vector4 target = ref Unsafe.Add(ref targetRowRef, column);
Vector4Utilities.UnPremultiply(ref vector);
Vector4Utils.UnPremultiply(ref vector);
target = vector;
}

Expand Down Expand Up @@ -140,7 +140,7 @@ public static void Convolve2DImpl<TPixel>(
{
int offsetX = Numerics.Clamp(sourceOffsetColumnBase + x - radiusX, minColumn, maxColumn);
var currentColor = sourceRowSpan[offsetX].ToVector4();
Vector4Utilities.Premultiply(ref currentColor);
Vector4Utils.Premultiply(ref currentColor);

vectorX += matrixX[y, x] * currentColor;
vectorY += matrixY[y, x] * currentColor;
Expand Down Expand Up @@ -193,7 +193,7 @@ public static void Convolve3<TPixel>(
ref Vector4 target = ref Unsafe.Add(ref targetRowRef, column);
vector.W = target.W;

Vector4Utilities.UnPremultiply(ref vector);
Vector4Utils.UnPremultiply(ref vector);
target = vector;
}

Expand Down Expand Up @@ -238,7 +238,7 @@ public static void Convolve4<TPixel>(
ref vector);

ref Vector4 target = ref Unsafe.Add(ref targetRowRef, column);
Vector4Utilities.UnPremultiply(ref vector);
Vector4Utils.UnPremultiply(ref vector);
target = vector;
}

Expand Down Expand Up @@ -270,7 +270,7 @@ private static void ConvolveImpl<TPixel>(
{
int offsetX = Numerics.Clamp(sourceOffsetColumnBase + x - radiusX, minColumn, maxColumn);
var currentColor = sourceRowSpan[offsetX].ToVector4();
Vector4Utilities.Premultiply(ref currentColor);
Vector4Utils.Premultiply(ref currentColor);
vector += matrix[y, x] * currentColor;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...eSharp/Common/Helpers/Vector4Utilities.cs → ...ImageSharp/Common/Helpers/Vector4Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp
/// <summary>
/// Utility methods for the <see cref="Vector4"/> struct.
/// </summary>
internal static class Vector4Utilities
internal static class Vector4Utils
{
private const int BlendAlphaControl = 0b_10_00_10_00;
private const int ShuffleAlphaControl = 0b_11_11_11_11;
Expand Down
4 changes: 2 additions & 2 deletions src/ImageSharp/PixelFormats/Utils/Vector4Converters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ internal static void ApplyForwardConversionModifiers(Span<Vector4> vectors, Pixe

if (modifiers.IsDefined(PixelConversionModifiers.Premultiply))
{
Vector4Utilities.Premultiply(vectors);
Vector4Utils.Premultiply(vectors);
}
}

Expand All @@ -36,7 +36,7 @@ internal static void ApplyBackwardConversionModifiers(Span<Vector4> vectors, Pix
{
if (modifiers.IsDefined(PixelConversionModifiers.Premultiply))
{
Vector4Utilities.UnPremultiply(vectors);
Vector4Utils.UnPremultiply(vectors);
}

if (modifiers.IsDefined(PixelConversionModifiers.SRgbCompand))
Expand Down
2 changes: 1 addition & 1 deletion src/ImageSharp/Processing/Processors/Filters/FilterProcessor{TPixel}.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void Invoke(int y, Span<Vector4> span)
Span<TPixel> rowSpan = this.source.GetPixelRowSpan(y).Slice(this.startX, span.Length);
PixelOperations<TPixel>.Instance.ToVector4(this.configuration, rowSpan, span);

Vector4Utilities.Transform(span, ref Unsafe.AsRef(this.matrix));
Vector4Utils.Transform(span, ref Unsafe.AsRef(this.matrix));

PixelOperations<TPixel>.Instance.FromVector4Destructive(this.configuration, span, rowSpan);
}
Expand Down
6 changes: 3 additions & 3 deletions src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor{TPixel}.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ public void ApplyTransform<TResampler>(in TResampler sampler)
return;
}

int yRadius = LinearTransformUtilities.GetSamplingRadius(in sampler, source.Height, destination.Height);
int xRadius = LinearTransformUtilities.GetSamplingRadius(in sampler, source.Width, destination.Width);
int yRadius = LinearTransformUtils.GetSamplingRadius(in sampler, source.Height, destination.Height);
int xRadius = LinearTransformUtils.GetSamplingRadius(in sampler, source.Width, destination.Width);
var radialExtents = new Vector2(xRadius, yRadius);
int yLength = (yRadius * 2) + 1;
int xLength = (xRadius * 2) + 1;
Expand Down Expand Up @@ -207,7 +207,7 @@ public void Invoke(int y, Span<Vector4> span)
// Use the single precision position to calculate correct bounding pixels
// otherwise we get rogue pixels outside of the bounds.
var point = Vector2.Transform(new Vector2(x, y), this.matrix);
LinearTransformUtilities.Convolve(
LinearTransformUtils.Convolve(
in this.sampler,
point,
sourceBuffer,
Expand Down
6 changes: 3 additions & 3 deletions ...sforms/Linear/LinearTransformUtilities.cs → ...Transforms/Linear/LinearTransformUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
/// <summary>
/// Utility methods for affine and projective transforms.
/// </summary>
internal static class LinearTransformUtilities
internal static class LinearTransformUtils
{
[MethodImpl(InliningOptions.ShortMethod)]
internal static int GetSamplingRadius<TResampler>(in TResampler sampler, int sourceSize, int destinationSize)
Expand Down Expand Up @@ -78,13 +78,13 @@ internal static void Convolve<TResampler, TPixel>(

// Values are first premultiplied to prevent darkening of edge pixels.
var current = sourcePixels[x, y].ToVector4();
Vector4Utilities.Premultiply(ref current);
Vector4Utils.Premultiply(ref current);
sum += current * xWeight * yWeight;
}
}

// Reverse the premultiplication
Vector4Utilities.UnPremultiply(ref sum);
Vector4Utils.UnPremultiply(ref sum);
targetRow[column] = sum;
}

Expand Down
6 changes: 3 additions & 3 deletions ...mageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor{TPixel}.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ public void ApplyTransform<TResampler>(in TResampler sampler)
return;
}

int yRadius = LinearTransformUtilities.GetSamplingRadius(in sampler, source.Height, destination.Height);
int xRadius = LinearTransformUtilities.GetSamplingRadius(in sampler, source.Width, destination.Width);
int yRadius = LinearTransformUtils.GetSamplingRadius(in sampler, source.Height, destination.Height);
int xRadius = LinearTransformUtils.GetSamplingRadius(in sampler, source.Width, destination.Width);
var radialExtents = new Vector2(xRadius, yRadius);
int yLength = (yRadius * 2) + 1;
int xLength = (xRadius * 2) + 1;
Expand Down Expand Up @@ -207,7 +207,7 @@ public void Invoke(int y, Span<Vector4> span)
// Use the single precision position to calculate correct bounding pixels
// otherwise we get rogue pixels outside of the bounds.
Vector2 point = TransformUtilities.ProjectiveTransform2D(x, y, this.matrix);
LinearTransformUtilities.Convolve(
LinearTransformUtils.Convolve(
in this.sampler,
point,
sourceBuffer,
Expand Down
2 changes: 1 addition & 1 deletion tests/ImageSharp.Benchmarks/Color/Bulk/PremultiplyVector4.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void PremultiplyBaseline()
[Benchmark]
public void Premultiply()
{
Vector4Utilities.Premultiply(Vectors);
Vector4Utils.Premultiply(Vectors);
}

[MethodImpl(InliningOptions.ShortMethod)]
Expand Down
2 changes: 1 addition & 1 deletion tests/ImageSharp.Benchmarks/Color/Bulk/UnPremultiplyVector4.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void UnPremultiplyBaseline()
[Benchmark]
public void UnPremultiply()
{
Vector4Utilities.UnPremultiply(Vectors);
Vector4Utils.UnPremultiply(Vectors);
}

[MethodImpl(InliningOptions.ShortMethod)]
Expand Down
8 changes: 4 additions & 4 deletions tests/ImageSharp.Tests/Helpers/Vector4UtilsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ public void Premultiply_VectorSpan(int length)
Vector4[] source = rnd.GenerateRandomVectorArray(length, 0, 1);
Vector4[] expected = source.Select(v =>
{
Vector4Utilities.Premultiply(ref v);
Vector4Utils.Premultiply(ref v);
return v;
}).ToArray();

Vector4Utilities.Premultiply(source);
Vector4Utils.Premultiply(source);

Assert.Equal(expected, source, this.approximateFloatComparer);
}
Expand All @@ -44,11 +44,11 @@ public void UnPremultiply_VectorSpan(int length)
Vector4[] source = rnd.GenerateRandomVectorArray(length, 0, 1);
Vector4[] expected = source.Select(v =>
{
Vector4Utilities.UnPremultiply(ref v);
Vector4Utils.UnPremultiply(ref v);
return v;
}).ToArray();

Vector4Utilities.UnPremultiply(source);
Vector4Utils.UnPremultiply(source);

Assert.Equal(expected, source, this.approximateFloatComparer);
}
Expand Down
24 changes: 12 additions & 12 deletions tests/ImageSharp.Tests/PixelFormats/PixelOperations/PixelOperationsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,15 +197,15 @@ void SourceAction(ref Vector4 v)
{
if (this.HasUnassociatedAlpha)
{
Vector4Utilities.Premultiply(ref v);
Vector4Utils.Premultiply(ref v);
}
}

void ExpectedAction(ref Vector4 v)
{
if (this.HasUnassociatedAlpha)
{
Vector4Utilities.UnPremultiply(ref v);
Vector4Utils.UnPremultiply(ref v);
}
}

Expand All @@ -232,15 +232,15 @@ void SourceAction(ref Vector4 v)
{
if (this.HasUnassociatedAlpha)
{
Vector4Utilities.Premultiply(ref v);
Vector4Utils.Premultiply(ref v);
}
}

void ExpectedAction(ref Vector4 v)
{
if (this.HasUnassociatedAlpha)
{
Vector4Utilities.UnPremultiply(ref v);
Vector4Utils.UnPremultiply(ref v);
}
}

Expand Down Expand Up @@ -273,15 +273,15 @@ void SourceAction(ref Vector4 v)

if (this.HasUnassociatedAlpha)
{
Vector4Utilities.Premultiply(ref v);
Vector4Utils.Premultiply(ref v);
}
}

void ExpectedAction(ref Vector4 v)
{
if (this.HasUnassociatedAlpha)
{
Vector4Utilities.UnPremultiply(ref v);
Vector4Utils.UnPremultiply(ref v);
}

SRgbCompanding.Compress(ref v);
Expand Down Expand Up @@ -394,12 +394,12 @@ public void ToPremultipliedVector4(int count)
{
void SourceAction(ref Vector4 v)
{
Vector4Utilities.UnPremultiply(ref v);
Vector4Utils.UnPremultiply(ref v);
}

void ExpectedAction(ref Vector4 v)
{
Vector4Utilities.Premultiply(ref v);
Vector4Utils.Premultiply(ref v);
}

TPixel[] source = CreatePixelTestData(count, (ref Vector4 v) => SourceAction(ref v));
Expand All @@ -417,12 +417,12 @@ public void ToPremultipliedScaledVector4(int count)
{
void SourceAction(ref Vector4 v)
{
Vector4Utilities.UnPremultiply(ref v);
Vector4Utils.UnPremultiply(ref v);
}

void ExpectedAction(ref Vector4 v)
{
Vector4Utilities.Premultiply(ref v);
Vector4Utils.Premultiply(ref v);
}

TPixel[] source = CreateScaledPixelTestData(count, (ref Vector4 v) => SourceAction(ref v));
Expand All @@ -444,14 +444,14 @@ public void ToCompandedPremultipliedScaledVector4(int count)
{
void SourceAction(ref Vector4 v)
{
Vector4Utilities.UnPremultiply(ref v);
Vector4Utils.UnPremultiply(ref v);
SRgbCompanding.Compress(ref v);
}

void ExpectedAction(ref Vector4 v)
{
SRgbCompanding.Expand(ref v);
Vector4Utilities.Premultiply(ref v);
Vector4Utils.Premultiply(ref v);
}

TPixel[] source = CreateScaledPixelTestData(count, (ref Vector4 v) => SourceAction(ref v));
Expand Down