test string const

Oceania2018 · Oceania2018 · commit d7e04d5cb4b5 · 2019-01-04T07:21:27.000-06:00
diff --git a/src/TensorFlowNET.Core/Graphs/Graph.cs b/src/TensorFlowNET.Core/Graphs/Graph.cs
@@ -24,23 +24,36 @@ public partial class Graph : IDisposable
         private List<String> _unfetchable_ops = new List<string>();
 
         private string _name_stack;
+        public Status Status { get; }
 
         public Graph()
         {
             _handle = c_api.TF_NewGraph();
+            Status = new Status();
         }
 
         public Graph(IntPtr graph)
         {
             _handle = graph;
+            Status = new Status();
             _nodes_by_id = new Dictionary<int, Operation>();
             _nodes_by_name = new Dictionary<string, Operation>();
             _names_in_use = new Dictionary<string, int>();
         }
 
-        public OperationDescription NewOperation(string opType, string opName)
+        public Operation NewOperation(string opType, string opName, Tensor t)
         {
-            return c_api.TF_NewOperation(_handle, opType, opName);
+            var desc = c_api.TF_NewOperation(_handle, opType, opName);
+            
+            c_api.TF_SetAttrTensor(desc, "value", t, Status);
+            Status.Check();
+
+            c_api.TF_SetAttrType(desc, "dtype", t.dtype);
+
+            var op = c_api.TF_FinishOperation(desc, Status);
+            Status.Check();
+
+            return op;
         }
 
         public T as_graph_element<T>(T obj, bool allow_tensor = true, bool allow_operation = true)
