more changes

Author: michaelgsharp

csharp/src/Microsoft.ML.OnnxRuntime/ManagedProjections.shared.cs

@@ -6,6 +6,13 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
+
+
+#if NET8_0
+using DotnetTensors = System.Numerics.Tensors;
+using TensorPrimitives = System.Numerics.Tensors.TensorPrimitives;
+#endif
 
 namespace Microsoft.ML.OnnxRuntime
 {
@@ -166,13 +173,41 @@ private static OrtValue CreateMapProjection(NamedOnnxValue node, NodeMetadata el
         /// <exception cref="OnnxRuntimeException"></exception>
         private static OrtValue CreateTensorProjection(NamedOnnxValue node, NodeMetadata elementMeta)
         {
-            if (node.Value is not TensorBase)
+#if NET8_0
+#pragma warning disable SYSLIB5001 // System.Numerics.Tensors is only in preview so we can continue receiving API feedback
+            if (node.Value is not TensorBase && node.Value.GetType().GetGenericTypeDefinition() != typeof(DotnetTensors.Tensor<>))
             {
                 throw new OnnxRuntimeException(ErrorCode.InvalidArgument,
                     $"NamedOnnxValue contains: {node.Value.GetType()}, expecting a Tensor<T>");
             }
 
+            OrtValue ortValue;
+            TensorElementType elementType;
+
+            if (node.Value is TensorBase)
+            {
+                ortValue = OrtValue.CreateFromTensorObject(node.Value as TensorBase, out elementType);
+            }
+            else
+            {
+                MethodInfo method = typeof(OrtValue).GetMethod(nameof(OrtValue.CreateTensorValueFromDotnetTensorObject), BindingFlags.Static | BindingFlags.Public);
+                Type tensorType = node.Value.GetType().GetGenericArguments()[0];
+                MethodInfo generic = method.MakeGenericMethod(tensorType);
+                ortValue = (OrtValue)generic.Invoke(null, [node.Value]);
+                elementType = TensorBase.GetTypeInfo(tensorType).ElementType;
+            }
+
+
+#pragma warning restore SYSLIB5001 // System.Numerics.Tensors is only in preview so we can continue receiving API feedback
+#else
+            if (node.Value is not TensorBase)
+            {
+                throw new OnnxRuntimeException(ErrorCode.InvalidArgument,
+                    $"NamedOnnxValue contains: {node.Value.GetType()}, expecting a Tensor<T>");
+            }
             OrtValue ortValue = OrtValue.CreateFromTensorObject(node.Value as TensorBase, out TensorElementType elementType);
+
+#endif
             try
             {
                 if (elementType != elementMeta.ElementDataType)

csharp/src/Microsoft.ML.OnnxRuntime/NamedOnnxValue.shared.cs

@@ -218,6 +218,21 @@ public Tensor<T> AsTensor<T>()
             return _value as Tensor<T>;  // will return null if not castable
         }
 
+
+#if NET8_0
+#pragma warning disable SYSLIB5001 // System.Numerics.Tensors is only in preview so we can continue receiving API feedback
+        /// <summary>
+        /// Try-get value as a Tensor&lt;T&gt;.
+        /// </summary>
+        /// <typeparam name="T">Type</typeparam>
+        /// <returns>Tensor object if contained value is a Tensor. Null otherwise</returns>
+        public DotnetTensors.Tensor<T> AsDotnetTensor<T>()
+        {
+            return _value as DotnetTensors.Tensor<T>;  // will return null if not castable
+        }
+#pragma warning restore SYSLIB5001 // System.Numerics.Tensors is only in preview so it can continue receiving API feedback
+#endif
+
         /// <summary>
         /// Try-get value as an Enumerable&lt;T&gt;.
         /// T is usually a NamedOnnxValue instance that may contain

csharp/src/Microsoft.ML.OnnxRuntime/OrtValue.shared.cs

@@ -6,6 +6,8 @@
 using System.Buffers;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -232,11 +234,7 @@ public DotnetTensors.ReadOnlyTensorSpan<T> GetTensorDataAsTensorSpan<T>() where
 
             var typeSpan = MemoryMarshal.Cast<byte, T>(byteSpan);
             var shape = GetTypeInfo().TensorTypeAndShapeInfo.Shape;
-            var nArray = new nint[shape.Length];
-            for (int i = 0; i < shape.Length; i++)
-            {
-                nArray[i] = (nint)shape[i];
-            }
+            var nArray = shape.Select(x => (nint)x).ToArray();
 
             return new DotnetTensors.ReadOnlyTensorSpan<T>(typeSpan, nArray, []);
         }
@@ -283,11 +281,7 @@ public DotnetTensors.TensorSpan<T> GetTensorMutableDataAsTensorSpan<T>() where T
 
             var typeSpan = MemoryMarshal.Cast<byte, T>(byteSpan);
             var shape = GetTypeInfo().TensorTypeAndShapeInfo.Shape;
-            var nArray = new nint[shape.Length];
-            for (int i = 0; i < shape.Length; i++)
-            {
-                nArray[i] = (nint)shape[i];
-            }
+            var nArray = shape.Select(x => (nint)x).ToArray();
 
             return new DotnetTensors.TensorSpan<T>(typeSpan, nArray, []);
         }
@@ -314,11 +308,7 @@ public DotnetTensors.TensorSpan<byte> GetTensorSpanMutableRawData<T>() where T :
             var byteSpan = GetTensorBufferRawData(typeof(T));
 
             var shape = GetTypeInfo().TensorTypeAndShapeInfo.Shape;
-            var nArray = new nint[shape.Length];
-            for (int i = 0; i < shape.Length; i++)
-            {
-                nArray[i] = (nint)shape[i];
-            }
+            var nArray = shape.Select(x => (nint)x).ToArray();
 
             return new DotnetTensors.TensorSpan<byte>(byteSpan, nArray, []);
         }
@@ -716,7 +706,10 @@ public static OrtValue CreateTensorValueFromDotnetTensorObject<T>(DotnetTensors.
             }
             unsafe
             {
-                GCHandle handle = GCHandle.Alloc(tensor, GCHandleType.Pinned);
+                var field = tensor.GetType().GetFields(BindingFlags.Instance | BindingFlags.NonPublic).Where(x => x.Name == "_values").FirstOrDefault();
+                var backingData = (T[])field.GetValue(tensor);
+                GCHandle handle = GCHandle.Alloc(backingData, GCHandleType.Pinned);
+                //GCHandle handle = GCHandle.Alloc(tensor.GetPinnableReference(), GCHandleType.Pinned);
                 var memHandle = new MemoryHandle(Unsafe.AsPointer(ref tensor.GetPinnableReference()), handle);
 
                 try
@@ -729,11 +722,7 @@ public static OrtValue CreateTensorValueFromDotnetTensorObject<T>(DotnetTensors.
 
                     var bufferLengthInBytes = tensor.FlattenedLength * sizeof(T);
 
-                    var shape = new long[tensor.Rank];
-                    for (int i = 0; i < shape.Length; i++)
-                    {
-                        shape[i] = tensor.Lengths[i];
-                    }
+                    var shape = tensor.Lengths.ToArray().Select(x => (long)x).ToArray();
 
                     var typeInfo = TensorBase.GetTypeInfo(typeof(T)) ??
                         throw new OnnxRuntimeException(ErrorCode.InvalidArgument, $"Tensor of type: {typeof(T)} is not supported");