init session.run

Oceania2018 · Oceania2018 · commit 8adb34df652d · 2018-12-14T15:49:43.000-06:00
diff --git a/src/TensorFlowNET.Core/BaseSession.cs b/src/TensorFlowNET.Core/BaseSession.cs
@@ -0,0 +1,40 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TensorFlowNET.Core
+{
+    public class BaseSession
+    {
+        private Graph _graph;
+        private bool _opened;
+        private bool _closed;
+        private int _current_version;
+        private byte[] _target;
+        private IntPtr _session;
+
+        public BaseSession(string target = "", Graph graph = null)
+        {
+            if(graph is null)
+            {
+                _graph = ops.get_default_graph();
+            }
+            else
+            {
+                _graph = graph;
+            }
+
+            _target = UTF8Encoding.UTF8.GetBytes(target);
+            var opts = c_api.TF_NewSessionOptions();
+            var status = new Status();
+            _session = c_api.TF_NewSession(_graph.Handle, opts, status.Handle);
+
+            c_api.TF_DeleteSessionOptions(opts);
+        }
+
+        public virtual byte[] run(Tensor fetches)
+        {
+            return null;
+        }
+    }
+}
diff --git a/src/TensorFlowNET.Core/Graph.cs b/src/TensorFlowNET.Core/Graph.cs
@@ -16,7 +16,8 @@ namespace TensorFlowNET.Core
     /// </summary>
     public class Graph
     {
-        public IntPtr handle;
+        private IntPtr _c_graph;
+        public IntPtr Handle => _c_graph;
         private Dictionary<int, Operation> _nodes_by_id;
         private Dictionary<string, Operation> _nodes_by_name;
         private Dictionary<string, int> _names_in_use;
@@ -25,7 +26,7 @@ public class Graph
 
         public Graph(IntPtr graph)
         {
-            this.handle = graph;
+            this._c_graph = graph;
             _nodes_by_id = new Dictionary<int, Operation>();
             _nodes_by_name = new Dictionary<string, Operation>();
             _names_in_use = new Dictionary<string, int>();
diff --git a/src/TensorFlowNET.Core/Session.cs b/src/TensorFlowNET.Core/Session.cs
@@ -4,7 +4,13 @@
 
 namespace TensorFlowNET.Core
 {
-    public class Session
+    public class Session : BaseSession
     {
+        public override byte[] run(Tensor fetches)
+        {
+            var ret = base.run(fetches);
+
+            return ret;
+        }
     }
 }
diff --git a/src/TensorFlowNET.Core/c_api.cs b/src/TensorFlowNET.Core/c_api.cs
@@ -9,6 +9,8 @@
 using TF_Operation = System.IntPtr;
 using TF_Status = System.IntPtr;
 using TF_Tensor = System.IntPtr;
+using TF_Session = System.IntPtr;
+using TF_SessionOptions = System.IntPtr;
 
 using TF_DataType = Tensorflow.DataType;
 using Tensorflow;
@@ -20,6 +22,9 @@ public static class c_api
     {
         public const string TensorFlowLibName = "tensorflow";
 
+        [DllImport(TensorFlowLibName)]
+        public static unsafe extern void TF_DeleteSessionOptions(TF_SessionOptions opts);
+
         [DllImport(TensorFlowLibName)]
         public static unsafe extern TF_Operation TF_FinishOperation(TF_OperationDescription desc, TF_Status status);
 
@@ -53,6 +58,12 @@ public static class c_api
         [DllImport(TensorFlowLibName)]
         public static extern unsafe void TF_SetAttrType(TF_OperationDescription desc, string attr_name, TF_DataType value);
 
+        [DllImport(TensorFlowLibName)]
+        public static extern TF_Session TF_NewSession(TF_Graph graph, TF_SessionOptions opts, TF_Status status);
+
+        [DllImport(TensorFlowLibName)]
+        public static extern TF_SessionOptions TF_NewSessionOptions();
+
         [DllImport(TensorFlowLibName)]
         public static unsafe extern IntPtr TF_Version();
     }
diff --git a/src/TensorFlowNET.Core/ops.cs b/src/TensorFlowNET.Core/ops.cs
@@ -20,7 +20,7 @@ public static Graph get_default_graph()
 
         public static unsafe IntPtr _create_c_op(Graph graph, NodeDef node_def, object inputs)
         {
-            var op_desc = c_api.TF_NewOperation(graph.handle, node_def.Op, node_def.Name);
+            var op_desc = c_api.TF_NewOperation(graph.Handle, node_def.Op, node_def.Name);
             var status = new Status();
 
             foreach (var attr in node_def.Attr)
diff --git a/test/TensorFlowNET.Examples/HelloWorld.cs b/test/TensorFlowNET.Examples/HelloWorld.cs
@@ -22,6 +22,9 @@ of the Constant op.*/
 
             // Start tf session
             var sess = tf.Session();
+
+            // Run the op
+            sess.run(hello);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,13 @@`
`4`	`4`
`5`	`5`	`namespace TensorFlowNET.Core`
`6`	`6`	`{`
`7`		`- public class Session`
	`7`	`+ public class Session : BaseSession`
`8`	`8`	`{`
	`9`	`+ public override byte[] run(Tensor fetches)`
	`10`	`+ {`
	`11`	`+ var ret = base.run(fetches);`
	`12`	`+`
	`13`	`+ return ret;`
	`14`	`+ }`
`9`	`15`	`}`
`10`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static Graph get_default_graph()`
`20`	`20`
`21`	`21`	`public static unsafe IntPtr _create_c_op(Graph graph, NodeDef node_def, object inputs)`
`22`	`22`	`{`
`23`		`- var op_desc = c_api.TF_NewOperation(graph.handle, node_def.Op, node_def.Name);`
	`23`	`+ var op_desc = c_api.TF_NewOperation(graph.Handle, node_def.Op, node_def.Name);`
`24`	`24`	`var status = new Status();`
`25`	`25`
`26`	`26`	`foreach (var attr in node_def.Attr)`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ of the Constant op.*/`
`22`	`22`
`23`	`23`	`// Start tf session`
`24`	`24`	`var sess = tf.Session();`
	`25`	`+`
	`26`	`+ // Run the op`
	`27`	`+ sess.run(hello);`
`25`	`28`	`}`
`26`	`29`	`}`
`27`	`30`	`}`