Merge branches 'master' and 'master' of github.com:AsakusaRinne/TensorFlow.NET

AsakusaRinne · AsakusaRinne · commit 1f64e24e10e9 · 2023-05-06T03:41:55.000+08:00
diff --git a/src/TensorFlowNET.Core/Eager/EagerRunner.TFE_Execute.cs b/src/TensorFlowNET.Core/Eager/EagerRunner.TFE_Execute.cs
@@ -42,7 +42,7 @@ public Tensor[] TFE_ExecuteCancelable(Context ctx,
             object[] attrs,
             int num_outputs)
         {
-            var status = tf.Status;
+            var status = new Status();
             var op = GetOp(ctx, op_name, status);
             c_api.TFE_OpSetDevice(op, device_name, status);
             if (status.ok())
diff --git a/src/TensorFlowNET.Core/Tensorflow.Binding.csproj b/src/TensorFlowNET.Core/Tensorflow.Binding.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>Tensorflow.Binding</AssemblyName>
     <RootNamespace>Tensorflow</RootNamespace>
     <TargetTensorFlow>2.10.0</TargetTensorFlow>
-    <Version>1.0.0</Version>
+    <Version>0.100.5</Version>
     <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
     <Authors>Haiping Chen, Meinrad Recheis, Eli Belash</Authors>
@@ -20,7 +20,7 @@
     <Description>Google's TensorFlow full binding in .NET Standard.
 Building, training and infering deep learning models.
 https://tensorflownet.readthedocs.io</Description>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <AssemblyVersion>0.100.5.0</AssemblyVersion>
     <PackageReleaseNotes>
 		tf.net 0.100.x and above are based on tensorflow native 2.10.0
 
@@ -38,7 +38,7 @@ https://tensorflownet.readthedocs.io</Description>
 		tf.net 0.7x.x aligns with TensorFlow v2.7.x native library.
 		tf.net 0.10x.x aligns with TensorFlow v2.10.x native library.
 	</PackageReleaseNotes>
-    <FileVersion>1.0.0.0</FileVersion>
+    <FileVersion>0.100.5.0</FileVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageOutputPath>packages</PackageOutputPath>
diff --git a/src/TensorFlowNET.Core/Variables/BaseResourceVariable.cs b/src/TensorFlowNET.Core/Variables/BaseResourceVariable.cs
@@ -102,7 +102,7 @@ public void __init__(bool trainable = true,
             if (handle is EagerTensor)
             {
                 _handle = handle.EagerTensorHandle.DangerousGetHandle();
-                eager_resource_deleter = new EagerResourceDeleter(handle, handle.Device);
+                // eager_resource_deleter = new EagerResourceDeleter(handle, handle.Device);
             }
             else if(handle is null)
             {
diff --git a/src/TensorFlowNET.Core/Variables/EagerResourceDeleter.cs b/src/TensorFlowNET.Core/Variables/EagerResourceDeleter.cs
@@ -14,9 +14,6 @@ public EagerResourceDeleter(Tensor handle, string handle_device)
             _tensor = handle;
             _handle = handle.EagerTensorHandle.DangerousGetHandle();
             _handle_device = handle_device;
-            
-            bool success = false;
-            handle.EagerTensorHandle.DangerousAddRef(ref success);
         }
 
         protected override void DisposeUnmanagedResources(IntPtr handle)
@@ -27,8 +24,6 @@ protected override void DisposeUnmanagedResources(IntPtr handle)
             tf.Runner.TFE_Execute(tf.Context, _handle_device, "DestroyResourceOp",
                 new[] { _tensor },
                 new object[] { "ignore_lookup_error", true }, 0);
-            
-            _tensor.EagerTensorHandle.DangerousRelease();
         }
     }
 }
diff --git a/src/TensorFlowNET.Keras/Tensorflow.Keras.csproj b/src/TensorFlowNET.Keras/Tensorflow.Keras.csproj
@@ -7,7 +7,7 @@
     <Nullable>enable</Nullable>
     <RootNamespace>Tensorflow.Keras</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
-    <Version>1.0.0</Version>
+    <Version>0.10.5</Version>
     <Authors>Haiping Chen</Authors>
     <Product>Keras for .NET</Product>
     <Copyright>Apache 2.0, Haiping Chen 2023</Copyright>
@@ -38,8 +38,8 @@ Keras is an API designed for human beings, not machines. Keras follows best prac
     <RepositoryType>Git</RepositoryType>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Open.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>1.0.0.0</FileVersion>
+    <AssemblyVersion>0.10.5.0</AssemblyVersion>
+    <FileVersion>0.10.5.0</FileVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Configurations>Debug;Release;GPU</Configurations>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public Tensor[] TFE_ExecuteCancelable(Context ctx,`
`42`	`42`	`object[] attrs,`
`43`	`43`	`int num_outputs)`
`44`	`44`	`{`
`45`		`- var status = tf.Status;`
	`45`	`+ var status = new Status();`
`46`	`46`	`var op = GetOp(ctx, op_name, status);`
`47`	`47`	`c_api.TFE_OpSetDevice(op, device_name, status);`
`48`	`48`	`if (status.ok())`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public void __init__(bool trainable = true,`
`102`	`102`	`if (handle is EagerTensor)`
`103`	`103`	`{`
`104`	`104`	`_handle = handle.EagerTensorHandle.DangerousGetHandle();`
`105`		`- eager_resource_deleter = new EagerResourceDeleter(handle, handle.Device);`
	`105`	`+ // eager_resource_deleter = new EagerResourceDeleter(handle, handle.Device);`
`106`	`106`	`}`
`107`	`107`	`else if(handle is null)`
`108`	`108`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,6 @@ public EagerResourceDeleter(Tensor handle, string handle_device)`
`14`	`14`	`_tensor = handle;`
`15`	`15`	`_handle = handle.EagerTensorHandle.DangerousGetHandle();`
`16`	`16`	`_handle_device = handle_device;`
`17`		`-`
`18`		`- bool success = false;`
`19`		`- handle.EagerTensorHandle.DangerousAddRef(ref success);`
`20`	`17`	`}`
`21`	`18`
`22`	`19`	`protected override void DisposeUnmanagedResources(IntPtr handle)`
`@@ -27,8 +24,6 @@ protected override void DisposeUnmanagedResources(IntPtr handle)`
`27`	`24`	`tf.Runner.TFE_Execute(tf.Context, _handle_device, "DestroyResourceOp",`
`28`	`25`	`new[] { _tensor },`
`29`	`26`	`new object[] { "ignore_lookup_error", true }, 0);`
`30`		`-`
`31`		`- _tensor.EagerTensorHandle.DangerousRelease();`
`32`	`27`	`}`
`33`	`28`	`}`
`34`	`29`	`}`