make op_id as int

Oceania2018 · Oceania2018 · commit 460c04f80266 · 2021-11-28T09:44:19.000-06:00
diff --git a/src/TensorFlowNET.Core/Gradients/BackpropInitialState.cs b/src/TensorFlowNET.Core/Gradients/BackpropInitialState.cs
@@ -1,5 +1,4 @@
 ﻿using Tensorflow.Util;
-using static Tensorflow.tensorflow;
 
 namespace Tensorflow.Gradients
 {
@@ -15,13 +14,13 @@ public class BackpropInitialState
         /// Maps from op ID to how many output tensors of this op still need to have
         /// their gradients computed.
         /// </summary>
-        public UnorderedMap<Tensor, long> op_missing_tensor { get; set; }
+        public UnorderedMap<long, long> op_missing_tensor { get; set; }
 
         public BackpropInitialState()
         {
             op_tape = new OpTape();
             tensor_usage_counts = new UnorderedMap<Tensor, long>();
-            op_missing_tensor = new UnorderedMap<Tensor, long>();
+            op_missing_tensor = new UnorderedMap<long, long>();
         }
     }
 }
diff --git a/src/TensorFlowNET.Core/Gradients/OpTape.cs b/src/TensorFlowNET.Core/Gradients/OpTape.cs
@@ -5,7 +5,7 @@ namespace Tensorflow.Gradients
     /// <summary>
     /// Map from operation-id to tape entry.
     /// </summary>
-    public class OpTape : UnorderedMap<Tensor, OpTapeEntry>
+    public class OpTape : UnorderedMap<long, OpTapeEntry>
     {
 
     }
diff --git a/src/TensorFlowNET.Core/Gradients/Tape.ComputeGradient.cs b/src/TensorFlowNET.Core/Gradients/Tape.ComputeGradient.cs
@@ -144,7 +144,7 @@ public Tensor[] ComputeGradient(Tensor[] target_tensor_ids,
                     }
 
                     var op_id = tape_it;
-                    if (op_id == null)
+                    if (op_id == -1)
                         continue;
 
                     if (state.op_missing_tensor.find(op_id, out var missing_it))
@@ -235,10 +235,10 @@ UnorderedMapEnumerable<Tensor, List<Tensor>> InitialGradients(Tensor[] target_te
             return result;
         }
 
