Browse Source

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

tags/v0.100.5
Yaohui Liu 2 years ago
parent
commit
1f64e24e10
No known key found for this signature in database GPG Key ID: E86D01E1809BD23E
5 changed files with 8 additions and 13 deletions
  1. +1
    -1
      src/TensorFlowNET.Core/Eager/EagerRunner.TFE_Execute.cs
  2. +3
    -3
      src/TensorFlowNET.Core/Tensorflow.Binding.csproj
  3. +1
    -1
      src/TensorFlowNET.Core/Variables/BaseResourceVariable.cs
  4. +0
    -5
      src/TensorFlowNET.Core/Variables/EagerResourceDeleter.cs
  5. +3
    -3
      src/TensorFlowNET.Keras/Tensorflow.Keras.csproj

+ 1
- 1
src/TensorFlowNET.Core/Eager/EagerRunner.TFE_Execute.cs View File

@@ -42,7 +42,7 @@ namespace Tensorflow.Eager
object[] attrs, object[] attrs,
int num_outputs) int num_outputs)
{ {
var status = tf.Status;
var status = new Status();
var op = GetOp(ctx, op_name, status); var op = GetOp(ctx, op_name, status);
c_api.TFE_OpSetDevice(op, device_name, status); c_api.TFE_OpSetDevice(op, device_name, status);
if (status.ok()) if (status.ok())


+ 3
- 3
src/TensorFlowNET.Core/Tensorflow.Binding.csproj View File

@@ -5,7 +5,7 @@
<AssemblyName>Tensorflow.Binding</AssemblyName> <AssemblyName>Tensorflow.Binding</AssemblyName>
<RootNamespace>Tensorflow</RootNamespace> <RootNamespace>Tensorflow</RootNamespace>
<TargetTensorFlow>2.10.0</TargetTensorFlow> <TargetTensorFlow>2.10.0</TargetTensorFlow>
<Version>1.0.0</Version>
<Version>0.100.5</Version>
<LangVersion>10.0</LangVersion> <LangVersion>10.0</LangVersion>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Authors>Haiping Chen, Meinrad Recheis, Eli Belash</Authors> <Authors>Haiping Chen, Meinrad Recheis, Eli Belash</Authors>
@@ -20,7 +20,7 @@
<Description>Google's TensorFlow full binding in .NET Standard. <Description>Google's TensorFlow full binding in .NET Standard.
Building, training and infering deep learning models. Building, training and infering deep learning models.
https://tensorflownet.readthedocs.io</Description> https://tensorflownet.readthedocs.io</Description>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<AssemblyVersion>0.100.5.0</AssemblyVersion>
<PackageReleaseNotes> <PackageReleaseNotes>
tf.net 0.100.x and above are based on tensorflow native 2.10.0 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.7x.x aligns with TensorFlow v2.7.x native library.
tf.net 0.10x.x aligns with TensorFlow v2.10.x native library. tf.net 0.10x.x aligns with TensorFlow v2.10.x native library.
</PackageReleaseNotes> </PackageReleaseNotes>
<FileVersion>1.0.0.0</FileVersion>
<FileVersion>0.100.5.0</FileVersion>
<PackageLicenseFile>LICENSE</PackageLicenseFile> <PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageOutputPath>packages</PackageOutputPath> <PackageOutputPath>packages</PackageOutputPath>


+ 1
- 1
src/TensorFlowNET.Core/Variables/BaseResourceVariable.cs View File

@@ -102,7 +102,7 @@ namespace Tensorflow
if (handle is EagerTensor) if (handle is EagerTensor)
{ {
_handle = handle.EagerTensorHandle.DangerousGetHandle(); _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) else if(handle is null)
{ {


+ 0
- 5
src/TensorFlowNET.Core/Variables/EagerResourceDeleter.cs View File

@@ -14,9 +14,6 @@ namespace Tensorflow.Variables
_tensor = handle; _tensor = handle;
_handle = handle.EagerTensorHandle.DangerousGetHandle(); _handle = handle.EagerTensorHandle.DangerousGetHandle();
_handle_device = handle_device; _handle_device = handle_device;
bool success = false;
handle.EagerTensorHandle.DangerousAddRef(ref success);
} }


protected override void DisposeUnmanagedResources(IntPtr handle) protected override void DisposeUnmanagedResources(IntPtr handle)
@@ -27,8 +24,6 @@ namespace Tensorflow.Variables
tf.Runner.TFE_Execute(tf.Context, _handle_device, "DestroyResourceOp", tf.Runner.TFE_Execute(tf.Context, _handle_device, "DestroyResourceOp",
new[] { _tensor }, new[] { _tensor },
new object[] { "ignore_lookup_error", true }, 0); new object[] { "ignore_lookup_error", true }, 0);
_tensor.EagerTensorHandle.DangerousRelease();
} }
} }
} }

+ 3
- 3
src/TensorFlowNET.Keras/Tensorflow.Keras.csproj View File

@@ -7,7 +7,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Tensorflow.Keras</RootNamespace> <RootNamespace>Tensorflow.Keras</RootNamespace>
<Platforms>AnyCPU;x64</Platforms> <Platforms>AnyCPU;x64</Platforms>
<Version>1.0.0</Version>
<Version>0.10.5</Version>
<Authors>Haiping Chen</Authors> <Authors>Haiping Chen</Authors>
<Product>Keras for .NET</Product> <Product>Keras for .NET</Product>
<Copyright>Apache 2.0, Haiping Chen 2023</Copyright> <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> <RepositoryType>Git</RepositoryType>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Open.snk</AssemblyOriginatorKeyFile> <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> <PackageLicenseFile>LICENSE</PackageLicenseFile>
<Configurations>Debug;Release;GPU</Configurations> <Configurations>Debug;Release;GPU</Configurations>
</PropertyGroup> </PropertyGroup>


Loading…
Cancel
Save