TFTensor constructor can now take arbitrary arrays

migueldeicaza · migueldeicaza · commit 1bed2e1c3e37 · 2017-05-27T00:13:26.000-04:00
diff --git a/TensorFlowSharp/Tensor.cs b/TensorFlowSharp/Tensor.cs
@@ -221,7 +221,73 @@ public static TFTensor FromBuffer (TFShape shape, Complex [] data, int start, in
 		{
 			return new TFTensor (SetupTensor (TFDataType.Complex128, shape, data, start, count, size: 16));
 		}
-		
+
+		/// <summary>
+		/// Creates a constant tensor from an array, the shape reflects the shape of the C# array and the underlying type reflects the C# type.
+		/// </summary>
+		public unsafe TFTensor (Array array)
+		{
+			if (array == null)
+				throw new ArgumentNullException (nameof (array));
+			// TODO: ensure that we do not have arrays of arrays.
+			var t = array.GetType ().GetElementType ();
+			var tc = Type.GetTypeCode (t);
+			TFDataType dt;
+			long size = 0;
+			switch (tc) {
+			case TypeCode.Boolean:
+				dt = TFDataType.Bool;
+				size = 1;
+				break;
+			case TypeCode.SByte:
+				dt = TFDataType.Int8;
+				size = 1;
+				break;
+			case TypeCode.Byte:
+				dt = TFDataType.UInt8;
+				size = 1;
+				break;
+			case TypeCode.Int16:
+				dt = TFDataType.Int16;
+				size = 2;
+				break;
+			case TypeCode.UInt16:
+				dt = TFDataType.UInt16;
+				size = 2;
+				break;
+			case TypeCode.Int32:
+				dt = TFDataType.Int32;
+				size = 4;
+				break;
+			case TypeCode.Int64:
+				dt = TFDataType.Int64;
+				size = 8;
+				break;
+			case TypeCode.Single:
+				dt = TFDataType.Float;
+				size = 4;
+				break;
+			case TypeCode.Double:
+				dt = TFDataType.Double;
+				size = 8;
+				break;
+			default:
+				// Check types that are not handled by the typecode
+				if (t.IsAssignableFrom (typeof (Complex))) {
+					size = 16;
+					dt = TFDataType.Complex128;
+				} else
+					throw new ArgumentException ($"The data type {t} is not supported");
+				break;
+			}
+
+			var dims = new long [array.Rank];
+			for (int i = 0; i < array.Rank; i++) {
+				dims [i] = array.GetLength (i);
+				size *= (int)dims [i];
+			}
+			handle = SetupMulti (dt, dims, array, size);
+		}
 
 		/// <summary>
 		/// Creates a constant tensor with a single dimension from an integer value.
@@ -541,67 +607,8 @@ unsafe public static implicit operator TFTensor (byte value)
 		/// </remarks>
 		unsafe public static implicit operator TFTensor (Array array)
 		{
-			if (array == null)
-				throw new ArgumentNullException (nameof (array));
-			// TODO: ensure that we do not have arrays of arrays.
-			var t = array.GetType ().GetElementType ();
-			var tc = Type.GetTypeCode (t);
-			TFDataType dt;
-			long size = 0;
-			switch (tc) {
-			case TypeCode.Boolean:
-				dt = TFDataType.Bool;
-				size = 1;
-				break;
-			case TypeCode.SByte:
-				dt = TFDataType.Int8;
-				size = 1;
-				break;
-			case TypeCode.Byte:
-				dt = TFDataType.UInt8;
-				size = 1;
-				break;
-			case TypeCode.Int16:
-				dt = TFDataType.Int16;
-				size = 2;
-				break;
-			case TypeCode.UInt16:
-				dt = TFDataType.UInt16;
-				size = 2;
-				break;
-			case TypeCode.Int32:
-				dt = TFDataType.Int32;
-				size = 4;
-				break;
-			case TypeCode.Int64:
-				dt = TFDataType.Int64;
-				size = 8;
-				break;
-			case TypeCode.Single:
-				dt = TFDataType.Float;
-				size = 4;
-				break;
-			case TypeCode.Double:
-				dt = TFDataType.Double;
-				size = 8;
-				break;
-			default:
-				// Check types that are not handled by the typecode
-				if (t.IsAssignableFrom (typeof (Complex))){
-					size = 16;
-					dt = TFDataType.Complex128;
-				} else
-					throw new ArgumentException ($"The data type {t} is not supported");
-				break;
-			}
+			return new TFTensor (array);
 
-			var dims = new long [array.Rank];
-			for (int i = 0; i < array.Rank; i++) {
-				dims [i] = array.GetLength (i);
-				size *= (int)dims [i];
-			}
-			var newTensor = new TFTensor (SetupMulti (dt, dims, array, size));
-			return newTensor;
 		}
 
 		// General purpose constructor, specifies data type and gets pointer to buffer