-        Queue<Tensor> InitialStack(OpTape op_tape,
-            UnorderedMap<Tensor, long> op_missing_tensor)
+        Queue<long> InitialStack(OpTape op_tape,
+            UnorderedMap<long, long> op_missing_tensor)
         {
-            var result = new Queue<Tensor>();
+            var result = new Queue<long>();
             foreach (var op_entry in op_tape)
             {
                 if (!op_missing_tensor.find(op_entry.Key))
diff --git a/src/TensorFlowNET.Core/Gradients/Tape.PrepareBackprop.cs b/src/TensorFlowNET.Core/Gradients/Tape.PrepareBackprop.cs
@@ -1,6 +1,5 @@
 ﻿using System.Collections.Generic;
 using Tensorflow.Util;
-using static Tensorflow.tensorflow;
 
 namespace Tensorflow.Gradients
 {
@@ -21,7 +20,7 @@ public BackpropInitialState PrepareBackprop(Tensor[] target,
                 if (!tensor_tape.find(tensor_id, out var op_id))
                     continue;
 
-                if (op_id == null ||
+                if (op_id == -1 ||
                     !op_tape.find(op_id, out var op_it) ||
                     result.op_tape.find(op_id, out var result_op_it))
                     continue;
@@ -46,7 +45,7 @@ public BackpropInitialState PrepareBackprop(Tensor[] target,
 
             foreach (var pair in result.tensor_usage_counts)
             {
-                if (tensor_tape.find(pair.Key, out var it) && it != null)
+                if (tensor_tape.find(pair.Key, out var it) && it != -1)
                     result.op_missing_tensor[it] += 1;
             }
 
diff --git a/src/TensorFlowNET.Core/Gradients/Tape.RecordOperation.cs b/src/TensorFlowNET.Core/Gradients/Tape.RecordOperation.cs
@@ -1,10 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using Tensorflow.Util;
-using static Tensorflow.tensorflow;
 using static Tensorflow.Binding;
-using System.Linq;
-using Tensorflow.Eager;
 
 namespace Tensorflow.Gradients
 {
@@ -21,7 +18,7 @@ public void RecordOperation(string op_type,
             if (!ShouldRecord(input_tensors))
                 return;
 
-            var op_id = new EagerTensor(next_op_id_++);
+            var op_id = next_op_id_++;
             foreach (var i in input_tensors)
                 tensor_usage_[i]++;
 
diff --git a/src/TensorFlowNET.Core/Gradients/Tape.cs b/src/TensorFlowNET.Core/Gradients/Tape.cs
@@ -42,7 +42,7 @@ public Tape(bool persistent, bool watch_accessed_variables)
         public void Watch(Tensor x)
         {
             tf.Logger.Debug($"Watch tensor id={x.Id}, name={x.name}");
-            tensor_tape_.emplace(x, null);
+            tensor_tape_.emplace(x, -1);
         }
 
         public bool ShouldRecord(Tensor[] tensors)
diff --git a/src/TensorFlowNET.Core/Gradients/TensorTape.cs b/src/TensorFlowNET.Core/Gradients/TensorTape.cs
@@ -7,7 +7,7 @@ namespace Tensorflow.Gradients
     /// produced this tensor. A value of -1 means that the tensor was directly
     /// watched and not the result of any operation in the tape.
     /// </summary>
-    public class TensorTape : UnorderedMap<Tensor, Tensor>
+    public class TensorTape : UnorderedMap<Tensor, long>
     {
 
     }
diff --git a/src/TensorFlowNET.Core/Operations/math_ops.cs b/src/TensorFlowNET.Core/Operations/math_ops.cs
@@ -656,9 +656,6 @@ private static Tensor _ReductionDims(Tensor x, Tensor axis)
             }
             else
             {
-                if (x.rank > -1 && tf.executing_eagerly())
-                    return constant_op.constant(np.arange(x.rank));
-
                 var rank = array_ops.rank(x);
                 return range(0, rank, 1);
             }
@@ -678,11 +675,6 @@ private static Tensor _ReductionDims(Tensor x, Axis? axis)
                 // we rely on Range and Rank to do the right thing at run-time.
                 if (rank == -1) return range(0, array_ops.rank(x));
 
-                if (rank.HasValue && rank.Value > -1)
-                {
-                    return constant_op.constant(np.arange(rank.Value), TF_DataType.TF_INT32);
-                }
-
                 return range(0, rank, 1);
             }
         }
diff --git a/src/TensorFlowNET.Core/Tensorflow.Binding.csproj b/src/TensorFlowNET.Core/Tensorflow.Binding.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Tensorflow</RootNamespace>
     <TargetTensorFlow>2.2.0</TargetTensorFlow>
     <Version>0.60.5</Version>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
     <Authors>Haiping Chen, Meinrad Recheis, Eli Belash</Authors>
     <Company>SciSharp STACK</Company>
diff --git a/src/TensorFlowNET.Core/Tensors/c_api.tensor.cs b/src/TensorFlowNET.Core/Tensors/c_api.tensor.cs
@@ -71,38 +71,7 @@ public partial class c_api
         /// <param name="deallocator_arg"></param>
         /// <returns></returns>
         [DllImport(TensorFlowLibName)]
-        public static extern IntPtr TF_NewTensor(TF_DataType dataType, long[] dims, int num_dims, IntPtr data, UIntPtr len, Deallocator deallocator, ref DeallocatorArgs deallocator_arg);
-
-        [DllImport(TensorFlowLibName)]
-        public static extern TF_Tensor TF_NewTensor(TF_DataType dataType, long[] dims, int num_dims, IntPtr data, long len, DeallocatorV2 deallocator, IntPtr args);
-
-        /// <summary>
-        /// Return a new tensor that holds the bytes data[0,len-1]
-        /// </summary>
-        /// <param name="dataType"></param>
-        /// <param name="dims"></param>
-        /// <param name="num_dims"></param>
-        /// <param name="data"></param>
-        /// <param name="len">num_bytes, ex: 6 * sizeof(float)</param>
-        /// <param name="deallocator"></param>
-        /// <param name="deallocator_arg"></param>
-        /// <returns></returns>
-        [DllImport(TensorFlowLibName)]
-        public static extern IntPtr TF_NewTensor(TF_DataType dataType, long[] dims, int num_dims, IntPtr data, ulong len, Deallocator deallocator, IntPtr deallocator_arg);
-
-        /// <summary>
-        /// Return a new tensor that holds the bytes data[0,len-1]
-        /// </summary>
-        /// <param name="dataType"></param>
-        /// <param name="dims"></param>
-        /// <param name="num_dims"></param>
-        /// <param name="data"></param>
-        /// <param name="len">num_bytes, ex: 6 * sizeof(float)</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe IntPtr TF_NewTensor(TF_DataType dataType, long[] dims, int num_dims, IntPtr data, ulong len)
-        {
-            return TF_NewTensor(dataType, dims, num_dims, data, len, EmptyDeallocator, DeallocatorArgs.Empty);
-        }
+        public static extern SafeTensorHandle TF_NewTensor(TF_DataType dataType, long[] dims, int num_dims, IntPtr data, ulong len, Deallocator deallocator, IntPtr deallocator_arg);
 
         public static unsafe SafeTensorHandle TF_NewTensor(byte[] data, Shape shape, TF_DataType dtype)
         {
@@ -137,20 +106,6 @@ public static unsafe SafeTensorHandle TF_NewTensor<T>(T value)
             return handle;
         }
 
-        /// <summary>
-        /// Return a new tensor that holds the bytes data[0,len-1]
-        /// </summary>
-        /// <param name="dataType"></param>
-        /// <param name="dims"></param>
-        /// <param name="num_dims"></param>
-        /// <param name="data"></param>
-        /// <param name="len">num_bytes, ex: 6 * sizeof(float)</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe IntPtr TF_NewTensor(TF_DataType dataType, long[] dims, int num_dims, void* data, ulong len)
-        {
-            return TF_NewTensor(dataType, dims, num_dims, new IntPtr(data), len);
-        }
-
         /// <summary>
         /// Return the number of dimensions that the tensor has.
         /// </summary>
diff --git a/src/TensorFlowNET.Keras/Tensorflow.Keras.csproj b/src/TensorFlowNET.Keras/Tensorflow.Keras.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Tensorflow.Keras</AssemblyName>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
     <RootNamespace>Tensorflow.Keras</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Tensorflow.Util;`
`2`		`-using static Tensorflow.tensorflow;`
`3`	`2`
`4`	`3`	`namespace Tensorflow.Gradients`
`5`	`4`	`{`
`@@ -15,13 +14,13 @@ public class BackpropInitialState`
`15`	`14`	`/// Maps from op ID to how many output tensors of this op still need to have`
`16`	`15`	`/// their gradients computed.`
`17`	`16`	`/// </summary>`
`18`		`- public UnorderedMap<Tensor, long> op_missing_tensor { get; set; }`
	`17`	`+ public UnorderedMap<long, long> op_missing_tensor { get; set; }`
`19`	`18`
`20`	`19`	`public BackpropInitialState()`
`21`	`20`	`{`
`22`	`21`	`op_tape = new OpTape();`
`23`	`22`	`tensor_usage_counts = new UnorderedMap<Tensor, long>();`
`24`		`- op_missing_tensor = new UnorderedMap<Tensor, long>();`
	`23`	`+ op_missing_tensor = new UnorderedMap<long, long>();`
`25`	`24`	`}`
`26`	`25`	`}`
`27`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Tensorflow.Gradients`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// Map from operation-id to tape entry.`
`7`	`7`	`/// </summary>`
`8`		`- public class OpTape : UnorderedMap<Tensor, OpTapeEntry>`
	`8`	`+ public class OpTape : UnorderedMap<long, OpTapeEntry>`
`9`	`9`	`{`
`10`	`10`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public Tensor[] ComputeGradient(Tensor[] target_tensor_ids,`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`var op_id = tape_it;`
`147`		`- if (op_id == null)`
	`147`	`+ if (op_id == -1)`
`148`	`148`	`continue;`
`149`	`149`
`150`	`150`	`if (state.op_missing_tensor.find(op_id, out var missing_it))`
`@@ -235,10 +235,10 @@ UnorderedMapEnumerable<Tensor, List<Tensor>> InitialGradients(Tensor[] target_te`
`235`	`235`	`return result;`
`236`	`236`	`}`
`237`	`237`
`238`		`- Queue<Tensor> InitialStack(OpTape op_tape,`
`239`		`- UnorderedMap<Tensor, long> op_missing_tensor)`
	`238`	`+ Queue<long> InitialStack(OpTape op_tape,`
	`239`	`+ UnorderedMap<long, long> op_missing_tensor)`
`240`	`240`	`{`
`241`		`- var result = new Queue<Tensor>();`
	`241`	`+ var result = new Queue<long>();`
`242`	`242`	`foreach (var op_entry in op_tape)`
`243`	`243`	`{`
`244`	`244`	`if (!op_missing_tensor.find(op_entry.Key))`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using Tensorflow.Util;`
`3`		`-using static Tensorflow.tensorflow;`
`4`	`3`
`5`	`4`	`namespace Tensorflow.Gradients`
`6`	`5`	`{`
`@@ -21,7 +20,7 @@ public BackpropInitialState PrepareBackprop(Tensor[] target,`
`21`	`20`	`if (!tensor_tape.find(tensor_id, out var op_id))`
`22`	`21`	`continue;`
`23`	`22`
`24`		`- if (op_id == null \|\|`
	`23`	`+ if (op_id == -1 \|\|`
`25`	`24`	`!op_tape.find(op_id, out var op_it) \|\|`
`26`	`25`	`result.op_tape.find(op_id, out var result_op_it))`
`27`	`26`	`continue;`
`@@ -46,7 +45,7 @@ public BackpropInitialState PrepareBackprop(Tensor[] target,`
`46`	`45`
`47`	`46`	`foreach (var pair in result.tensor_usage_counts)`
`48`	`47`	`{`
`49`		`- if (tensor_tape.find(pair.Key, out var it) && it != null)`
	`48`	`+ if (tensor_tape.find(pair.Key, out var it) && it != -1)`
`50`	`49`	`result.op_missing_tensor[it] += 1;`
`51`	`50`	`}`
`52`	`51`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public Tape(bool persistent, bool watch_accessed_variables)`
`42`	`42`	`public void Watch(Tensor x)`
`43`	`43`	`{`
`44`	`44`	`tf.Logger.Debug($"Watch tensor id={x.Id}, name={x.name}");`
`45`		`- tensor_tape_.emplace(x, null);`
	`45`	`+ tensor_tape_.emplace(x, -1);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public bool ShouldRecord(Tensor[] tensors)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Tensorflow.Gradients`
`7`	`7`	`/// produced this tensor. A value of -1 means that the tensor was directly`
`8`	`8`	`/// watched and not the result of any operation in the tape.`
`9`	`9`	`/// </summary>`
`10`		`- public class TensorTape : UnorderedMap<Tensor, Tensor>`
	`10`	`+ public class TensorTape : UnorderedMap<Tensor, long>`
`11`	`11`	`{`
`12`	`12`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -656,9 +656,6 @@ private static Tensor _ReductionDims(Tensor x, Tensor axis)`
`656`	`656`	`}`
`657`	`657`	`else`
`658`	`658`	`{`
`659`		`- if (x.rank > -1 && tf.executing_eagerly())`
`660`		`- return constant_op.constant(np.arange(x.rank));`
`661`		`-`
`662`	`659`	`var rank = array_ops.rank(x);`
`663`	`660`	`return range(0, rank, 1);`
`664`	`661`	`}`
`@@ -678,11 +675,6 @@ private static Tensor _ReductionDims(Tensor x, Axis? axis)`
`678`	`675`	`// we rely on Range and Rank to do the right thing at run-time.`
`679`	`676`	`if (rank == -1) return range(0, array_ops.rank(x));`
`680`	`677`
`681`		`- if (rank.HasValue && rank.Value > -1)`
`682`		`- {`
`683`		`- return constant_op.constant(np.arange(rank.Value), TF_DataType.TF_INT32);`
`684`		`- }`
`685`		`-`
`686`	`678`	`return range(0, rank, 1);`
`687`	`679`	`}`
`688`	`680`	`}`