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

Adding a naive implementation of various primitive tensor operations #91228

Merged
merged 8 commits into from
Sep 5, 2023
Merged

Adding a naive implementation of various primitive tensor operations #91228

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f3de9d0
Adding a naive implementation of various primitive tensor operations
tannergooding Aug 28, 2023
7e9b1c0
Adding tests covering the new tensor primitives APIs
tannergooding Aug 29, 2023
aee5f0e
Adding tensor primitives APIs to the ref assembly
tannergooding Aug 29, 2023
c679d68
Allow .NET Framework to build/run
tannergooding Aug 30, 2023
f03e43c
Sync TFMs between ref and src, csproj simplication and clean-up
ViktorHofer Aug 30, 2023
237121f
Apply suggestions from code review
michaelgsharp Sep 1, 2023
0557d17
Don't use var
tannergooding Sep 1, 2023
eb41227
Fix the S.N.Tensors readme and remove the file marking it as non-ship…
tannergooding Sep 1, 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
146 changes: 1 addition & 145 deletions src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,151 +6,7 @@

namespace System.Numerics.Tensors
{
public static partial class ArrayTensorExtensions
public static class TensorPrimitives
{
public static System.Numerics.Tensors.CompressedSparseTensor<T> ToCompressedSparseTensor<T>(this System.Array array, bool reverseStride = false) { throw null; }
public static System.Numerics.Tensors.CompressedSparseTensor<T> ToCompressedSparseTensor<T>(this T[,,] array, bool reverseStride = false) { throw null; }
public static System.Numerics.Tensors.CompressedSparseTensor<T> ToCompressedSparseTensor<T>(this T[,] array, bool reverseStride = false) { throw null; }
public static System.Numerics.Tensors.CompressedSparseTensor<T> ToCompressedSparseTensor<T>(this T[] array) { throw null; }
public static System.Numerics.Tensors.SparseTensor<T> ToSparseTensor<T>(this System.Array array, bool reverseStride = false) { throw null; }
public static System.Numerics.Tensors.SparseTensor<T> ToSparseTensor<T>(this T[,,] array, bool reverseStride = false) { throw null; }
public static System.Numerics.Tensors.SparseTensor<T> ToSparseTensor<T>(this T[,] array, bool reverseStride = false) { throw null; }
public static System.Numerics.Tensors.SparseTensor<T> ToSparseTensor<T>(this T[] array) { throw null; }
public static System.Numerics.Tensors.DenseTensor<T> ToTensor<T>(this System.Array array, bool reverseStride = false) { throw null; }
public static System.Numerics.Tensors.DenseTensor<T> ToTensor<T>(this T[,,] array, bool reverseStride = false) { throw null; }
public static System.Numerics.Tensors.DenseTensor<T> ToTensor<T>(this T[,] array, bool reverseStride = false) { throw null; }
public static System.Numerics.Tensors.DenseTensor<T> ToTensor<T>(this T[] array) { throw null; }
}
public partial class CompressedSparseTensor<T> : System.Numerics.Tensors.Tensor<T>
{
public CompressedSparseTensor(System.Memory<T> values, System.Memory<int> compressedCounts, System.Memory<int> indices, int nonZeroCount, System.ReadOnlySpan<int> dimensions, bool reverseStride = false) : base (default(System.Array), default(bool)) { }
public CompressedSparseTensor(System.ReadOnlySpan<int> dimensions, bool reverseStride = false) : base (default(System.Array), default(bool)) { }
public CompressedSparseTensor(System.ReadOnlySpan<int> dimensions, int capacity, bool reverseStride = false) : base (default(System.Array), default(bool)) { }
public int Capacity { get { throw null; } }
public System.Memory<int> CompressedCounts { get { throw null; } }
public System.Memory<int> Indices { get { throw null; } }
public override T this[System.ReadOnlySpan<int> indices] { get { throw null; } set { } }
public int NonZeroCount { get { throw null; } }
public System.Memory<T> Values { get { throw null; } }
public override System.Numerics.Tensors.Tensor<T> Clone() { throw null; }
public override System.Numerics.Tensors.Tensor<TResult> CloneEmpty<TResult>(System.ReadOnlySpan<int> dimensions) { throw null; }
public override T GetValue(int index) { throw null; }
public override System.Numerics.Tensors.Tensor<T> Reshape(System.ReadOnlySpan<int> dimensions) { throw null; }
public override void SetValue(int index, T value) { }
public override System.Numerics.Tensors.CompressedSparseTensor<T> ToCompressedSparseTensor() { throw null; }
public override System.Numerics.Tensors.DenseTensor<T> ToDenseTensor() { throw null; }
public override System.Numerics.Tensors.SparseTensor<T> ToSparseTensor() { throw null; }
}
public partial class DenseTensor<T> : System.Numerics.Tensors.Tensor<T>
{
public DenseTensor(int length) : base (default(System.Array), default(bool)) { }
public DenseTensor(System.Memory<T> memory, System.ReadOnlySpan<int> dimensions, bool reverseStride = false) : base (default(System.Array), default(bool)) { }
public DenseTensor(System.ReadOnlySpan<int> dimensions, bool reverseStride = false) : base (default(System.Array), default(bool)) { }
public System.Memory<T> Buffer { get { throw null; } }
public override System.Numerics.Tensors.Tensor<T> Clone() { throw null; }
public override System.Numerics.Tensors.Tensor<TResult> CloneEmpty<TResult>(System.ReadOnlySpan<int> dimensions) { throw null; }
protected override void CopyTo(T[] array, int arrayIndex) { }
public override T GetValue(int index) { throw null; }
protected override int IndexOf(T item) { throw null; }
public override System.Numerics.Tensors.Tensor<T> Reshape(System.ReadOnlySpan<int> dimensions) { throw null; }
public override void SetValue(int index, T value) { }
}
public partial class SparseTensor<T> : System.Numerics.Tensors.Tensor<T>
{
public SparseTensor(System.ReadOnlySpan<int> dimensions, bool reverseStride = false, int capacity = 0) : base (default(System.Array), default(bool)) { }
public int NonZeroCount { get { throw null; } }
public override System.Numerics.Tensors.Tensor<T> Clone() { throw null; }
public override System.Numerics.Tensors.Tensor<TResult> CloneEmpty<TResult>(System.ReadOnlySpan<int> dimensions) { throw null; }
public override T GetValue(int index) { throw null; }
public override System.Numerics.Tensors.Tensor<T> Reshape(System.ReadOnlySpan<int> dimensions) { throw null; }
public override void SetValue(int index, T value) { }
public override System.Numerics.Tensors.CompressedSparseTensor<T> ToCompressedSparseTensor() { throw null; }
public override System.Numerics.Tensors.DenseTensor<T> ToDenseTensor() { throw null; }
public override System.Numerics.Tensors.SparseTensor<T> ToSparseTensor() { throw null; }
}
public static partial class Tensor
{
public static System.Numerics.Tensors.Tensor<T> CreateFromDiagonal<T>(System.Numerics.Tensors.Tensor<T> diagonal) { throw null; }
public static System.Numerics.Tensors.Tensor<T> CreateFromDiagonal<T>(System.Numerics.Tensors.Tensor<T> diagonal, int offset) { throw null; }
public static System.Numerics.Tensors.Tensor<T> CreateIdentity<T>(int size) { throw null; }
public static System.Numerics.Tensors.Tensor<T> CreateIdentity<T>(int size, bool columMajor) { throw null; }
public static System.Numerics.Tensors.Tensor<T> CreateIdentity<T>(int size, bool columMajor, T oneValue) { throw null; }
}
public abstract partial class Tensor<T> : System.Collections.Generic.ICollection<T>, System.Collections.Generic.IEnumerable<T>, System.Collections.Generic.IList<T>, System.Collections.Generic.IReadOnlyCollection<T>, System.Collections.Generic.IReadOnlyList<T>, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Collections.IStructuralComparable, System.Collections.IStructuralEquatable
{
protected Tensor(System.Array fromArray, bool reverseStride) { }
protected Tensor(int length) { }
protected Tensor(System.ReadOnlySpan<int> dimensions, bool reverseStride) { }
public System.ReadOnlySpan<int> Dimensions { get { throw null; } }
public bool IsFixedSize { get { throw null; } }
public bool IsReadOnly { get { throw null; } }
public bool IsReversedStride { get { throw null; } }
public virtual T this[params int[] indices] { get { throw null; } set { } }
public virtual T this[System.ReadOnlySpan<int> indices] { get { throw null; } set { } }
public long Length { get { throw null; } }
public int Rank { get { throw null; } }
public System.ReadOnlySpan<int> Strides { get { throw null; } }
int System.Collections.Generic.ICollection<T>.Count { get { throw null; } }
T System.Collections.Generic.IList<T>.this[int index] { get { throw null; } set { } }
int System.Collections.Generic.IReadOnlyCollection<T>.Count { get { throw null; } }
T System.Collections.Generic.IReadOnlyList<T>.this[int index] { get { throw null; } }
int System.Collections.ICollection.Count { get { throw null; } }
bool System.Collections.ICollection.IsSynchronized { get { throw null; } }
object System.Collections.ICollection.SyncRoot { get { throw null; } }
object? System.Collections.IList.this[int index] { get { throw null; } set { } }
public abstract System.Numerics.Tensors.Tensor<T> Clone();
public virtual System.Numerics.Tensors.Tensor<T> CloneEmpty() { throw null; }
public virtual System.Numerics.Tensors.Tensor<T> CloneEmpty(System.ReadOnlySpan<int> dimensions) { throw null; }
public virtual System.Numerics.Tensors.Tensor<TResult> CloneEmpty<TResult>() { throw null; }
public abstract System.Numerics.Tensors.Tensor<TResult> CloneEmpty<TResult>(System.ReadOnlySpan<int> dimensions);
public static int Compare(System.Numerics.Tensors.Tensor<T> left, System.Numerics.Tensors.Tensor<T> right) { throw null; }
protected virtual bool Contains(T item) { throw null; }
protected virtual void CopyTo(T[] array, int arrayIndex) { }
public static bool Equals(System.Numerics.Tensors.Tensor<T> left, System.Numerics.Tensors.Tensor<T> right) { throw null; }
public virtual void Fill(T value) { }
public string GetArrayString(bool includeWhitespace = true) { throw null; }
public System.Numerics.Tensors.Tensor<T> GetDiagonal() { throw null; }
public System.Numerics.Tensors.Tensor<T> GetDiagonal(int offset) { throw null; }
public System.Numerics.Tensors.Tensor<T> GetTriangle() { throw null; }
public System.Numerics.Tensors.Tensor<T> GetTriangle(int offset) { throw null; }
public System.Numerics.Tensors.Tensor<T> GetUpperTriangle() { throw null; }
public System.Numerics.Tensors.Tensor<T> GetUpperTriangle(int offset) { throw null; }
public abstract T GetValue(int index);
protected virtual int IndexOf(T item) { throw null; }
public abstract System.Numerics.Tensors.Tensor<T> Reshape(System.ReadOnlySpan<int> dimensions);
public abstract void SetValue(int index, T value);
public struct Enumerator : System.Collections.Generic.IEnumerator<T>
{
public T Current { get; private set; }
object? System.Collections.IEnumerator.Current => throw null;
public bool MoveNext() => throw null;
public void Reset() { }
public void Dispose() { }
}
public Enumerator GetEnumerator() => throw null;
void System.Collections.Generic.ICollection<T>.Add(T item) { }
void System.Collections.Generic.ICollection<T>.Clear() { }
bool System.Collections.Generic.ICollection<T>.Contains(T item) { throw null; }
void System.Collections.Generic.ICollection<T>.CopyTo(T[] array, int arrayIndex) { }
bool System.Collections.Generic.ICollection<T>.Remove(T item) { throw null; }
System.Collections.Generic.IEnumerator<T> System.Collections.Generic.IEnumerable<T>.GetEnumerator() { throw null; }
int System.Collections.Generic.IList<T>.IndexOf(T item) { throw null; }
void System.Collections.Generic.IList<T>.Insert(int index, T item) { }
void System.Collections.Generic.IList<T>.RemoveAt(int index) { }
void System.Collections.ICollection.CopyTo(System.Array array, int index) { }
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
int System.Collections.IList.Add(object? value) { throw null; }
void System.Collections.IList.Clear() { }
bool System.Collections.IList.Contains(object? value) { throw null; }
int System.Collections.IList.IndexOf(object? value) { throw null; }
void System.Collections.IList.Insert(int index, object? value) { }
void System.Collections.IList.Remove(object? value) { }
void System.Collections.IList.RemoveAt(int index) { }
int System.Collections.IStructuralComparable.CompareTo(object? other, System.Collections.IComparer comparer) { throw null; }
bool System.Collections.IStructuralEquatable.Equals(object? other, System.Collections.IEqualityComparer comparer) { throw null; }
int System.Collections.IStructuralEquatable.GetHashCode(System.Collections.IEqualityComparer comparer) { throw null; }
public virtual System.Numerics.Tensors.CompressedSparseTensor<T> ToCompressedSparseTensor() { throw null; }
public virtual System.Numerics.Tensors.DenseTensor<T> ToDenseTensor() { throw null; }
public virtual System.Numerics.Tensors.SparseTensor<T> ToSparseTensor() { throw null; }
}
}
50 changes: 4 additions & 46 deletions src/libraries/System.Numerics.Tensors/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,52 +117,10 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ArrayMustContainElements" xml:space="preserve">
<value>Array must contain elements.</value>
<data name="Argument_DestinationTooShort" xml:space="preserve">
<value>Destination is too short.</value>
</data>
<data name="CannotCompare" xml:space="preserve">
<value>Cannot compare {0} to {1}.</value>
</data>
<data name="CannotCompareToWithDifferentDimension" xml:space="preserve">
<value>Cannot compare {0} to {1} with different dimension {2}, {3} != {4}.</value>
</data>
<data name="CannotCompareWithDifferentDimension" xml:space="preserve">
<value>Cannot compare {0} with different dimension {1}, {2} != {3}.</value>
</data>
<data name="CannotCompareWithRank" xml:space="preserve">
<value>Cannot compare {0} with Rank {1} to {2} with Rank {3}.</value>
</data>
<data name="CannotComputeDiagonal" xml:space="preserve">
<value>Cannot compute diagonal of {0} with Rank less than 2.</value>
</data>
<data name="CannotComputeDiagonalWithOffset" xml:space="preserve">
<value>Cannot compute diagonal with offset {0}.</value>
</data>
<data name="MustHaveAtLeastOneDimension" xml:space="preserve">
<value>Tensor {0} must have at least one dimension.</value>
</data>
<data name="CannotComputeTriangle" xml:space="preserve">
<value>Cannot compute triangle of {0} with Rank less than 2.</value>
</data>
<data name="CannotReshapeArrayDueToMismatchInLengths" xml:space="preserve">
<value>Cannot reshape array due to mismatch in lengths, currently {0} would become {1}.</value>
</data>
<data name="DimensionsMustBePositiveAndNonZero" xml:space="preserve">
<value>Dimensions must be positive and non-zero.</value>
</data>
<data name="DimensionsMustContainElements" xml:space="preserve">
<value>Dimensions must contain elements.</value>
</data>
<data name="LengthMustMatch" xml:space="preserve">
<value>Length of {0} ({1}) must match product of {2} ({3}).</value>
</data>
<data name="NumberGreaterThenAvailableSpace" xml:space="preserve">
<value>The number of elements in the Tensor is greater than the available space from index to the end of the destination array.</value>
</data>
<data name="OnlySingleDimensionalArraysSupported" xml:space="preserve">
<value>Only single dimensional arrays are supported for the requested action.</value>
</data>
<data name="ValueIsNotOfType" xml:space="preserve">
<value>The value "{0}" is not of type "{1}" and cannot be used in this generic collection.</value>
<data name="Argument_SpansMustHaveSameLength" xml:space="preserve">
<value>Length of '{0}' must be same as length of '{1}'.</value>
</data>
</root>
30 changes: 14 additions & 16 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
@@ -1,30 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;$(NetFrameworkMinimum);$(NetCoreAppCurrent);</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- Public API not fully documented. -->
<NoWarn>$(NoWarn);1591</NoWarn>
<IsPackable>true</IsPackable>
<PackageDescription>Tensor class which represents and extends multi-dimensional arrays.

