Hello World works.

Oceania2018 · Oceania2018 · commit 4ca080e56586 · 2019-07-30T17:54:05.000-05:00
diff --git a/src/TensorFlowNET.Core/Sessions/BaseSession.cs b/src/TensorFlowNET.Core/Sessions/BaseSession.cs
@@ -302,7 +302,7 @@ private unsafe NDArray fetchValue(IntPtr output)
                         // wired, don't know why we have to start from offset 9.
                         // length in the begin
                         var str = UTF8Encoding.Default.GetString(bytes, 9, bytes[8]);
-                        nd = np.array(str).reshape();
+                        nd = np.array(str);
                         break;
                     case TF_DataType.TF_UINT8:
                         var _bytes = new byte[tensor.size];
diff --git a/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj b/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj
@@ -63,7 +63,6 @@ Docs: https://tensorflownet.readthedocs.io</Description>
 
   <ItemGroup>
     <PackageReference Include="Google.Protobuf" Version="3.9.0" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/TensorFlowNET.Core/Tensors/dtypes.cs b/src/TensorFlowNET.Core/Tensors/dtypes.cs
@@ -51,12 +51,13 @@ public static Type as_numpy_datatype(this TF_DataType type)
         }
 
         // "sbyte", "byte", "short", "ushort", "int", "uint", "long", "ulong", "float", "double", "Complex"
-        public static TF_DataType as_dtype(Type type)
+        public static TF_DataType as_dtype(Type type, TF_DataType? dtype = null)
         {
-            TF_DataType dtype = TF_DataType.DtInvalid;
-            
             switch (type.Name)
             {
+                case "Char":
+                    dtype =  dtype ?? TF_DataType.TF_UINT8;
+                    break;
                 case "SByte":
                     dtype = TF_DataType.TF_INT8;
                     break;
@@ -100,7 +101,7 @@ public static TF_DataType as_dtype(Type type)
                     throw new Exception("as_dtype Not Implemented");
             }
 
-            return dtype;
+            return dtype.Value;
         }
 
         public static DataType as_datatype_enum(this TF_DataType type)
diff --git a/src/TensorFlowNET.Core/Tensors/tensor_util.cs b/src/TensorFlowNET.Core/Tensors/tensor_util.cs
@@ -226,7 +226,7 @@ public static TensorProto make_tensor_proto(object values, TF_DataType dtype = T
                 }
             }
 
-            var numpy_dtype = dtypes.as_dtype(nparray.dtype);
+            var numpy_dtype = dtypes.as_dtype(nparray.dtype, dtype: dtype);
             if (numpy_dtype == TF_DataType.DtInvalid)
                 throw new TypeError($"Unrecognized data type: {nparray.dtype}");
 
diff --git a/src/TensorFlowNET.Core/Tensors/tf.constant.cs b/src/TensorFlowNET.Core/Tensors/tf.constant.cs
@@ -33,6 +33,14 @@ public static Tensor constant(object value,
                 verify_shape: verify_shape,
                 allow_broadcast: false);
 
+        public static Tensor constant(string value,
+            string name = "Const") => constant_op._constant_impl(value,
+                tf.@string,
+                new int[] { 1 },
+                name,
+                verify_shape: false,
+                allow_broadcast: false);
+
         public static Tensor constant(float value,
             int shape,
             string name = "Const") => constant_op._constant_impl(value,
diff --git a/test/TensorFlowNET.Examples/HelloWorld.cs b/test/TensorFlowNET.Examples/HelloWorld.cs
@@ -29,8 +29,9 @@ of the Constant op. */
             {
                 // Run the op
                 var result = sess.run(hello);
-                Console.WriteLine(result.ToString());
-                return result.ToString().Equals(str);
+                string result_string = string.Join("", result.GetData<char>());
+                Console.WriteLine(result_string);
+                return result_string.Equals(str);
             });
         }
 

Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,13 @@ public static Type as_numpy_datatype(this TF_DataType type)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// "sbyte", "byte", "short", "ushort", "int", "uint", "long", "ulong", "float", "double", "Complex"`
`54`		`- public static TF_DataType as_dtype(Type type)`
	`54`	`+ public static TF_DataType as_dtype(Type type, TF_DataType? dtype = null)`
`55`	`55`	`{`
`56`		`- TF_DataType dtype = TF_DataType.DtInvalid;`
`57`		`-`
`58`	`56`	`switch (type.Name)`
`59`	`57`	`{`
	`58`	`+ case "Char":`
	`59`	`+ dtype = dtype ?? TF_DataType.TF_UINT8;`
	`60`	`+ break;`
`60`	`61`	`case "SByte":`
`61`	`62`	`dtype = TF_DataType.TF_INT8;`
`62`	`63`	`break;`
`@@ -100,7 +101,7 @@ public static TF_DataType as_dtype(Type type)`
`100`	`101`	`throw new Exception("as_dtype Not Implemented");`
`101`	`102`	`}`
`102`	`103`
`103`		`- return dtype;`
	`104`	`+ return dtype.Value;`
`104`	`105`	`}`
`105`	`106`
`106`	`107`	`public static DataType as_datatype_enum(this TF_DataType type)`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ public static TensorProto make_tensor_proto(object values, TF_DataType dtype = T`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`
`229`		`- var numpy_dtype = dtypes.as_dtype(nparray.dtype);`
	`229`	`+ var numpy_dtype = dtypes.as_dtype(nparray.dtype, dtype: dtype);`
`230`	`230`	`if (numpy_dtype == TF_DataType.DtInvalid)`
`231`	`231`	`throw new TypeError($"Unrecognized data type: {nparray.dtype}");`
`232`	`232`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,9 @@ of the Constant op. */`
`29`	`29`	`{`
`30`	`30`	`// Run the op`
`31`	`31`	`var result = sess.run(hello);`
`32`		`- Console.WriteLine(result.ToString());`
`33`		`- return result.ToString().Equals(str);`
	`32`	`+ string result_string = string.Join("", result.GetData<char>());`
	`33`	`+ Console.WriteLine(result_string);`
	`34`	`+ return result_string.Equals(str);`
`34`	`35`	`});`
`35`	`36`	`}`
`36`	`37`