diff --git a/src/TensorFlowNET.Core/Operations/c_api.ops.cs b/src/TensorFlowNET.Core/Operations/c_api.ops.cs
@@ -7,6 +7,18 @@ namespace Tensorflow
 {
     public static partial class c_api
     {
+        /// <summary>
+        /// Request that `desc` be co-located on the device where `op`
+        /// is placed.
+        ///
+        /// Use of this is discouraged since the implementation of device placement is
+        /// subject to change. Primarily intended for internal libraries 
+        /// </summary>
+        /// <param name="desc"></param>
+        /// <param name="op"></param>
+        [DllImport(TensorFlowLibName)]
+        public static extern void TF_ColocateWith(IntPtr desc, IntPtr op);
+
         /// <summary>
         /// Get the OpList of all OpDefs defined in this address space.
         /// </summary>
@@ -209,7 +221,7 @@ public static partial class c_api
         /// <param name="value">const void*</param>
         /// <param name="length">size_t</param>
         [DllImport(TensorFlowLibName)]
-        public static extern void TF_SetAttrString(IntPtr desc, string attr_name, string value, uint length);
+        public static extern void TF_SetAttrString(IntPtr desc, string attr_name, IntPtr value, uint length);
 
         /// <summary>
         /// 
diff --git a/src/TensorFlowNET.Core/Sessions/BaseSession.cs b/src/TensorFlowNET.Core/Sessions/BaseSession.cs
@@ -119,6 +119,9 @@ private unsafe object[] _call_tf_sessionrun(KeyValuePair<TF_Output, Tensor>[] fe
                 .Select(x => (object)*(float*)x)
                 .ToArray();
 
+            var op = new Operation(fetch_list[0].oper);
+            //var metadata = c_api.TF_OperationGetAttrMetadata(fetch_list[0].oper, "dtype", status);
+
             return result;
         }
 
diff --git a/src/TensorFlowNET.Core/Sessions/Session.cs b/src/TensorFlowNET.Core/Sessions/Session.cs
@@ -7,9 +7,19 @@ namespace Tensorflow
     public class Session : BaseSession
     {
         private IntPtr _handle;
+        public Status Status { get; }
+        public SessionOptions Options { get; }
 
         public Session(string target = "", Graph graph = null)
         {
+            Status = new Status();
+            if(graph == null)
+            {
+                graph = tf.get_default_graph();
+            }
+            Options = new SessionOptions();
+            _handle = c_api.TF_NewSession(graph, Options, Status);
+            Status.Check();
         }
 
         public Session(IntPtr handle)
diff --git a/src/TensorFlowNET.Core/Status/Status.cs b/src/TensorFlowNET.Core/Status/Status.cs
@@ -36,12 +36,15 @@ public void SetStatus(TF_Code code, string msg)
         /// Check status 
         /// Throw exception with error message if code != TF_OK
         /// </summary>
-        public void Check()
+        public void Check(bool throwException = false)
         {
             if(Code != TF_Code.TF_OK)
             {
                 Console.WriteLine(Message);
-                // throw new Exception(Message);
+                if (throwException)
+                {
+                    throw new Exception(Message);
+                }
             }
         }
 
diff --git a/src/TensorFlowNET.Core/Tensors/Tensor.cs b/src/TensorFlowNET.Core/Tensors/Tensor.cs
@@ -69,6 +69,7 @@ public Tensor(NDArray nd)
         private IntPtr Allocate(NDArray nd)
         {
             var dotHandle = Marshal.AllocHGlobal(nd.dtypesize * nd.size);
+            ulong size = (ulong)(nd.size * nd.dtypesize);
 
             switch (nd.dtype.Name)
             {
@@ -81,16 +82,21 @@ private IntPtr Allocate(NDArray nd)
                 case "Double":
                     Marshal.Copy(nd.Data<double>(), 0, dotHandle, nd.size);
                     break;
+                case "String":
+                    dotHandle = Marshal.StringToHGlobalAuto(nd.Data<string>()[0]);
+                    size = (ulong)nd.Data<string>()[0].Length;
+                    break;
                 default:
                     throw new NotImplementedException("Marshal.Copy failed.");
             }
 
             var dataType = ToTFDataType(nd.dtype);
+            
             var tfHandle = c_api.TF_NewTensor(dataType,
                 nd.shape.Select(x => (long)x).ToArray(), // shape
                 nd.ndim,
                 dotHandle,
-                (ulong)(nd.size * nd.dtypesize),
+                size,
                 (IntPtr values, IntPtr len, ref bool closure) =>
                 {
                     // Free the original buffer and set flag
@@ -154,6 +160,8 @@ public TF_DataType ToTFDataType(Type type)
                     return TF_DataType.TF_FLOAT;
                 case "Double":
                     return TF_DataType.TF_DOUBLE;
+                case "String":
+                    return TF_DataType.TF_STRING;
             }
 
             return TF_DataType.DtInvalid;
diff --git a/src/TensorFlowNET.Core/Tensors/constant_op.cs b/src/TensorFlowNET.Core/Tensors/constant_op.cs
@@ -34,12 +34,13 @@ public static Tensor Create(NDArray nd, string name = "Const", bool verify_shape
             attrs["dtype"] = dtype_value;
             attrs["value"] = tensor_value;
 
-            var const_tensor = g.create_op("Const", 
-                null, 
-                new TF_DataType[] { (TF_DataType)dtype_value.Type }, 
+            var op = g.create_op("Const",
+                null,
+                new TF_DataType[] { (TF_DataType)dtype_value.Type },
                 attrs: attrs,
-                name: name).outputs[0];
+                name: name);
 
+            var const_tensor = op.outputs[0];
             const_tensor.value = nd.Data();
 
             return const_tensor;
diff --git a/src/TensorFlowNET.Core/Tensors/tf.constant.cs b/src/TensorFlowNET.Core/Tensors/tf.constant.cs
@@ -7,9 +7,9 @@ namespace Tensorflow
 {
     public static partial class tf
     {
-        public static Tensor constant(NDArray value, string name = "Const", bool verify_shape = false)
+        public static Tensor constant(NDArray nd, string name = "Const", bool verify_shape = false)
         {
-            return constant_op.Create(value, name, verify_shape);
+            return constant_op.Create(nd, name, verify_shape);
         }
     }
 }
diff --git a/test/TensorFlowNET.Examples/HelloWorld.cs b/test/TensorFlowNET.Examples/HelloWorld.cs
@@ -24,7 +24,7 @@ of the Constant op.*/
             var sess = tf.Session();
 
             // Run the op
-            sess.run(hello);
+            Console.WriteLine(sess.run(hello));
         }
     }
 }
diff --git a/test/TensorFlowNET.Examples/Program.cs b/test/TensorFlowNET.Examples/Program.cs
@@ -23,6 +23,8 @@ static void Main(string[] args)
                     Console.ReadLine();
                 }
             }
+
+            Console.ReadLine();
         }
     }
 }
diff --git a/test/TensorFlowNET.UnitTest/CApiColocationTest.cs b/test/TensorFlowNET.UnitTest/CApiColocationTest.cs
@@ -25,12 +25,17 @@ public class CApiColocationTest : CApiTest, IDisposable
         public void SetUp()
         {
             feed1_ = c_test_util.Placeholder(graph_, s_, "feed1");
+            s_.Check();
             feed2_ = c_test_util.Placeholder(graph_, s_, "feed2");
+            s_.Check();
             constant_ = c_test_util.ScalarConst(10, graph_, s_);
-            desc_ = graph_.NewOperation("AddN", "add");
+            s_.Check();
+            desc_ = c_api.TF_NewOperation(graph_, "AddN", "add");
+            s_.Check();
 
             TF_Output[] inputs = { new TF_Output(feed1_, 0), new TF_Output(constant_, 0) };
             desc_.AddInputList(inputs);
+            s_.Check();
         }
 
         private void SetViaStringList(OperationDescription desc, string[] list)
@@ -85,7 +90,8 @@ private void VerifyCollocation(Operation op, string[] expected)
         [TestMethod]
         public void ColocateWith()
         {
-
+            c_api.TF_ColocateWith(desc_, feed1_);
+            FinishAndVerify(desc_, new string[] { "loc:@feed1" });
         }
 
         [TestMethod]

Original file line number	Diff line number	Diff line change
`@@ -24,23 +24,36 @@ public partial class Graph : IDisposable`
`24`	`24`	`private List<String> _unfetchable_ops = new List<string>();`
`25`	`25`
`26`	`26`	`private string _name_stack;`
	`27`	`+ public Status Status { get; }`
