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

Tensor extensions #4260

Merged
merged 21 commits into from
Oct 2, 2019
Merged

Tensor extensions #4260

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c962327
Add TensorTypeExtensions
KsenijaS Sep 19, 2019
c1da00b
Upgrade performance by replacing ToArray method
KsenijaS Sep 25, 2019
271947f
Fix failing tests
KsenijaS Sep 26, 2019
5bf10d4
Remove unused code
KsenijaS Sep 27, 2019
edb4963
Remove duplicate file TensorTypeExtensions
KsenijaS Sep 27, 2019
0b2c97e
Remove comented code
KsenijaS Sep 27, 2019
8014a1e
Add exceptions
KsenijaS Sep 27, 2019
a9c8119
Add copyright header
KsenijaS Sep 27, 2019
34bc241
Rename ToSpan to CopyTo
KsenijaS Sep 27, 2019
3c3ebd8
Use Utils.EnsureSize method
KsenijaS Sep 27, 2019
5029298
Use CopyTo method to copy the values to span
KsenijaS Sep 27, 2019
97f1109
Fix Destination too short error
KsenijaS Sep 30, 2019
b2f3c78
Call CopyTo inside ToArray method to ensure code reuse
KsenijaS Sep 30, 2019
00e18b8
No need to assign values span to dst
KsenijaS Sep 30, 2019
3b7f984
Use checked keyword around cast to len
KsenijaS Sep 30, 2019
5b1cee7
Set keepOld to false instead of true in Utils.EnsureSize
KsenijaS Sep 30, 2019
606dad6
Add assert to ensure that imageArray and featurizedImage are the same…
KsenijaS Oct 1, 2019
016079b
Cast tensor.size to int instead of long
KsenijaS Oct 1, 2019
fc5b6bc
Remove FetchData since it's no longer used
KsenijaS Oct 1, 2019
ecbfc65
Add checked keyword around cast
KsenijaS Oct 1, 2019
bc2fc7f
Merge https://github.com/dotnet/machinelearning into tensor_extensions
KsenijaS Oct 1, 2019
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
121 changes: 121 additions & 0 deletions src/Microsoft.ML.TensorFlow/TensorTypeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
using System;
using NumSharp.Backends;
using NumSharp.Backends.Unmanaged;
using NumSharp.Utilities;
using Tensorflow;

