Updating TypeFromTensorType to be public and adding a related TensorTypeFromType method to perform the opposite operation. (migueldeicaza#125)

cesarsouza · migueldeicaza · commit b81eba985d61 · 2017-09-03T21:15:28.000-04:00
Also adding some small tuning to editorconfig to make sure switch blocks are formatted correctly. - Updates migueldeicazaGH-116: Converting to and from TFDataType and System.Type
diff --git a/.editorconfig b/.editorconfig
@@ -3,10 +3,12 @@ root = true
 [*.cs]
 indent_style = tab
 indent_size = 4
+trim_trailing_whitespace = false
 csharp_space_before_open_square_brackets = true
 csharp_space_between_method_call_name_and_opening_parenthesis = true
 csharp_space_between_method_declaration_name_and_open_parenthesis = true
 csharp_new_line_before_else = false
+csharp_indent_switch_labels = false
 csharp_new_line_before_open_brace = types,methods,properties,events
 # other valid values:
 # - types
diff --git a/TensorFlowSharp/Tensor.cs b/TensorFlowSharp/Tensor.cs
@@ -751,7 +751,12 @@ public long [] Shape {
 			}
 		}
 
-		static Type TypeFromTensorType (TFDataType type)
+		/// <summary>
+		/// Converts a <see cref="TFDataType"/> to a system type.
+		/// </summary>
+		/// <param name="type">The <see cref="TFDataType"/> to be converted.</param>
+		/// <returns>The system type corresponding to the given <paramref name="type"/>.</returns>
+		public static Type TypeFromTensorType (TFDataType type)
 		{
 			switch (type) {
 			case TFDataType.Float:
@@ -781,6 +786,39 @@ static Type TypeFromTensorType (TFDataType type)
 			}
 		}
 
+		/// <summary>
+		/// Converts a system type to a <see cref="TFDataType"/>.
+		/// </summary>
+		/// <param name="type">The system type to be converted.</param>
+		/// <returns>The <see cref="TFDataType"/> corresponding to the given type.</returns>
+		public static TFDataType TensorTypeFromType (Type type)
+		{
+			if (type == typeof (float))
+				return TFDataType.Float;
+			if (type == typeof (double))
+				return TFDataType.Double;
+			if (type == typeof (int))
+				return TFDataType.Int32;
+			if (type == typeof (byte))
+				return TFDataType.UInt8;
+			if (type == typeof (short))
+				return TFDataType.Int16;
+			if (type == typeof (sbyte))
+				return TFDataType.Int8;
+			if (type == typeof (string))
+				return TFDataType.String;
+			if (type == typeof (long))
+				return TFDataType.Int64;
+			if (type == typeof (bool))
+				return TFDataType.Bool;
+			if (type == typeof (ushort))
+				return TFDataType.UInt16;
+			if (type == typeof (Complex))
+				return TFDataType.Complex128;
+
+			throw new ArgumentOutOfRangeException (nameof(type), $"The given type could not be mapped to an existing {nameof(TFDataType)}.");
+		}
+
 		static unsafe object FetchSimple (TFDataType dt, IntPtr data)
 		{
 			switch (dt) {
