Merge branch 'master' of github.com:Wanglongzhi2001/TensorFlow.NET into dev1

Author: Wanglongzhi2001

TensorFlow.NET.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31624.102
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tensorflow.Binding", "src\TensorFlowNET.Core\Tensorflow.Binding.csproj", "{FD682AC0-7B2D-45D3-8B0D-C6D678B04144}"
 EndProject

src/TensorFlowNET.Core/APIs/c_api.customize.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Tensorflow
+{
+    public partial class c_api
+    {
+        [DllImport(TensorFlowLibName)]
+        public static extern void TFC_SetAttr(SafeGraphHandle graph, IntPtr op, string attr_name, SafeBufferHandle attr_value_proto, SafeStatusHandle status);
+        [DllImport(TensorFlowLibName)]
+        public static extern IntPtr TFC_GetHandleShapeAndType(SafeGraphHandle c_graph, TF_Output output);
+        [DllImport(TensorFlowLibName)]
+        public static extern void TFC_SetHandleShapeAndType(SafeGraphHandle c_graph, TF_Output output, byte[] data, long proto_len, SafeStatusHandle status);
+    }
+}

src/TensorFlowNET.Core/APIs/tf.compat.cs

@@ -14,6 +14,7 @@ You may obtain a copy of the License at
    limitations under the License.
 ******************************************************************************/
 
+using Google.Protobuf;
 using System.Text;
 
 namespace Tensorflow
@@ -45,6 +46,23 @@ internal string as_str(byte[] bytes_or_text, Encoding? encoding = null)
             {
                 return as_text(bytes_or_text, encoding);
             }
+
+            public ByteString as_bytes(ByteString bytes, Encoding encoding = null)
+            {
+                return bytes;
+            }
+            public ByteString as_bytes(byte[] bytes, Encoding encoding = null)
+            {
+                return ByteString.CopyFrom(bytes);
+            }
+            public ByteString as_bytes(string text, Encoding encoding = null)
+            {
+                if(encoding is null)
+                {
+                    encoding = Encoding.UTF8;
+                }
+                return ByteString.CopyFrom(encoding.GetBytes(text));
+            }
         }
 
         public bool executing_eagerly()

src/TensorFlowNET.Core/APIs/tf.io.cs

@@ -54,6 +54,6 @@ public ITensorOrOperation[] import_graph_def(GraphDef graph_def,
             Dictionary<string, Tensor> input_map = null,
             string[] return_elements = null,
             string name = null,
-            OpList producer_op_list = null) => importer.import_graph_def(graph_def, input_map, return_elements, name, producer_op_list);
+            OpList producer_op_list = null) => importer.import_graph_def(graph_def, input_map, return_elements, name: name, producer_op_list: producer_op_list);
     }
 }

src/TensorFlowNET.Core/APIs/tf.tensor.cs

@@ -14,6 +14,8 @@ You may obtain a copy of the License at
    limitations under the License.
 ******************************************************************************/
 
+using Tensorflow.Operations;
+
 namespace Tensorflow
 {
     public partial class tensorflow
@@ -79,5 +81,10 @@ public Tensor[] split(Tensor value, int num_split, int axis, string name = null)
                 num_split: num_split,
                 axis: axis,
                 name: name);
+
+        public Tensor ensure_shape(Tensor x, Shape shape, string name = null)
+        {
+            return gen_ops.ensure_shape(x, shape, name);
+        }
     }
 }

src/TensorFlowNET.Core/Attributes/c_api.ops.cs

@@ -61,7 +61,7 @@ public partial class c_api
         public static extern void TF_SetAttrBool(IntPtr desc, string attr_name, bool value);
 
         [DllImport(TensorFlowLibName)]
-        public static extern void TF_SetAttrValueProto(IntPtr desc, string attr_name, byte[] proto, int proto_len, SafeStatusHandle status);
+        public static extern void TF_SetAttrValueProto(IntPtr desc, string attr_name, byte[] proto, ulong proto_len, SafeStatusHandle status);
 
         /// <summary>
         /// Set `num_dims` to -1 to represent "unknown rank".

src/TensorFlowNET.Core/Binding.Util.cs

@@ -22,6 +22,7 @@ limitations under the License.
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using Tensorflow.Operations;
 
 namespace Tensorflow
 {

src/TensorFlowNET.Core/Buffers/Buffer.cs

@@ -107,6 +107,12 @@ public unsafe byte[] ToArray()
             }
         }
 
+        public void Release()
+        {
+            _handle.Dispose();
+            _handle = null;
+        }
+
         public override string ToString()
             => $"0x{_handle.DangerousGetHandle():x16}";
 

src/TensorFlowNET.Core/Buffers/TF_Buffer.cs

@@ -25,5 +25,32 @@ public struct TF_Buffer
         public IntPtr data;
         public ulong length;
         public IntPtr data_deallocator;
+
+        public unsafe Span<T> AsSpan<T>() where T: unmanaged
+        {
+            if(length > int.MaxValue)
+            {
+                throw new ValueError($"The length {length} is too large to use in the span.");
+            }
+            return new Span<T>(data.ToPointer(), (int)length);
+        }
+
+        public unsafe byte[] ToByteArray()
+        {
+            byte[] res = new byte[length];
+            if(length > int.MaxValue)
+            {
+                byte* root = (byte*)data;
+                for(ulong i = 0; i < length; i++)
+                {
+                    res[i] = *(root++);
+                }
+            }
+            else
+            {
+                new Span<byte>(data.ToPointer(), (int)length).CopyTo(res.AsSpan());
+            }
+            return res;
+        }
     }
 }

src/TensorFlowNET.Core/Checkpoint/CheckPointUtils.cs

@@ -161,7 +161,7 @@ public static IList<Trackable> list_objects(ObjectGraphView graph_view)
 
     internal static IEnumerable<Trackable> _objects_with_attributes(IEnumerable<Trackable> full_list)
     {
-        return full_list.TakeWhile(x =>
+        return full_list.Where(x =>
         {
             var saveables = x.gather_saveables_for_checkpoint();
             return saveables is not null && saveables.Count > 0;