Commonly Used Types:
System.Numerics.Tensors.Tensor&lt;T&gt;
System.Numerics.Tensors.CompressedSparseTensor&lt;T&gt;
System.Numerics.Tensors.DenseTensor&lt;T&gt;
System.Numerics.Tensors.SparseTensor&lt;T&gt;</PackageDescription>
<PackageDescription>Provides support for operating over tensors.</PackageDescription>
<!-- Disabling baseline validation since this is a brand new package.
Once this package has shipped a stable version, the following line
should be removed in order to re-enable validation. -->
<DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
</PropertyGroup>

<ItemGroup>
<Compile Include="Properties\InternalsVisibleTo.cs" />
<Compile Include="System\Numerics\Tensors\ArrayTensorExtensions.cs" />
<Compile Include="System\Numerics\Tensors\ArrayUtilities.cs" />
<Compile Include="System\Numerics\Tensors\CompressedSparseTensor.cs" />
<Compile Include="System\Numerics\Tensors\DenseTensor.cs" />
<Compile Include="System\Numerics\Tensors\SparseTensor.cs" />
<Compile Include="System\Numerics\Tensors\Tensor.cs" />
<Compile Include="System\Numerics\Tensors\TensorPrimitives.cs" />
<Compile Include="System\ThrowHelper.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Bcl.Numerics\ref\Microsoft.Bcl.Numerics.csproj" />
</ItemGroup>

</Project>
Loading
Loading