Consolidate a few exception throws in TensorPrimitives (dotnet#93168)

michaelgsharp · Oct 20, 2023 · cd02aa5 · cd02aa5
1 parent 8db0a9b
commit cd02aa5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 26 deletions.
diff --git a/src/libraries/System.Numerics.Tensors/src/System/Numerics/Tensors/TensorPrimitives.cs b/src/libraries/System.Numerics.Tensors/src/System/Numerics/Tensors/TensorPrimitives.cs
@@ -215,11 +215,6 @@ public static float Distance(ReadOnlySpan<float> x, ReadOnlySpan<float> y)
  ThrowHelper.ThrowArgument_SpansMustBeNonEmpty();
  }
 
- if (x.Length != y.Length)
- {
- ThrowHelper.ThrowArgument_SpansMustHaveSameLength();
- }
-
  return MathF.Sqrt(Aggregate<SubtractSquaredOperator, AddOperator>(x, y));
  }
 
@@ -282,15 +277,8 @@ public static void Divide(ReadOnlySpan<float> x, float y, Span<float> destinatio
  /// operating systems or architectures.
  /// </para>
  /// </remarks>
- public static float Dot(ReadOnlySpan<float> x, ReadOnlySpan<float> y)
- {
- if (x.Length != y.Length)
- {
- ThrowHelper.ThrowArgument_SpansMustHaveSameLength();
- }
-
- return Aggregate<MultiplyOperator, AddOperator>(x, y);
- }
+ public static float Dot(ReadOnlySpan<float> x, ReadOnlySpan<float> y) =>
+ Aggregate<MultiplyOperator, AddOperator>(x, y);
 
  /// <summary>Computes the element-wise result of raising <c>e</c> to the single-precision floating-point number powers in the specified tensor.</summary>
  /// <param name="x">The tensor, represented as a span.</param>
@@ -910,11 +898,6 @@ public static float ProductOfDifferences(ReadOnlySpan<float> x, ReadOnlySpan<flo
  ThrowHelper.ThrowArgument_SpansMustBeNonEmpty();
  }
 
- if (x.Length != y.Length)
- {
- ThrowHelper.ThrowArgument_SpansMustHaveSameLength();
- }
-
  return Aggregate<SubtractOperator, MultiplyOperator>(x, y);
  }
 
@@ -946,11 +929,6 @@ public static float ProductOfSums(ReadOnlySpan<float> x, ReadOnlySpan<float> y)
  ThrowHelper.ThrowArgument_SpansMustBeNonEmpty();
  }
 
- if (x.Length != y.Length)
- {
- ThrowHelper.ThrowArgument_SpansMustHaveSameLength();
- }
-
  return Aggregate<AddOperator, MultiplyOperator>(x, y);
  }
 

diff --git a/...libraries/System.Numerics.Tensors/src/System/Numerics/Tensors/TensorPrimitives.netcore.cs b/...libraries/System.Numerics.Tensors/src/System/Numerics/Tensors/TensorPrimitives.netcore.cs
@@ -901,7 +901,10 @@ private static float Aggregate<TBinaryOperator, TAggregationOperator>(
  where TBinaryOperator : struct, IBinaryOperator
  where TAggregationOperator : struct, IAggregationOperator
  {
- Debug.Assert(x.Length == y.Length);
+ if (x.Length != y.Length)
+ {
+ ThrowHelper.ThrowArgument_SpansMustHaveSameLength();
+ }
 
  if (x.IsEmpty)
  {

diff --git a/...aries/System.Numerics.Tensors/src/System/Numerics/Tensors/TensorPrimitives.netstandard.cs b/...aries/System.Numerics.Tensors/src/System/Numerics/Tensors/TensorPrimitives.netstandard.cs
@@ -163,7 +163,10 @@ private static float Aggregate<TBinaryOperator, TAggregationOperator>(
  where TBinaryOperator : struct, IBinaryOperator
  where TAggregationOperator : struct, IAggregationOperator
  {
- Debug.Assert(x.Length == y.Length);
+ if (x.Length != y.Length)
+ {
+ ThrowHelper.ThrowArgument_SpansMustHaveSameLength();
+ }
 
  if (x.Length == 0)
  {