TF_Status holds error information.

Oceania2018 · Oceania2018 · commit e784618327e2 · 2018-12-24T22:50:36.000-06:00
diff --git a/src/TensorFlowNET.Core/Status.cs b/src/TensorFlowNET.Core/Status.cs
@@ -4,9 +4,9 @@
 
 namespace Tensorflow
 {
-    public class Status
+    public class Status : IDisposable
     {
-        private IntPtr _handle;
+        private readonly IntPtr _handle;
         public IntPtr Handle => _handle;
 
         /// <summary>
@@ -23,5 +23,15 @@ public Status()
         {
             _handle = c_api.TF_NewStatus();
         }
+
+        public void SetStatus(TF_Code code, string msg)
+        {
+            c_api.TF_SetStatus(_handle, code, msg);
+        }
+
+        public void Dispose()
+        {
+            c_api.TF_DeleteStatus(_handle);
+        }
     }
 }
diff --git a/src/TensorFlowNET.Core/c_api.cs b/src/TensorFlowNET.Core/c_api.cs
@@ -28,6 +28,13 @@ public static class c_api
         [DllImport(TensorFlowLibName)]
         public static unsafe extern void TF_DeleteSessionOptions(IntPtr opts);
 
+        /// <summary>
+        /// Delete a previously created status object.
+        /// </summary>
+        /// <param name="s"></param>
+        [DllImport(TensorFlowLibName)]
+        public static unsafe extern void TF_DeleteStatus(IntPtr s);
+
         /// <summary>
         /// Destroy a tensor.
         /// </summary>
@@ -59,6 +66,10 @@ public static class c_api
         [DllImport(TensorFlowLibName)]
         public static unsafe extern TF_OperationDescription TF_NewOperation(IntPtr graph, string opType, string oper_name);
 
+        /// <summary>
+        /// Return a new status object.
+        /// </summary>
+        /// <returns></returns>
         [DllImport(TensorFlowLibName)]
         public static unsafe extern IntPtr TF_NewStatus();
 
@@ -121,6 +132,9 @@ public static extern unsafe void TF_SessionRun(IntPtr session, IntPtr run_option
         [DllImport(TensorFlowLibName)]
         public static extern unsafe void TF_SetAttrType(TF_OperationDescription desc, string attr_name, TF_DataType value);
 
+        [DllImport(TensorFlowLibName)]
+        public static extern void TF_SetStatus(IntPtr s, TF_Code code, string msg);
+
         /// <summary>
         /// Return the size of the underlying data in bytes.
         /// </summary>
diff --git a/test/TensorFlowNET.UnitTest/OperationsTest.cs b/test/TensorFlowNET.UnitTest/OperationsTest.cs
@@ -34,7 +34,7 @@ public void addInPlaceholder()
                 feed_dict.Add(a, 3.0f);
                 feed_dict.Add(b, 2.0f);
 
-                //var o = sess.run(c, feed_dict);
+                var o = sess.run(c, feed_dict);
             }
         }
 
diff --git a/test/TensorFlowNET.UnitTest/StatusTest.cs b/test/TensorFlowNET.UnitTest/StatusTest.cs
@@ -0,0 +1,36 @@
+﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Tensorflow;
+
+namespace TensorFlowNET.UnitTest
+{
+    [TestClass]
+    public class StatusTest
+    {
+        [TestMethod]
+        public void NewStatus()
+        {
+            var s = new Status();
+            Assert.AreEqual(s.Code, TF_Code.TF_OK);
+            Assert.AreEqual(s.Message, String.Empty);
+        }
+
+        [TestMethod]
+        public void SetStatus()
+        {
+            var s = new Status();
+            s.SetStatus(TF_Code.TF_CANCELLED, "cancel");
+            Assert.AreEqual(s.Code, TF_Code.TF_CANCELLED);
+            // Assert.AreEqual(s.Message, "cancel");
+        }
+
+        [TestMethod]
+        public void DeleteStatus()
+        {
+            var s = new Status();
+            s.Dispose();
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace Tensorflow`
`6`	`6`	`{`
`7`		`- public class Status`
	`7`	`+ public class Status : IDisposable`
`8`	`8`	`{`
`9`		`- private IntPtr _handle;`
	`9`	`+ private readonly IntPtr _handle;`
`10`	`10`	`public IntPtr Handle => _handle;`
`11`	`11`
`12`	`12`	`/// <summary>`
`@@ -23,5 +23,15 @@ public Status()`
`23`	`23`	`{`
`24`	`24`	`_handle = c_api.TF_NewStatus();`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ public void SetStatus(TF_Code code, string msg)`
	`28`	`+ {`
	`29`	`+ c_api.TF_SetStatus(_handle, code, msg);`
	`30`	`+ }`
	`31`	`+`
	`32`	`+ public void Dispose()`
	`33`	`+ {`
	`34`	`+ c_api.TF_DeleteStatus(_handle);`
	`35`	`+ }`
`26`	`36`	`}`
`27`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void addInPlaceholder()`
`34`	`34`	`feed_dict.Add(a, 3.0f);`
`35`	`35`	`feed_dict.Add(b, 2.0f);`
`36`	`36`
`37`		`- //var o = sess.run(c, feed_dict);`
	`37`	`+ var o = sess.run(c, feed_dict);`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`