variable_handle_from_shape_and_dtype

src/TensorFlowNET.Core/Operations/gen_resource_variable_ops.cs

@@ -33,5 +33,27 @@ namespace Tensorflow
 
             return _op;
         }
+
+        /// <summary>
+        /// Creates a handle to a Variable resource.
+        /// </summary>
+        /// <param name="dtype"></param>
+        /// <param name="shape"></param>
+        /// <param name="container"></param>
+        /// <param name="shared_name"></param>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public static Tensor var_handle_op(TF_DataType dtype, TensorShape shape, 
+            string container ="", string shared_name = "", string name = null)
+        {
+            var _op = _op_def_lib._apply_op_helper("VarHandleOp", name, new {
+                dtype,
+                shape,
+                container,
+                shared_name
+            });
+
+            return _op;
+        }
     }
 }

src/TensorFlowNET.Core/Operations/resource_variable_ops.cs

@@ -16,6 +16,7 @@
 
 using System;
 using Tensorflow.Framework;
+using static Tensorflow.CppShapeInferenceResult.Types;
 
 namespace Tensorflow
 {
@@ -91,12 +92,80 @@ namespace Tensorflow
                 shape, dtype, shared_name, name, graph_mode, initial_value);
         }
 
+        /// <summary>
+        /// Create a new variable handle, optionally copying in `extra_handle_data`
+        /// </summary>
+        /// <param name="shape"></param>
+        /// <param name="dtype"></param>
+        /// <param name="shared_name"></param>
+        /// <param name="name"></param>
+        /// <param name="graph_mode"></param>
+        /// <param name="extra_handle_data"></param>
+        /// <returns></returns>
         public static Tensor variable_handle_from_shape_and_dtype(TensorShape shape, TF_DataType dtype, 
             string shared_name, string name, bool graph_mode, Tensor extra_handle_data = null)
         {
+            var container = "";// ops.get_default_graph().container;
+            var handle = gen_resource_variable_ops.var_handle_op(shape: shape,
+                dtype: dtype,
+                shared_name: shared_name,
+                name: name,
+                container: container);
+
+            if (extra_handle_data == null)
+                extra_handle_data = handle;
+
+            if (graph_mode)
+            {
+                var full_handle_data = _combine_handle_data(handle, extra_handle_data);
+                _set_handle_shapes_and_types(handle, full_handle_data, graph_mode);
+                return handle;
+            }
+            else
+            {
+                throw new NotImplementedException("");
+            }
+        }
+
+        private static void _set_handle_shapes_and_types(Tensor handle, HandleData full_handle_data, bool graph_mode)
+        {
+
+        }
+
+        /// <summary>
+        /// Concats HandleData from tensors `handle` and `initial_value`.
+        /// </summary>
+        /// <param name="handle"></param>
+        /// <param name="initial_value"></param>
+        /// <returns></returns>
+        private static HandleData _combine_handle_data(Tensor handle, Tensor initial_value)
+        {
+            var variable_handle_data = get_eager_safe_handle_data(initial_value);
+
+            if (initial_value.dtype != dtypes.variant)
+                return variable_handle_data;
+
             throw new NotImplementedException("");
         }
 
+        private static HandleData get_eager_safe_handle_data(Tensor handle)
+        {
+            if(handle == IntPtr.Zero)
+            {
+                var data = new HandleData();
+                data.ShapeAndType.Add(new HandleShapeAndType
+                {
+                    Shape = handle.TensorShape.as_proto(),
+                    Dtype = handle.dtype.as_datatype_enum()
+                });
+                return data;
+            }
+            else
+            {
+                return HandleData.Parser.ParseFrom(handle.BufferToArray());
+            }
+        }
+
         /// <summary>
         /// Represents a future for a read of a variable.
         /// Pretends to be the tensor if anyone looks.

src/TensorFlowNET.Core/Protobuf/CppShapeInference.cs