namespace Microsoft.ML.Transforms
{
[BestFriend]
internal static class TensorTypeExtensions
{
public static void ToArray<T>(this Tensor tensor, T[] array) where T: unmanaged
{
var size = array.Length;
if (typeof(T).as_dtype() == tensor.dtype)
{
if (tensor.NDims == 0 && size == 1)
{
unsafe
{
array[0] = *(T*)tensor.buffer;
}
}

unsafe
{
var len = (long)size;
fixed (T* dst = array)
{
var src = (T*)tensor.buffer;
len *= ((long)tensor.itemsize);
System.Buffer.MemoryCopy(src, dst, len, len);
}
}
}
else
{
if (tensor.NDims == 0 && size == 1) //is it a scalar?
{
unsafe
{
#if _REGEN
KsenijaS marked this conversation as resolved.
Show resolved Hide resolved
#region Compute
switch (dtype.as_numpy_dtype().GetTypeCode())
{
%foreach supported_dtypes,supported_dtypes_lowercase%
case NPTypeCode.#1: return new T[] {Converts.ChangeType<T>(*(#2*) buffer)};
%
case NPTypeCode.String: return new T[] {Converts.ChangeType<T>((string)this)};
default:
throw new NotSupportedException();
}
#endregion
#else
#region Compute
switch (tensor.dtype.as_numpy_dtype().GetTypeCode())
{
case NPTypeCode.Boolean: { array[0] = Converts.ChangeType<T>(tensor.buffer, NPTypeCode.Boolean); break;};
case NPTypeCode.Byte: { array[0] = Converts.ChangeType<T>(tensor.buffer, NPTypeCode.Byte); break; };
case NPTypeCode.Int16: { array[0] = Converts.ChangeType<T>(tensor.buffer, NPTypeCode.Int16); break; };
case NPTypeCode.UInt16: { array[0] = Converts.ChangeType<T>(tensor.buffer, NPTypeCode.UInt16); break; };
case NPTypeCode.Int32: { array[0] = Converts.ChangeType<T>(tensor.buffer, NPTypeCode.Int32); break; };
case NPTypeCode.UInt32: { array[0] = Converts.ChangeType<T>(tensor.buffer, NPTypeCode.UInt32); break; };
case NPTypeCode.Int64: { array[0] = Converts.ChangeType<T>(tensor.buffer, NPTypeCode.Int64); break; };
case NPTypeCode.UInt64: { array[0] = Converts.ChangeType<T>(tensor.buffer, NPTypeCode.UInt64); break; };
case NPTypeCode.Char: { array[0] = Converts.ChangeType<T>(tensor.buffer, NPTypeCode.Char); break; };
case NPTypeCode.Double: { array[0] = Converts.ChangeType<T>(tensor.buffer, NPTypeCode.Double); break; };
case NPTypeCode.Single: { array[0] = Converts.ChangeType<T>(tensor.buffer, NPTypeCode.Single); break; };
case NPTypeCode.String: { array[0] = Converts.ChangeType<T>(tensor.buffer, NPTypeCode.String); break; };
default:
throw new NotSupportedException();
}
#endregion
#endif
}
}

unsafe
{
var len = (long)size;
fixed (T* dstRet = array)
{
T* dst = dstRet; //local stack copy
#if _REGEN
#region Compute
switch (dtype.as_numpy_dtype().GetTypeCode())
{
%foreach supported_dtypes,supported_dtypes_lowercase%
case NPTypeCode.#1: new UnmanagedMemoryBlock<#2>((#2*) buffer, len).CastTo(new UnmanagedMemoryBlock<T>(dst, len), null, null); break;
%
default:
throw new NotSupportedException();
}
#endregion
#else
#region Compute
switch (tensor.dtype.as_numpy_dtype().GetTypeCode())
{
case NPTypeCode.Boolean: new UnmanagedMemoryBlock<bool>((bool*)tensor.buffer, len).CastTo(new UnmanagedMemoryBlock<T>(dst, len), null, null); break;
case NPTypeCode.Byte: new UnmanagedMemoryBlock<byte>((byte*)tensor.buffer, len).CastTo(new UnmanagedMemoryBlock<T>(dst, len), null, null); break;
case NPTypeCode.Int16: new UnmanagedMemoryBlock<short>((short*)tensor.buffer, len).CastTo(new UnmanagedMemoryBlock<T>(dst, len), null, null); break;
case NPTypeCode.UInt16: new UnmanagedMemoryBlock<ushort>((ushort*)tensor.buffer, len).CastTo(new UnmanagedMemoryBlock<T>(dst, len), null, null); break;
case NPTypeCode.Int32: new UnmanagedMemoryBlock<int>((int*)tensor.buffer, len).CastTo(new UnmanagedMemoryBlock<T>(dst, len), null, null); break;
case NPTypeCode.UInt32: new UnmanagedMemoryBlock<uint>((uint*)tensor.buffer, len).CastTo(new UnmanagedMemoryBlock<T>(dst, len), null, null); break;
case NPTypeCode.Int64: new UnmanagedMemoryBlock<long>((long*)tensor.buffer, len).CastTo(new UnmanagedMemoryBlock<T>(dst, len), null, null); break;
case NPTypeCode.UInt64: new UnmanagedMemoryBlock<ulong>((ulong*)tensor.buffer, len).CastTo(new UnmanagedMemoryBlock<T>(dst, len), null, null); break;
case NPTypeCode.Char: new UnmanagedMemoryBlock<char>((char*)tensor.buffer, len).CastTo(new UnmanagedMemoryBlock<T>(dst, len), null, null); break;
case NPTypeCode.Double: new UnmanagedMemoryBlock<double>((double*)tensor.buffer, len).CastTo(new UnmanagedMemoryBlock<T>(dst, len), null, null); break;
case NPTypeCode.Single: new UnmanagedMemoryBlock<float>((float*)tensor.buffer, len).CastTo(new UnmanagedMemoryBlock<T>(dst, len), null, null); break;
case NPTypeCode.String: throw new NotSupportedException("Unable to convert from string to other dtypes");
default:
throw new NotSupportedException();
}
#endregion
#endif
}
}
}
}
}
}