restructure dir and namespace

src/TensorFlowNET.Core/BaseSession.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Tensorflow;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class BaseSession
     {

src/TensorFlowNET.Core/Buffer.cs

@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
-using Tensorflow;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class Buffer
     {

src/TensorFlowNET.Core/Eager/Context.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TensorFlowNET.Core.Eager
+namespace Tensorflow.Eager
 {
     public class Context
     {

src/TensorFlowNET.Core/Graph.cs

@@ -3,10 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using Tensorflow;
 using TF_DataType = Tensorflow.DataType;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     /// <summary>
     /// TensorFlow uses a dataflow graph to represent your computation in terms of the dependencies between individual operations. 

src/TensorFlowNET.Core/MonoPInvokeCallbackAttribute.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public sealed class MonoPInvokeCallbackAttribute : Attribute
     {

src/TensorFlowNET.Core/OpDefLibrary.cs

@@ -3,10 +3,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
-using Tensorflow;
 using static Tensorflow.OpDef.Types;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class OpDefLibrary
     {
@@ -39,7 +38,9 @@ namespace TensorFlowNET.Core
                 name = op_type_name;
             }
 
-            foreach(var attr_def in op_def.Attr)
+            string scope = g.unique_name(name) + "/";
+
+            foreach (var attr_def in op_def.Attr)
             {
                 if (attr_def.Type != "type") continue;
                 var key = attr_def.Name;
@@ -84,7 +85,7 @@ namespace TensorFlowNET.Core
             }
 
             var op = g.create_op(op_type_name, null, output_types.ToArray(),
-                name: "Placeholder_1/",
+                name: scope,
                 input_types: new DataType[] { },
                 attrs: attr_protos,
                 op_def: op_def);

src/TensorFlowNET.Core/Operation.cs

@@ -1,10 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Tensorflow;
 using TF_DataType = Tensorflow.DataType;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class Operation
     {

src/TensorFlowNET.Core/Session.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class Session : BaseSession
     {

src/TensorFlowNET.Core/Status.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Tensorflow;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class Status
     {

src/TensorFlowNET.Core/Tensor.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Tensorflow;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class Tensor
     {

src/TensorFlowNET.Core/TensorFlowNET.Core.csproj

@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>TensorFlow.NET</AssemblyName>
+    <RootNamespace>Tensorflow</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

src/TensorFlowNET.Core/TensorShape.cs

@@ -3,10 +3,8 @@ using NumSharp.Core;
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Tensorflow;
-using tensor_shape_pb2 = Tensorflow;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class TensorShape : Shape
     {

src/TensorFlowNET.Core/Tensorflow/TF_Graph.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace Tensorflow
-{
-    [StructLayout(LayoutKind.Sequential)]
-    public struct TF_Graph
-    {
-
-    }
-}

src/TensorFlowNET.Core/c_api.cs

@@ -12,10 +12,8 @@ using TF_Session = System.IntPtr;
 using TF_SessionOptions = System.IntPtr;
 
 using TF_DataType = Tensorflow.DataType;
-using Tensorflow;
-using static TensorFlowNET.Core.tf;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public static class c_api
     {
@@ -40,7 +38,7 @@ namespace TensorFlowNET.Core
         public static extern unsafe string TF_Message(TF_Status s);
 
         [DllImport(TensorFlowLibName)]
-        public static unsafe extern IntPtr TF_NewGraph();
+        public static unsafe extern TF_Graph TF_NewGraph();
 
         [DllImport(TensorFlowLibName)]
         public static unsafe extern TF_OperationDescription TF_NewOperation(TF_Graph graph, string opType, string oper_name);
@@ -49,7 +47,7 @@ namespace TensorFlowNET.Core
         public static unsafe extern TF_Status TF_NewStatus();
 
         [DllImport(TensorFlowLibName)]
-        public static extern unsafe TF_Tensor TF_NewTensor(TF_DataType dataType, Int64 dims, int num_dims, IntPtr data, size_t len, Deallocator deallocator, IntPtr deallocator_arg);
+        public static extern unsafe TF_Tensor TF_NewTensor(TF_DataType dataType, Int64 dims, int num_dims, IntPtr data, size_t len, tf.Deallocator deallocator, IntPtr deallocator_arg);
 
         [DllImport(TensorFlowLibName)]
         public static extern unsafe int TF_OperationNumOutputs(TF_Operation oper);

src/TensorFlowNET.Core/ops.cs

@@ -4,11 +4,10 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using Tensorflow;
-using tf = TensorFlowNET.Core.tf;
 using node_def_pb2 = Tensorflow;
 using Google.Protobuf;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public static class ops
     {

src/TensorFlowNET.Core/gen_array_ops.cs → src/TensorFlowNET.Core/ops/gen_array_ops.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Text;
 using Tensorflow;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public static class gen_array_ops
     {
@@ -20,7 +20,8 @@ namespace TensorFlowNET.Core
             _attrs["dtype"] = _op.get_attr("dtype");
             _attrs["shape"] = _op.get_attr("shape");
 
-            return null;
+            var tensor = new Tensor(_op, 0, dtype);
+            return tensor;
         }
 
         private static OpDefLibrary _InitOpDefLibrary()

src/TensorFlowNET.Core/ops/gen_math_ops.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tensorflow
+{
+    public static class gen_math_ops
+    {
+        public static Tensor add(Tensor a, Tensor b, string name = "")
+        {
+
+            return null;
+        }
+    }
+}

src/TensorFlowNET.Core/tensor_util.cs

@@ -2,10 +2,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Tensorflow;
 using tensor_pb2 = Tensorflow;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public static class tensor_util
     {
@@ -13,7 +12,7 @@ namespace TensorFlowNET.Core
         {
             NDArray nparray;
             TensorProto tensor_proto = null;
-            TensorShape tensor_shape = new TensorShape();
+            TensorShape tensor_shape = new TensorShape(0);
 
             switch (values)
             {

src/TensorFlowNET.Core/tf.cs

@@ -4,10 +4,9 @@ using System.Runtime.InteropServices;
 using System.Text;
 using TF_DataType = Tensorflow.DataType;
 using attr_value_pb2 = Tensorflow;
-using Tensorflow;
-using TensorFlowNET.Core.Eager;
+using Tensorflow.Eager;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public static class tf
     {
@@ -26,12 +25,14 @@ namespace TensorFlowNET.Core
 
         public static unsafe Tensor placeholder(DataType dtype, TensorShape shape = null)
         {
-            var g = ops.get_default_graph();
+            /*var g = ops.get_default_graph();
             var op = new Operation(g, "Placeholder", "feed");
 
             var tensor = new Tensor(op, 0, dtype);
-            //return gen_array_ops.placeholder(dtype, shape);
-            return tensor;
+            
+            return tensor;*/
+
+            return gen_array_ops.placeholder(dtype, shape);
         }
 
         public static unsafe Tensor constant(object value)

test/TensorFlowNET.Examples/HelloWorld.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using tf = TensorFlowNET.Core.tf;
+using Tensorflow;
 
 namespace TensorFlowNET.Examples
 {

test/TensorFlowNET.UnitTest/GraphTest.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using TensorFlowNET.Core;
+using Tensorflow;
 
 namespace TensorFlowNET.UnitTest
 {

test/TensorFlowNET.UnitTest/OperationsTest.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using TensorFlowNET.Core;
+using Tensorflow;
 
 namespace TensorFlowNET.UnitTest
 {

test/TensorFlowNET.UnitTest/VersionTest.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using TensorFlowNET.Core;
+using Tensorflow;
 
 namespace TensorFlowNET.UnitTest
 {
@@ -13,7 +13,7 @@ namespace TensorFlowNET.UnitTest
         public void GetVersion()
         {
             var ver = tf.VERSION;
-            Assert.IsTrue(ver.Contains("."));
+            Assert.IsTrue(ver.StartsWith("1."));
         }
     }
 }