`27`	`28`
`28`	`29`	`public Graph()`
`29`	`30`	`{`
`30`	`31`	`_handle = c_api.TF_NewGraph();`
	`32`	`+ Status = new Status();`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`public Graph(IntPtr graph)`
`34`	`36`	`{`
`35`	`37`	`_handle = graph;`
	`38`	`+ Status = new Status();`
`36`	`39`	`_nodes_by_id = new Dictionary<int, Operation>();`
`37`	`40`	`_nodes_by_name = new Dictionary<string, Operation>();`
`38`	`41`	`_names_in_use = new Dictionary<string, int>();`
`39`	`42`	`}`
`40`	`43`
`41`		`- public OperationDescription NewOperation(string opType, string opName)`
	`44`	`+ public Operation NewOperation(string opType, string opName, Tensor t)`
`42`	`45`	`{`
`43`		`- return c_api.TF_NewOperation(_handle, opType, opName);`
	`46`	`+ var desc = c_api.TF_NewOperation(_handle, opType, opName);`
	`47`	`+`
	`48`	`+ c_api.TF_SetAttrTensor(desc, "value", t, Status);`
	`49`	`+ Status.Check();`
	`50`	`+`
	`51`	`+ c_api.TF_SetAttrType(desc, "dtype", t.dtype);`
	`52`	`+`
	`53`	`+ var op = c_api.TF_FinishOperation(desc, Status);`
	`54`	`+ Status.Check();`
	`55`	`+`
	`56`	`+ return op;`
`44`	`57`	`}`
`45`	`58`
`46`	`59`	`public T as_graph_element<T>(T obj, bool allow_tensor = true, bool allow_operation = true)`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,9 @@ private unsafe object[] _call_tf_sessionrun(KeyValuePair<TF_Output, Tensor>[] fe`
`119`	`119`	`.Select(x => (object)(float)x)`
`120`	`120`	`.ToArray();`
`121`	`121`
	`122`	`+ var op = new Operation(fetch_list[0].oper);`
	`123`	`+ //var metadata = c_api.TF_OperationGetAttrMetadata(fetch_list[0].oper, "dtype", status);`
	`124`	`+`
`122`	`125`	`return result;`
`123`	`126`	`}`
`124`	`127`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,19 @@ namespace Tensorflow`
`7`	`7`	`public class Session : BaseSession`
`8`	`8`	`{`
`9`	`9`	`private IntPtr _handle;`
	`10`	`+ public Status Status { get; }`
	`11`	`+ public SessionOptions Options { get; }`
`10`	`12`
`11`	`13`	`public Session(string target = "", Graph graph = null)`
`12`	`14`	`{`
	`15`	`+ Status = new Status();`
	`16`	`+ if(graph == null)`
	`17`	`+ {`
	`18`	`+ graph = tf.get_default_graph();`
	`19`	`+ }`
	`20`	`+ Options = new SessionOptions();`
	`21`	`+ _handle = c_api.TF_NewSession(graph, Options, Status);`
	`22`	`+ Status.Check();`
`13`	`23`	`}`
`14`	`24`
`15`	`25`	`public Session(IntPtr handle)`
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,15 @@ public void SetStatus(TF_Code code, string msg)`
`36`	`36`	`/// Check status`
`37`	`37`	`/// Throw exception with error message if code != TF_OK`
`38`	`38`	`/// </summary>`
`39`		`- public void Check()`
	`39`	`+ public void Check(bool throwException = false)`
`40`	`40`	`{`
`41`	`41`	`if(Code != TF_Code.TF_OK)`
`42`	`42`	`{`
`43`	`43`	`Console.WriteLine(Message);`
`44`		`- // throw new Exception(Message);`
	`44`	`+ if (throwException)`
	`45`	`+ {`
	`46`	`+ throw new Exception(Message);`
	`47`	`+ }`
`45`	`48`	`}`
`46`	`49`	`}`
`47`	`50`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ namespace Tensorflow`
`7`	`7`	`{`
`8`	`8`	`public static partial class tf`
`9`	`9`	`{`
`10`		`- public static Tensor constant(NDArray value, string name = "Const", bool verify_shape = false)`
	`10`	`+ public static Tensor constant(NDArray nd, string name = "Const", bool verify_shape = false)`
`11`	`11`	`{`
`12`		`- return constant_op.Create(value, name, verify_shape);`
	`12`	`+ return constant_op.Create(nd, name, verify_shape);`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ of the Constant op.*/`
`24`	`24`	`var sess = tf.Session();`
`25`	`25`
`26`	`26`	`// Run the op`
`27`		`- sess.run(hello);`
	`27`	`+ Console.WriteLine(sess.run(hello));`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@ static void Main(string[] args)`
`23`	`23`	`Console.ReadLine();`
`24`	`24`	`}`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ Console.ReadLine();`
`26`	`28`	`}`
`27`	`29`	`}`
`28`	`30`	`}`