@@ -0,0 +1,692 @@
+// <auto-generated>
+//     Generated by the protocol buffer compiler.  DO NOT EDIT!
+//     source: tensorflow/python/framework/cpp_shape_inference.proto
+// </auto-generated>
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tensorflow {
+
+  /// <summary>Holder for reflection information generated from tensorflow/python/framework/cpp_shape_inference.proto</summary>
+  public static partial class CppShapeInferenceReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for tensorflow/python/framework/cpp_shape_inference.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static CppShapeInferenceReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "CjV0ZW5zb3JmbG93L3B5dGhvbi9mcmFtZXdvcmsvY3BwX3NoYXBlX2luZmVy",
+            "ZW5jZS5wcm90bxIKdGVuc29yZmxvdxoldGVuc29yZmxvdy9jb3JlL2ZyYW1l",
+            "d29yay90eXBlcy5wcm90bxosdGVuc29yZmxvdy9jb3JlL2ZyYW1ld29yay90",
+            "ZW5zb3Jfc2hhcGUucHJvdG8i7QIKF0NwcFNoYXBlSW5mZXJlbmNlUmVzdWx0",
+            "EisKBXNoYXBlGAEgASgLMhwudGVuc29yZmxvdy5UZW5zb3JTaGFwZVByb3Rv",
+            "EkMKC2hhbmRsZV9kYXRhGAQgASgLMi4udGVuc29yZmxvdy5DcHBTaGFwZUlu",
+            "ZmVyZW5jZVJlc3VsdC5IYW5kbGVEYXRhGmYKEkhhbmRsZVNoYXBlQW5kVHlw",
+            "ZRIrCgVzaGFwZRgBIAEoCzIcLnRlbnNvcmZsb3cuVGVuc29yU2hhcGVQcm90",
+            "bxIjCgVkdHlwZRgCIAEoDjIULnRlbnNvcmZsb3cuRGF0YVR5cGUabAoKSGFu",
+            "ZGxlRGF0YRIOCgZpc19zZXQYASABKAgSTgoOc2hhcGVfYW5kX3R5cGUYAiAD",
+            "KAsyNi50ZW5zb3JmbG93LkNwcFNoYXBlSW5mZXJlbmNlUmVzdWx0LkhhbmRs",
+            "ZVNoYXBlQW5kVHlwZUoECAIQA0oECAMQBCJlCh1DcHBTaGFwZUluZmVyZW5j",
+            "ZUlucHV0c05lZWRlZBIcChRpbnB1dF90ZW5zb3JzX25lZWRlZBgBIAMoBRIm",
+            "Ch5pbnB1dF90ZW5zb3JzX2FzX3NoYXBlc19uZWVkZWQYAiADKAVCA/gBAWIG",
+            "cHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { global::Tensorflow.TypesReflection.Descriptor, global::Tensorflow.TensorShapeReflection.Descriptor, },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tensorflow.CppShapeInferenceResult), global::Tensorflow.CppShapeInferenceResult.Parser, new[]{ "Shape", "HandleData" }, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Tensorflow.CppShapeInferenceResult.Types.HandleShapeAndType), global::Tensorflow.CppShapeInferenceResult.Types.HandleShapeAndType.Parser, new[]{ "Shape", "Dtype" }, null, null, null),
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tensorflow.CppShapeInferenceResult.Types.HandleData), global::Tensorflow.CppShapeInferenceResult.Types.HandleData.Parser, new[]{ "IsSet", "ShapeAndType" }, null, null, null)}),
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tensorflow.CppShapeInferenceInputsNeeded), global::Tensorflow.CppShapeInferenceInputsNeeded.Parser, new[]{ "InputTensorsNeeded", "InputTensorsAsShapesNeeded" }, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class CppShapeInferenceResult : pb::IMessage<CppShapeInferenceResult> {
+    private static readonly pb::MessageParser<CppShapeInferenceResult> _parser = new pb::MessageParser<CppShapeInferenceResult>(() => new CppShapeInferenceResult());
+    private pb::UnknownFieldSet _unknownFields;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<CppShapeInferenceResult> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tensorflow.CppShapeInferenceReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public CppShapeInferenceResult() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public CppShapeInferenceResult(CppShapeInferenceResult other) : this() {
+      shape_ = other.shape_ != null ? other.shape_.Clone() : null;
+      handleData_ = other.handleData_ != null ? other.handleData_.Clone() : null;
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public CppShapeInferenceResult Clone() {
+      return new CppShapeInferenceResult(this);
+    }
+
+    /// <summary>Field number for the "shape" field.</summary>
+    public const int ShapeFieldNumber = 1;
+    private global::Tensorflow.TensorShapeProto shape_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tensorflow.TensorShapeProto Shape {
+      get { return shape_; }
+      set {
+        shape_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "handle_data" field.</summary>
+    public const int HandleDataFieldNumber = 4;
+    private global::Tensorflow.CppShapeInferenceResult.Types.HandleData handleData_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tensorflow.CppShapeInferenceResult.Types.HandleData HandleData {
+      get { return handleData_; }
+      set {
+        handleData_ = value;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as CppShapeInferenceResult);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(CppShapeInferenceResult other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (!object.Equals(Shape, other.Shape)) return false;
+      if (!object.Equals(HandleData, other.HandleData)) return false;
+      return Equals(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (shape_ != null) hash ^= Shape.GetHashCode();
+      if (handleData_ != null) hash ^= HandleData.GetHashCode();
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void WriteTo(pb::CodedOutputStream output) {
+      if (shape_ != null) {
+        output.WriteRawTag(10);
+        output.WriteMessage(Shape);
+      }
+      if (handleData_ != null) {
+        output.WriteRawTag(34);
+        output.WriteMessage(HandleData);
+      }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      if (shape_ != null) {
+        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Shape);
+      }
+      if (handleData_ != null) {
+        size += 1 + pb::CodedOutputStream.ComputeMessageSize(HandleData);
+      }
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(CppShapeInferenceResult other) {
+      if (other == null) {
+        return;
+      }
+      if (other.shape_ != null) {
+        if (shape_ == null) {
+          shape_ = new global::Tensorflow.TensorShapeProto();
+        }
+        Shape.MergeFrom(other.Shape);
+      }
+      if (other.handleData_ != null) {
+        if (handleData_ == null) {
+          handleData_ = new global::Tensorflow.CppShapeInferenceResult.Types.HandleData();
+        }
+        HandleData.MergeFrom(other.HandleData);
+      }
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+            break;
+          case 10: {
+            if (shape_ == null) {
+              shape_ = new global::Tensorflow.TensorShapeProto();
+            }
+            input.ReadMessage(shape_);
+            break;
+          }
+          case 34: {
+            if (handleData_ == null) {
+              handleData_ = new global::Tensorflow.CppShapeInferenceResult.Types.HandleData();
+            }
+            input.ReadMessage(handleData_);
+            break;
+          }
+        }
+      }
+    }
+
+    #region Nested types
+    /// <summary>Container for nested types declared in the CppShapeInferenceResult message type.</summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static partial class Types {
+      public sealed partial class HandleShapeAndType : pb::IMessage<HandleShapeAndType> {
+        private static readonly pb::MessageParser<HandleShapeAndType> _parser = new pb::MessageParser<HandleShapeAndType>(() => new HandleShapeAndType());
+        private pb::UnknownFieldSet _unknownFields;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public static pb::MessageParser<HandleShapeAndType> Parser { get { return _parser; } }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public static pbr::MessageDescriptor Descriptor {
+          get { return global::Tensorflow.CppShapeInferenceResult.Descriptor.NestedTypes[0]; }
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        pbr::MessageDescriptor pb::IMessage.Descriptor {
+          get { return Descriptor; }
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public HandleShapeAndType() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public HandleShapeAndType(HandleShapeAndType other) : this() {
+          shape_ = other.shape_ != null ? other.shape_.Clone() : null;
+          dtype_ = other.dtype_;
+          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public HandleShapeAndType Clone() {
+          return new HandleShapeAndType(this);
+        }
+
+        /// <summary>Field number for the "shape" field.</summary>
+        public const int ShapeFieldNumber = 1;
+        private global::Tensorflow.TensorShapeProto shape_;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public global::Tensorflow.TensorShapeProto Shape {
+          get { return shape_; }
+          set {
+            shape_ = value;
+          }
+        }
+
+        /// <summary>Field number for the "dtype" field.</summary>
+        public const int DtypeFieldNumber = 2;
+        private global::Tensorflow.DataType dtype_ = 0;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public global::Tensorflow.DataType Dtype {
+          get { return dtype_; }
+          set {
+            dtype_ = value;
+          }
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public override bool Equals(object other) {
+          return Equals(other as HandleShapeAndType);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public bool Equals(HandleShapeAndType other) {
+          if (ReferenceEquals(other, null)) {
+            return false;
+          }
+          if (ReferenceEquals(other, this)) {
+            return true;
+          }
+          if (!object.Equals(Shape, other.Shape)) return false;
+          if (Dtype != other.Dtype) return false;
+          return Equals(_unknownFields, other._unknownFields);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public override int GetHashCode() {
+          int hash = 1;
+          if (shape_ != null) hash ^= Shape.GetHashCode();
+          if (Dtype != 0) hash ^= Dtype.GetHashCode();
+          if (_unknownFields != null) {
+            hash ^= _unknownFields.GetHashCode();
+          }
+          return hash;
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public override string ToString() {
+          return pb::JsonFormatter.ToDiagnosticString(this);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public void WriteTo(pb::CodedOutputStream output) {
+          if (shape_ != null) {
+            output.WriteRawTag(10);
+            output.WriteMessage(Shape);
+          }
+          if (Dtype != 0) {
+            output.WriteRawTag(16);
+            output.WriteEnum((int) Dtype);
+          }
+          if (_unknownFields != null) {
+            _unknownFields.WriteTo(output);
+          }
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public int CalculateSize() {
+          int size = 0;
+          if (shape_ != null) {
+            size += 1 + pb::CodedOutputStream.ComputeMessageSize(Shape);
+          }
+          if (Dtype != 0) {
+            size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Dtype);
+          }
+          if (_unknownFields != null) {
+            size += _unknownFields.CalculateSize();
+          }
+          return size;
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public void MergeFrom(HandleShapeAndType other) {
+          if (other == null) {
+            return;
+          }
+          if (other.shape_ != null) {
+            if (shape_ == null) {
+              shape_ = new global::Tensorflow.TensorShapeProto();
+            }
+            Shape.MergeFrom(other.Shape);
+          }
+          if (other.Dtype != 0) {
+            Dtype = other.Dtype;
+          }
+          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public void MergeFrom(pb::CodedInputStream input) {
+          uint tag;
+          while ((tag = input.ReadTag()) != 0) {
+            switch(tag) {
+              default:
+                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+                break;
+              case 10: {
+                if (shape_ == null) {
+                  shape_ = new global::Tensorflow.TensorShapeProto();
+                }
+                input.ReadMessage(shape_);
+                break;
+              }
+              case 16: {
+                dtype_ = (global::Tensorflow.DataType) input.ReadEnum();
+                break;
+              }
+            }
+          }
+        }
+
+      }
+
+      public sealed partial class HandleData : pb::IMessage<HandleData> {
+        private static readonly pb::MessageParser<HandleData> _parser = new pb::MessageParser<HandleData>(() => new HandleData());
+        private pb::UnknownFieldSet _unknownFields;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public static pb::MessageParser<HandleData> Parser { get { return _parser; } }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public static pbr::MessageDescriptor Descriptor {
+          get { return global::Tensorflow.CppShapeInferenceResult.Descriptor.NestedTypes[1]; }
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        pbr::MessageDescriptor pb::IMessage.Descriptor {
+          get { return Descriptor; }
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public HandleData() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public HandleData(HandleData other) : this() {
+          isSet_ = other.isSet_;
+          shapeAndType_ = other.shapeAndType_.Clone();
+          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public HandleData Clone() {
+          return new HandleData(this);
+        }
+
+        /// <summary>Field number for the "is_set" field.</summary>
+        public const int IsSetFieldNumber = 1;
+        private bool isSet_;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public bool IsSet {
+          get { return isSet_; }
+          set {
+            isSet_ = value;
+          }
+        }
+
+        /// <summary>Field number for the "shape_and_type" field.</summary>
+        public const int ShapeAndTypeFieldNumber = 2;
+        private static readonly pb::FieldCodec<global::Tensorflow.CppShapeInferenceResult.Types.HandleShapeAndType> _repeated_shapeAndType_codec
+            = pb::FieldCodec.ForMessage(18, global::Tensorflow.CppShapeInferenceResult.Types.HandleShapeAndType.Parser);
+        private readonly pbc::RepeatedField<global::Tensorflow.CppShapeInferenceResult.Types.HandleShapeAndType> shapeAndType_ = new pbc::RepeatedField<global::Tensorflow.CppShapeInferenceResult.Types.HandleShapeAndType>();
+        /// <summary>
+        /// Only valid if &lt;is_set>.
+        /// </summary>
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public pbc::RepeatedField<global::Tensorflow.CppShapeInferenceResult.Types.HandleShapeAndType> ShapeAndType {
+          get { return shapeAndType_; }
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public override bool Equals(object other) {
+          return Equals(other as HandleData);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public bool Equals(HandleData other) {
+          if (ReferenceEquals(other, null)) {
+            return false;
+          }
+          if (ReferenceEquals(other, this)) {
+            return true;
+          }
+          if (IsSet != other.IsSet) return false;
+          if(!shapeAndType_.Equals(other.shapeAndType_)) return false;
+          return Equals(_unknownFields, other._unknownFields);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public override int GetHashCode() {
+          int hash = 1;
+          if (IsSet != false) hash ^= IsSet.GetHashCode();
+          hash ^= shapeAndType_.GetHashCode();
+          if (_unknownFields != null) {
+            hash ^= _unknownFields.GetHashCode();
+          }
+          return hash;
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public override string ToString() {
+          return pb::JsonFormatter.ToDiagnosticString(this);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public void WriteTo(pb::CodedOutputStream output) {
+          if (IsSet != false) {
+            output.WriteRawTag(8);
+            output.WriteBool(IsSet);
+          }
+          shapeAndType_.WriteTo(output, _repeated_shapeAndType_codec);
+          if (_unknownFields != null) {
+            _unknownFields.WriteTo(output);
+          }
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public int CalculateSize() {
+          int size = 0;
+          if (IsSet != false) {
+            size += 1 + 1;
+          }
+          size += shapeAndType_.CalculateSize(_repeated_shapeAndType_codec);
+          if (_unknownFields != null) {
+            size += _unknownFields.CalculateSize();
+          }
+          return size;
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public void MergeFrom(HandleData other) {
+          if (other == null) {
+            return;
+          }
+          if (other.IsSet != false) {
+            IsSet = other.IsSet;
+          }
+          shapeAndType_.Add(other.shapeAndType_);
+          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        public void MergeFrom(pb::CodedInputStream input) {
+          uint tag;
+          while ((tag = input.ReadTag()) != 0) {
+            switch(tag) {
+              default:
+                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+                break;
+              case 8: {
+                IsSet = input.ReadBool();
+                break;
+              }
+              case 18: {
+                shapeAndType_.AddEntriesFrom(input, _repeated_shapeAndType_codec);
+                break;
+              }
+            }
+          }
+        }
+
+      }
+
+    }
+    #endregion
+
+  }
+
+  public sealed partial class CppShapeInferenceInputsNeeded : pb::IMessage<CppShapeInferenceInputsNeeded> {
+    private static readonly pb::MessageParser<CppShapeInferenceInputsNeeded> _parser = new pb::MessageParser<CppShapeInferenceInputsNeeded>(() => new CppShapeInferenceInputsNeeded());
+    private pb::UnknownFieldSet _unknownFields;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<CppShapeInferenceInputsNeeded> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tensorflow.CppShapeInferenceReflection.Descriptor.MessageTypes[1]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public CppShapeInferenceInputsNeeded() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public CppShapeInferenceInputsNeeded(CppShapeInferenceInputsNeeded other) : this() {
+      inputTensorsNeeded_ = other.inputTensorsNeeded_.Clone();
+      inputTensorsAsShapesNeeded_ = other.inputTensorsAsShapesNeeded_.Clone();
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public CppShapeInferenceInputsNeeded Clone() {
+      return new CppShapeInferenceInputsNeeded(this);
+    }
+
+    /// <summary>Field number for the "input_tensors_needed" field.</summary>
+    public const int InputTensorsNeededFieldNumber = 1;
+    private static readonly pb::FieldCodec<int> _repeated_inputTensorsNeeded_codec
+        = pb::FieldCodec.ForInt32(10);
+    private readonly pbc::RepeatedField<int> inputTensorsNeeded_ = new pbc::RepeatedField<int>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<int> InputTensorsNeeded {
+      get { return inputTensorsNeeded_; }
+    }
+
+    /// <summary>Field number for the "input_tensors_as_shapes_needed" field.</summary>
+    public const int InputTensorsAsShapesNeededFieldNumber = 2;
+    private static readonly pb::FieldCodec<int> _repeated_inputTensorsAsShapesNeeded_codec
+        = pb::FieldCodec.ForInt32(18);
+    private readonly pbc::RepeatedField<int> inputTensorsAsShapesNeeded_ = new pbc::RepeatedField<int>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<int> InputTensorsAsShapesNeeded {
+      get { return inputTensorsAsShapesNeeded_; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as CppShapeInferenceInputsNeeded);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(CppShapeInferenceInputsNeeded other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if(!inputTensorsNeeded_.Equals(other.inputTensorsNeeded_)) return false;
+      if(!inputTensorsAsShapesNeeded_.Equals(other.inputTensorsAsShapesNeeded_)) return false;
+      return Equals(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      hash ^= inputTensorsNeeded_.GetHashCode();
+      hash ^= inputTensorsAsShapesNeeded_.GetHashCode();
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void WriteTo(pb::CodedOutputStream output) {
+      inputTensorsNeeded_.WriteTo(output, _repeated_inputTensorsNeeded_codec);
+      inputTensorsAsShapesNeeded_.WriteTo(output, _repeated_inputTensorsAsShapesNeeded_codec);
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      size += inputTensorsNeeded_.CalculateSize(_repeated_inputTensorsNeeded_codec);
+      size += inputTensorsAsShapesNeeded_.CalculateSize(_repeated_inputTensorsAsShapesNeeded_codec);
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(CppShapeInferenceInputsNeeded other) {
+      if (other == null) {
+        return;
+      }
+      inputTensorsNeeded_.Add(other.inputTensorsNeeded_);
+      inputTensorsAsShapesNeeded_.Add(other.inputTensorsAsShapesNeeded_);
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+            break;
+          case 10:
+          case 8: {
+            inputTensorsNeeded_.AddEntriesFrom(input, _repeated_inputTensorsNeeded_codec);
+            break;
+          }
+          case 18:
+          case 16: {
+            inputTensorsAsShapesNeeded_.AddEntriesFrom(input, _repeated_inputTensorsAsShapesNeeded_codec);
+            break;
+          }
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code

src/TensorFlowNET.Core/Protobuf/README.md

@@ -5,7 +5,7 @@ Work in command line
 cd tensorflow
 
 set SRC_DIR=D:/Projects/tensorflow
-set DST_DIR=D:/Projects/TensorFlow.NET/src/TensorFlowNET.Core/Protobuf
+set DST_DIR=D:/SciSharp/TensorFlow.NET/src/TensorFlowNET.Core/Protobuf
 
 protoc -I=%SRC_DIR% --csharp_out=%DST_DIR% tensorflow/core/framework/resource_handle.proto
 ... tensorflow/core/framework/tensor_shape.proto
@@ -38,5 +38,6 @@ protoc -I=%SRC_DIR% --csharp_out=%DST_DIR% tensorflow/core/framework/resource_ha
 ... tensorflow/core/protobuf/control_flow.proto
 ... tensorflow/core/util/event.proto
 ... tensorflow/python/training/checkpoint_state.proto
+... tensorflow/python/framework/cpp_shape_inference.proto
 ```
 

src/TensorFlowNET.Core/Tensors/dtypes.cs

@@ -33,6 +33,7 @@ namespace Tensorflow
         public static TF_DataType float32 = TF_DataType.TF_FLOAT; // is that float32?
         public static TF_DataType float16 = TF_DataType.TF_HALF;
         public static TF_DataType float64 = TF_DataType.TF_DOUBLE;
+        public static TF_DataType variant = TF_DataType.TF_VARIANT;
         public static TF_DataType resource = TF_DataType.TF_RESOURCE;
 
         /// <summary>

src/TensorFlowNET.Core/Variables/ResourceVariable.cs

@@ -115,6 +115,7 @@ namespace Tensorflow
                         dtype: dtype);
                 });
                 _shape = shape ?? (initial_value as Tensor).TensorShape;
+                _initial_value = initial_value as Tensor;
                 _handle = resource_variable_ops.eager_safe_variable_handle(
                       initial_value: _initial_value,
                       shape: _shape,
@@ -122,7 +123,6 @@ namespace Tensorflow
                       name: name,
                       graph_mode: _in_graph_mode);
                 _unique_id = unique_id;
-                _initial_value = initial_value as Tensor;
                 _handle_name = handle_name + ":0";
                 _dtype = _initial_value.dtype.as_base_dtype();
                 // _constraint = constraint;
@@ -133,6 +133,7 @@ namespace Tensorflow
                     {
                         _is_initialized_op = gen_resource_variable_ops.var_is_initialized_op(_handle);
                     });
+
                     if(initial_value != null)
                     {
                         tf_with(ops.name_scope("Assign"), scope1 =>
@@ -143,6 +144,13 @@ namespace Tensorflow
                                 name: n);
                         });
                     }
+
+                    // Manually assign reads to the handle's device to avoid log
+                    // messages.
+                    tf_with(ops.name_scope("Read"), delegate
+                    {
+                        
+                    });
                 }
             });
 

src/TensorFlowNET.Core/Variables/variables.py.cs

@@ -135,6 +135,28 @@ namespace Tensorflow
             }
 
             // If at least one input was modified, replace the op.
+            if(modified)
+            {
+                var new_op_type = op_type;
+                if (new_op_type == "RefSwitch")
+                    new_op_type = "Switch";
+                var new_op_name = op.node_def.Name + "_" + name;
+                new_op_name = new_op_name.Replace(":", "_");
+                var _output_types = op._output_types;
+
+                // Convert attr values to AttrValue protos.
+                var attr_protos = new Dictionary<string, AttrValue>();
+                foreach (var attr_def in op.node_def.Attr)
+                    attr_protos[attr_def.Key] = attr_def.Value;
+
+                return op.graph.create_op(
+                    new_op_type, 
+                    new_op_inputs.ToArray(),
+                    _output_types,
+                    name: new_op_name, 
+                    attrs: attr_protos);
+            }
+
             return op;
         }